summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--jenkins-config/clouds/nomad/FDIONOMAD/builder-debian11-prod-x86_64.yaml4
-rw-r--r--jenkins-config/clouds/nomad/FDIONOMAD/builder-debian11-sandbox-x86_64.yaml4
-rw-r--r--jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-prod-aarch64.yaml4
-rw-r--r--jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-prod-x86_64.yaml4
-rw-r--r--jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-sandbox-aarch64.yaml4
-rw-r--r--jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-sandbox-x86_64.yaml4
-rw-r--r--jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-prod-aarch64.yaml4
-rw-r--r--jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-prod-x86_64.yaml4
-rw-r--r--jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-sandbox-aarch64.yaml4
-rw-r--r--jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-sandbox-x86_64.yaml4
-rw-r--r--jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-prod-aarch64.yaml4
-rw-r--r--jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-prod-x86_64.yaml4
-rw-r--r--jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-sandbox-aarch64.yaml4
-rw-r--r--jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-sandbox-x86_64.yaml4
-rw-r--r--jenkins-config/clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-prod-aarch64.yaml4
-rw-r--r--jenkins-config/clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-prod-x86_64.yaml4
-rw-r--r--jenkins-config/clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-sandbox-aarch64.yaml4
-rw-r--r--jenkins-config/clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-sandbox-x86_64.yaml4
-rw-r--r--jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2204-prod-aarch64.yaml4
-rw-r--r--jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2204-prod-x86_64.yaml4
-rw-r--r--jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2204-sandbox-aarch64.yaml4
-rw-r--r--jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2204-sandbox-x86_64.yaml4
-rw-r--r--jjb/csit/csit-perf.yaml12
-rw-r--r--jjb/scripts/vpp/copy_archives.sh10
-rw-r--r--jjb/scripts/vpp/csit-bisect.sh38
-rw-r--r--jjb/vpp/vpp.yaml99
26 files changed, 176 insertions, 71 deletions
diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian11-prod-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian11-prod-x86_64.yaml
index bd8656a03..3c219a2f6 100644
--- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian11-prod-x86_64.yaml
+++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian11-prod-x86_64.yaml
@@ -1,6 +1,4 @@
---
templates:
- prefix: "builder-debian11-prod-x86_64"
- labels:
- - "builder-debian11-prod-x86_64"
- - "builder-debian11-sandbox-x86_64"
+ labels: "builder-debian11-prod-x86_64"
diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian11-sandbox-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian11-sandbox-x86_64.yaml
index 50ca41a7e..029f44eee 100644
--- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian11-sandbox-x86_64.yaml
+++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian11-sandbox-x86_64.yaml
@@ -1,6 +1,4 @@
---
templates:
- prefix: "builder-debian11-sandbox-x86_64"
- labels:
- - "builder-debian11-sandbox-x86_64"
- - "builder-debian11-prod-x86_64"
+ labels: "builder-debian11-sandbox-x86_64"
diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-prod-aarch64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-prod-aarch64.yaml
index 1847c83f2..0643191a0 100644
--- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-prod-aarch64.yaml
+++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-prod-aarch64.yaml
@@ -1,6 +1,4 @@
---
templates:
- prefix: "builder-ubuntu2004-prod-aarch64"
- labels:
- - "builder-ubuntu2004-prod-aarch64"
- - "builder-ubuntu2004-sandbox-aarch64"
+ labels: "builder-ubuntu2004-prod-aarch64"
diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-prod-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-prod-x86_64.yaml
index 0ec9d08ca..5e6a7669d 100644
--- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-prod-x86_64.yaml
+++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-prod-x86_64.yaml
@@ -1,6 +1,4 @@
---
templates:
- prefix: "builder-ubuntu2004-prod-x86_64"
- labels:
- - "builder-ubuntu2004-prod-x86_64"
- - "builder-ubuntu2004-sandbox-x86_64"
+ labels: "builder-ubuntu2004-prod-x86_64"
diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-sandbox-aarch64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-sandbox-aarch64.yaml
index ce57a85e6..3998c53bb 100644
--- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-sandbox-aarch64.yaml
+++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-sandbox-aarch64.yaml
@@ -1,6 +1,4 @@
---
templates:
- prefix: "builder-ubuntu2004-sandbox-aarch64"
- labels:
- - "builder-ubuntu2004-sandbox-aarch64"
- - "builder-ubuntu2004-prod-aarch64"
+ labels: "builder-ubuntu2004-sandbox-aarch64"
diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-sandbox-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-sandbox-x86_64.yaml
index e09d0bbf1..0afdb7b1d 100644
--- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-sandbox-x86_64.yaml
+++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-sandbox-x86_64.yaml
@@ -1,6 +1,4 @@
---
templates:
- prefix: "builder-ubuntu2004-sandbox-x86_64"
- labels:
- - "builder-ubuntu2004-sandbox-x86_64"
- - "builder-ubuntu2004-prod-x86_64"
+ labels: "builder-ubuntu2004-sandbox-x86_64"
diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-prod-aarch64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-prod-aarch64.yaml
index 10affd3ec..aa6ee23e8 100644
--- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-prod-aarch64.yaml
+++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-prod-aarch64.yaml
@@ -1,6 +1,4 @@
---
templates:
- prefix: "builder-ubuntu2204-prod-aarch64"
- labels:
- - "builder-ubuntu2204-prod-aarch64"
- - "builder-ubuntu2204-sandbox-aarch64"
+ labels: "builder-ubuntu2204-prod-aarch64"
diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-prod-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-prod-x86_64.yaml
index d8dbba080..b9ca4d3e4 100644
--- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-prod-x86_64.yaml
+++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-prod-x86_64.yaml
@@ -1,6 +1,4 @@
---
templates:
- prefix: "builder-ubuntu2204-prod-x86_64"
- labels:
- - "builder-ubuntu2204-prod-x86_64"
- - "builder-ubuntu2204-sandbox-x86_64"
+ labels: "builder-ubuntu2204-prod-x86_64"
diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-sandbox-aarch64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-sandbox-aarch64.yaml
index 8d225d13f..4eb5d7d3b 100644
--- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-sandbox-aarch64.yaml
+++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-sandbox-aarch64.yaml
@@ -1,6 +1,4 @@
---
templates:
- prefix: "builder-ubuntu2204-sandbox-aarch64"
- labels:
- - "builder-ubuntu2204-sandbox-aarch64"
- - "builder-ubuntu2204-prod-aarch64"
+ labels: "builder-ubuntu2204-sandbox-aarch64"
diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-sandbox-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-sandbox-x86_64.yaml
index 07486e910..5a225e2b3 100644
--- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-sandbox-x86_64.yaml
+++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2204-sandbox-x86_64.yaml
@@ -1,6 +1,4 @@
---
templates:
- prefix: "builder-ubuntu2204-sandbox-x86_64"
- labels:
- - "builder-ubuntu2204-sandbox-x86_64"
- - "builder-ubuntu2204-prod-x86_64"
+ labels: "builder-ubuntu2204-sandbox-x86_64"
diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-prod-aarch64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-prod-aarch64.yaml
index 41ecf0542..9c9324eca 100644
--- a/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-prod-aarch64.yaml
+++ b/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-prod-aarch64.yaml
@@ -1,6 +1,4 @@
---
templates:
- prefix: "csit-builder-ubuntu2204-prod-aarch64"
- labels:
- - "csit-builder-ubuntu2204-prod-aarch64"
- - "csit-builder-ubuntu2204-sandbox-aarch64"
+ labels: "csit-builder-ubuntu2204-prod-aarch64"
diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-prod-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-prod-x86_64.yaml
index 7146226e8..492353a58 100644
--- a/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-prod-x86_64.yaml
+++ b/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-prod-x86_64.yaml
@@ -1,6 +1,4 @@
---
templates:
- prefix: "csit-builder-ubuntu2204-prod-x86_64"
- labels:
- - "csit-builder-ubuntu2204-prod-x86_64"
- - "csit-builder-ubuntu2204-sandbox-x86_64"
+ labels: "csit-builder-ubuntu2204-prod-x86_64"
diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-sandbox-aarch64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-sandbox-aarch64.yaml
index 309783489..03e458795 100644
--- a/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-sandbox-aarch64.yaml
+++ b/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-sandbox-aarch64.yaml
@@ -1,6 +1,4 @@
---
templates:
- prefix: "csit-builder-ubuntu2204-sandbox-aarch64"
- labels:
- - "csit-builder-ubuntu2204-sandbox-aarch64"
- - "csit-builder-ubuntu2204-prod-aarch64"
+ labels: "csit-builder-ubuntu2204-sandbox-aarch64"
diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-sandbox-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-sandbox-x86_64.yaml
index 49b404f05..2390750cc 100644
--- a/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-sandbox-x86_64.yaml
+++ b/jenkins-config/clouds/nomad/FDIONOMAD/csit-builder-ubuntu2204-sandbox-x86_64.yaml
@@ -1,6 +1,4 @@
---
templates:
- prefix: "csit-builder-ubuntu2204-sandbox-x86_64"
- labels:
- - "csit-builder-ubuntu2204-sandbox-x86_64"
- - "csit-builder-ubuntu2204-prod-x86_64"
+ labels: "csit-builder-ubuntu2204-sandbox-x86_64"
diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-prod-aarch64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-prod-aarch64.yaml
index debdf4bac..c145f630c 100644
--- a/jenkins-config/clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-prod-aarch64.yaml
+++ b/jenkins-config/clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-prod-aarch64.yaml
@@ -1,6 +1,4 @@
---
templates:
- prefix: "m-builder-ubuntu2204-prod-aarch64"
- labels:
- - "m-builder-ubuntu2204-prod-aarch64"
- - "m-builder-ubuntu2204-sandbox-aarch64"
+ labels: "m-builder-ubuntu2204-prod-aarch64"
diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-prod-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-prod-x86_64.yaml
index de6701e11..474b8818c 100644
--- a/jenkins-config/clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-prod-x86_64.yaml
+++ b/jenkins-config/clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-prod-x86_64.yaml
@@ -1,6 +1,4 @@
---
templates:
- prefix: "m-builder-ubuntu2204-prod-x86_64"
- labels:
- - "m-builder-ubuntu2204-prod-x86_64"
- - "m-builder-ubuntu2204-sandbox-x86_64"
+ labels: "m-builder-ubuntu2204-prod-x86_64"
diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-sandbox-aarch64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-sandbox-aarch64.yaml
index 163ea988e..b5cba5d9f 100644
--- a/jenkins-config/clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-sandbox-aarch64.yaml
+++ b/jenkins-config/clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-sandbox-aarch64.yaml
@@ -1,6 +1,4 @@
---
templates:
- prefix: "m-builder-ubuntu2204-sandbox-aarch64"
- labels:
- - "m-builder-ubuntu2204-sandbox-aarch64"
- - "m-builder-ubuntu2204-prod-aarch64"
+ labels: "m-builder-ubuntu2204-sandbox-aarch64"
diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-sandbox-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-sandbox-x86_64.yaml
index b989e7048..0c6b42392 100644
--- a/jenkins-config/clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-sandbox-x86_64.yaml
+++ b/jenkins-config/clouds/nomad/FDIONOMAD/m-builder-ubuntu2204-sandbox-x86_64.yaml
@@ -1,6 +1,4 @@
---
templates:
- prefix: "m-builder-ubuntu2204-sandbox-x86_64"
- labels:
- - "m-builder-ubuntu2204-sandbox-x86_64"
- - "m-builder-ubuntu2204-prod-x86_64"
+ labels: "m-builder-ubuntu2204-sandbox-x86_64"
diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2204-prod-aarch64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2204-prod-aarch64.yaml
index f280dbefd..2bbf4f621 100644
--- a/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2204-prod-aarch64.yaml
+++ b/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2204-prod-aarch64.yaml
@@ -1,6 +1,4 @@
---
templates:
- prefix: "s-builder-ubuntu2204-prod-aarch64"
- labels:
- - "s-builder-ubuntu2204-prod-aarch64"
- - "s-builder-ubuntu2204-sandbox-aarch64"
+ labels: "s-builder-ubuntu2204-prod-aarch64"
diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2204-prod-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2204-prod-x86_64.yaml
index 9e9f4ddb5..74c40ec61 100644
--- a/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2204-prod-x86_64.yaml
+++ b/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2204-prod-x86_64.yaml
@@ -1,6 +1,4 @@
---
templates:
- prefix: "s-builder-ubuntu2204-prod-x86_64"
- labels:
- - "s-builder-ubuntu2204-prod-x86_64"
- - "s-builder-ubuntu2204-sandbox-x86_64"
+ labels: "s-builder-ubuntu2204-prod-x86_64"
diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2204-sandbox-aarch64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2204-sandbox-aarch64.yaml
index 7999e9ac6..624b14d1a 100644
--- a/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2204-sandbox-aarch64.yaml
+++ b/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2204-sandbox-aarch64.yaml
@@ -1,6 +1,4 @@
---
templates:
- prefix: "s-builder-ubuntu2204-sandbox-aarch64"
- labels:
- - "s-builder-ubuntu2204-sandbox-aarch64"
- - "s-builder-ubuntu2204-prod-aarch64"
+ labels: "s-builder-ubuntu2204-sandbox-aarch64"
diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2204-sandbox-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2204-sandbox-x86_64.yaml
index be378fe77..278a50512 100644
--- a/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2204-sandbox-x86_64.yaml
+++ b/jenkins-config/clouds/nomad/FDIONOMAD/s-builder-ubuntu2204-sandbox-x86_64.yaml
@@ -1,6 +1,4 @@
---
templates:
- prefix: "s-builder-ubuntu2204-sandbox-x86_64"
- labels:
- - "s-builder-ubuntu2204-sandbox-x86_64"
- - "s-builder-ubuntu2204-prod-x86_64"
+ labels: "s-builder-ubuntu2204-sandbox-x86_64"
diff --git a/jjb/csit/csit-perf.yaml b/jjb/csit/csit-perf.yaml
index 6bcca9610..4f1084845 100644
--- a/jjb/csit/csit-perf.yaml
+++ b/jjb/csit/csit-perf.yaml
@@ -240,6 +240,9 @@
- 2n-c6in:
os: 'ubuntu2204'
executor-arch: 'x86_64'
+ - 2n-c7gn:
+ os: 'ubuntu2204'
+ executor-arch: 'aarch64'
stream:
- master:
branch: 'master'
@@ -330,6 +333,9 @@
- 2n-c6in:
os: 'ubuntu2204'
executor-arch: 'x86_64'
+ - 2n-c7gn:
+ os: 'ubuntu2204'
+ executor-arch: 'aarch64'
- 3n-aws:
os: 'ubuntu2204'
executor-arch: 'x86_64'
@@ -432,6 +438,9 @@
- 2n-c6in:
os: 'ubuntu2204'
executor-arch: 'x86_64'
+ - 2n-c7gn:
+ os: 'ubuntu2204'
+ executor-arch: 'aarch64'
- 3n-aws:
os: 'ubuntu2204'
executor-arch: 'x86_64'
@@ -479,6 +488,9 @@
- 2n-c6in:
os: 'ubuntu2204'
executor-arch: 'x86_64'
+ - 2n-c7gn:
+ os: 'ubuntu2204'
+ executor-arch: 'aarch64'
- 3n-aws:
os: 'ubuntu2204'
executor-arch: 'x86_64'
diff --git a/jjb/scripts/vpp/copy_archives.sh b/jjb/scripts/vpp/copy_archives.sh
index d69ca7e48..dafcd4aef 100644
--- a/jjb/scripts/vpp/copy_archives.sh
+++ b/jjb/scripts/vpp/copy_archives.sh
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
-# Copyright (c) 2021 Cisco and/or its affiliates.
+# Copyright (c) 2023 Cisco and/or its affiliates.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
@@ -30,9 +30,9 @@ set +e
# Variables read:
# - WORKSPACE - Jenkins workspace to create csit subdirectory in.
# Directories updated:
-# - ${WORKSPACE}/archives/csit_current - Current patch results are copied here.
-# - ${WORKSPACE}/archives/csit_parent - Parent patch results are copied here.
+# - ${WORKSPACE}/archives/csit_* - Test results for various VPP builds are here.
+# e.g. csit_current and csit_parent for vpp per-patch perf job.
mkdir -p "${WORKSPACE}/archives"
-cp -Rv "${WORKSPACE}/csit_current" "${WORKSPACE}/archives"
-cp -Rv "${WORKSPACE}/csit_parent" "${WORKSPACE}/archives"
+# Using asterisk as bisect job creates variable number of directories.
+cp -Rv "${WORKSPACE}/csit_"* "${WORKSPACE}/archives"
diff --git a/jjb/scripts/vpp/csit-bisect.sh b/jjb/scripts/vpp/csit-bisect.sh
new file mode 100644
index 000000000..0a264dbc8
--- /dev/null
+++ b/jjb/scripts/vpp/csit-bisect.sh
@@ -0,0 +1,38 @@
+#!/usr/bin/env bash
+
+# Copyright (c) 2023 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -exuo pipefail
+
+# Clone CSIT git repository and proceed with entry script located there.
+#
+# Variables read:
+# - WORKSPACE - Jenkins workspace to create csit subdirectory in.
+# - CSIT_REF - Override ref of CSIT git repository to checkout.
+# Directories updated:
+# - ${WORKSPACE}/csit - Created, holding a checked out CSIT repository.
+# - Multiple other side effects by entry script(s), see CSIT repository.
+
+cd "${WORKSPACE}"
+git clone https://gerrit.fd.io/r/csit --depth=1 --no-single-branch --no-checkout
+pushd "${WORKSPACE}/csit"
+if [[ -n "${CSIT_REF-}" ]]; then
+ git fetch --depth=1 https://gerrit.fd.io/r/csit "${CSIT_REF}"
+ git checkout FETCH_HEAD
+else
+ git checkout HEAD
+fi
+popd
+csit_entry_dir="${WORKSPACE}/csit/resources/libraries/bash/entry"
+source "${csit_entry_dir}/with_oper_for_vpp.sh" "bisect.sh"
diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index 03e3cbb30..fde054200 100644
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -256,6 +256,7 @@
name: vpp-csit-verify-perf
jobs:
- 'vpp-csit-verify-perf-{stream}-{os}-{executor-arch}-{testbed-arch}'
+ - 'vpp-csit-bisect-{stream}-{os}-{executor-arch}-{testbed-arch}'
project: 'vpp'
skip-vote: 'false'
stream:
@@ -1021,6 +1022,104 @@
- fdio-infra-publish
# [end] VPP-CSIT-VERIFY-PERF JOB TEMPLATE
+# VPP-CSIT-BISECT JOB TEMPLATE
+- job-template:
+ name: 'vpp-csit-bisect-{stream}-{os}-{executor-arch}-{testbed-arch}'
+ description: |
+ <ul>
+ <li>executor
+ <ul>
+ <li>builder-{os}-prod-{executor-arch}
+ </ul>
+ <li>testbed architecture
+ <ul>
+ <li>{testbed-arch}
+ </ul>
+ <li>Objective
+ <ul>
+ <li>Find a cause of VPP performance jump among VPP commits.
+ </ul>
+ </ul>
+
+ project-type: freestyle
+ node: 'builder-{os}-prod-{executor-arch}'
+ concurrent: true
+ latest-only: false
+
+ properties:
+ - lf-infra-properties:
+ build-days-to-keep: "{build-days-to-keep}"
+
+ # Please keep parameters in alphabetical order
+ parameters:
+ - csit-perf-trial-duration-parameter:
+ csit-perf-trial-duration: "1.0"
+ - csit-perf-trial-multiplicity-parameter:
+ csit-perf-trial-multiplicity: "60"
+ - gerrit-csit-refspec-parameter
+ - gerrit-event-comment-text-parameter
+ - gerrit-event-type-parameter
+ - gerrit-refspec-parameter:
+ refspec: '{branch-refspec}'
+ - gerrit-parameter:
+ branch: '{branch}'
+ - make-parallel-jobs-parameter:
+ make-parallel-jobs: '{make-parallel-jobs}'
+ - os-parameter:
+ os: '{os}'
+ - project-parameter:
+ project: '{project}'
+ - stream-parameter:
+ stream: '{stream}'
+
+ scm:
+ - gerrit-trigger-scm:
+ credentials-id: 'jenkins-gerrit-credentials'
+ refspec: '$GERRIT_REFSPEC'
+ choosing-strategy: 'gerrit'
+
+ wrappers:
+ - fdio-infra-wrappers-non-activity-timeout:
+ build-timeout: 300
+
+ triggers:
+ - gerrit-trigger-csit-perftest:
+ project: '{project}'
+ branch: '{branch}'
+ trigger-word: 'bisecttest-{testbed-arch}'
+ skip-vote: true
+
+ builders:
+ - shell:
+ !include-raw-escape:
+ - ../scripts/setup_executor_env.sh
+ - shell:
+ !include-raw-escape:
+ - ../scripts/setup_vpp_ubuntu_docker_test.sh
+ - shell:
+ !include-raw-escape:
+ - ../scripts/setup_vpp_ext_deps.sh
+ - shell:
+ !include-raw-escape:
+ - ../scripts/vpp/csit-bisect.sh
+
+ publishers:
+ - postbuildscript:
+ # Can be removed when all CSIT branches use correct archive directory.
+ builders:
+ - build-on:
+ - ABORTED
+ - FAILURE
+ - NOT_BUILT
+ - SUCCESS
+ - UNSTABLE
+ build-steps:
+ - shell:
+ !include-raw-escape:
+ - ../scripts/vpp/copy_archives.sh
+ - fdio-infra-publish
+# [end] VPP-CSIT-BISECT JOB TEMPLATE
+
# VPP-CSIT-VERIFY-API-CRC JOB TEMPLATE
- job-template:
name: 'vpp-csit-verify-api-crc-{stream}-{os}-{executor-arch}'