summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Wallace <dwallacelf@gmail.com>2022-11-02 12:00:11 -0400
committerDave Wallace <dwallacelf@gmail.com>2022-11-02 12:13:05 -0400
commit48c129acdac3ca3c931bb828c6e35fc5780cb588 (patch)
treec9308603b01edc37ab3f563e39d010af4605a1fe
parent417136324006a0dba3189cfad3853def48e5b049 (diff)
Post VPP 22.10 Release job clean up
- Remove VPP stable/2202 jobs - Remove debian10 docker executor images Change-Id: I2a83cc3db0aadf987ae726f77a453cfbb778f077 Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
-rw-r--r--docker/scripts/README.md8
-rw-r--r--docker/scripts/lib_common.sh2
-rw-r--r--docker/scripts/lib_vpp.sh3
-rw-r--r--jenkins-config/clouds/nomad/FDIONOMAD/builder-debian10-prod-x86_64.yaml13
-rw-r--r--jenkins-config/clouds/nomad/FDIONOMAD/builder-debian10-sandbox-x86_64.yaml13
-rw-r--r--jjb/vpp/docs.yaml6
-rw-r--r--jjb/vpp/vpp.yaml47
7 files changed, 5 insertions, 87 deletions
diff --git a/docker/scripts/README.md b/docker/scripts/README.md
index fbb54933..63a0c6a8 100644
--- a/docker/scripts/README.md
+++ b/docker/scripts/README.md
@@ -250,8 +250,9 @@ script will be written to automate the process.
## DockerHub Repositories
-- fdiotools/builder-debian10
+- fdiotools/builder-debian11
- fdiotools/builder-ubuntu2004
+- fdiotools/builder-ubuntu2204
- fdiotools/csit_dut-ubuntu2004
- fdiotools/csit_shim-ubuntu2004
@@ -269,7 +270,4 @@ a production image to the previous image used in production.
Jenkins-Nomad Label.
- sandbox-aarch64: Tag used to select the aarch64 sandbox image by the
associated Jenkins-Nomad Label.
-- test-x86_64: Tag used to select the x86_64 sandbox image by the associated
-Jenkins-Nomad Label.
-- test-aarch64: Tag used to select the aarch64 sandbox image by the associated
-Jenkins-Nomad Label.
+
diff --git a/docker/scripts/lib_common.sh b/docker/scripts/lib_common.sh
index f4eec961..09fbc091 100644
--- a/docker/scripts/lib_common.sh
+++ b/docker/scripts/lib_common.sh
@@ -157,7 +157,7 @@ export EXECUTOR_CLASSES="$EXECUTOR_DEFAULT_CLASS csit_dut csit_shim"
export EXECUTOR_ARCHS="aarch64 x86_64"
declare -A EXECUTOR_CLASS_ARCH_OS_NAMES
EXECUTOR_CLASS_ARCH_OS_NAMES["builder-aarch64"]="ubuntu-20.04 ubuntu-22.04"
-EXECUTOR_CLASS_ARCH_OS_NAMES["builder-x86_64"]="debian-10 debian-11 ubuntu-20.04 ubuntu-22.04"
+EXECUTOR_CLASS_ARCH_OS_NAMES["builder-x86_64"]="debian-11 ubuntu-20.04 ubuntu-22.04"
EXECUTOR_CLASS_ARCH_OS_NAMES["csit_dut-aarch64"]="ubuntu-22.04"
EXECUTOR_CLASS_ARCH_OS_NAMES["csit_dut-x86_64"]="ubuntu-22.04"
EXECUTOR_CLASS_ARCH_OS_NAMES["csit_shim-aarch64"]="ubuntu-22.04"
diff --git a/docker/scripts/lib_vpp.sh b/docker/scripts/lib_vpp.sh
index a14fc363..6d9a9d33 100644
--- a/docker/scripts/lib_vpp.sh
+++ b/docker/scripts/lib_vpp.sh
@@ -96,8 +96,7 @@ docker_build_setup_vpp() {
# to create an enumerated set of jobs jobs that match the
# definitions here.
declare -A VPP_BRANCHES
-VPP_BRANCHES["debian-10"]="stable/2202"
VPP_BRANCHES["debian-11"]="stable/2206 stable/2210 master"
-VPP_BRANCHES["ubuntu-20.04"]="stable/2202 stable/2206 stable/2210 master"
+VPP_BRANCHES["ubuntu-20.04"]="stable/2206 stable/2210 master"
VPP_BRANCHES["ubuntu-22.04"]="stable/2210 master"
export VPP_BRANCHES
diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian10-prod-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian10-prod-x86_64.yaml
deleted file mode 100644
index f6f77046..00000000
--- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian10-prod-x86_64.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-templates:
- - constraints:
- - ltarget: "^${attr.cpu.arch}"
- operand: "="
- rtarget: "amd64"
- - ltarget: "^${node.class}"
- operand: "="
- rtarget: "builder"
- image: "fdiotools/builder-debian10:prod-x86_64"
- labels: "builder-debian10-prod-x86_64"
- prefix: "builder-debian10-prod-x86_64"
- hostVolumes: "/tmp/ccache.debian10:/scratch/ccache,/scratch/nomad:/scratch/nomad:ro"
diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian10-sandbox-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian10-sandbox-x86_64.yaml
deleted file mode 100644
index 260ac273..00000000
--- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian10-sandbox-x86_64.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-templates:
- - constraints:
- - ltarget: "^${attr.cpu.arch}"
- operand: "="
- rtarget: "amd64"
- - ltarget: "^${node.class}"
- operand: "="
- rtarget: "builder"
- image: "fdiotools/builder-debian10:sandbox-x86_64"
- labels: "builder-debian10-sandbox-x86_64"
- prefix: "builder-debian10-sandbox-x86_64"
- hostVolumes: "/tmp/ccache.debian10:/scratch/ccache,/scratch/nomad:/scratch/nomad:ro"
diff --git a/jjb/vpp/docs.yaml b/jjb/vpp/docs.yaml
index deb22144..25a2dde7 100644
--- a/jjb/vpp/docs.yaml
+++ b/jjb/vpp/docs.yaml
@@ -14,9 +14,6 @@
- 'master':
branch: 'master'
branch-refspec: ''
- - '2202':
- branch: 'stable/2202'
- branch-refspec: ''
- '2206':
branch: 'stable/2206'
branch-refspec: ''
@@ -31,9 +28,6 @@
- stream: 'master'
os: 'ubuntu2004'
# os added in 22.10
- - stream: '2202'
- os: 'ubuntu2204'
- # os added in 22.10
- stream: '2206'
os: 'ubuntu2204'
diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index cdda5bc0..9497d5d7 100644
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -40,9 +40,6 @@
- 'master':
branch: 'master'
branch-refspec: ''
- - '2202':
- branch: 'stable/2202'
- branch-refspec: ''
- '2206':
branch: 'stable/2206'
branch-refspec: ''
@@ -58,9 +55,6 @@
- stream: 'master'
os: 'ubuntu2004'
# os added in 22.10
- - stream: '2202'
- os: 'ubuntu2204'
- # os added in 22.10
- stream: '2206'
os: 'ubuntu2204'
# [end] VPP-CHECKSTYLE-X86_64 PROJECT
@@ -87,11 +81,6 @@
branch-refspec: ''
make-test-os: 'ubuntu-22.04'
make-test-multiworker-os: 'debian-11'
- - '2202':
- branch: 'stable/2202'
- branch-refspec: ''
- make-test-os: 'ubuntu-20.04'
- make-test-multiworker-os: 'debian-11'
- '2206':
branch: 'stable/2206'
branch-refspec: ''
@@ -103,27 +92,11 @@
make-test-os: 'ubuntu-20.04'
make-test-multiworker-os: 'debian-11'
os:
- - debian10
- debian11
- ubuntu2004
- ubuntu2204
executor-arch: 'x86_64'
exclude:
- # os deprecated in 22.06
- - stream: '2206'
- os: 'debian10'
- # os deprecated in 22.10
- - stream: '2210'
- os: 'debian10'
- # os deprecated in master
- - stream: 'master'
- os: 'debian10'
- # os added in 22.06
- - stream: '2202'
- os: 'debian11'
- # os added in 22.10
- - stream: '2202'
- os: 'ubuntu2204'
# os added in 22.10
- stream: '2206'
os: 'ubuntu2204'
@@ -191,9 +164,6 @@
- 'master':
branch: 'master'
branch-refspec: ''
- - '2202':
- branch: 'stable/2202'
- branch-refspec: ''
- '2206':
branch: 'stable/2206'
branch-refspec: ''
@@ -208,9 +178,6 @@
- stream: 'master'
os: 'ubuntu2004'
# os added in 22.10
- - stream: '2202'
- os: 'ubuntu2204'
- # os added in 22.10
- stream: '2206'
os: 'ubuntu2204'
# [end] VPP-GCC-X86_64 PROJECT
@@ -237,11 +204,6 @@
branch-refspec: ''
make-test-os: 'ubuntu-22.04'
make-test-multiworker-os: ''
- - '2202':
- branch: 'stable/2202'
- branch-refspec: ''
- make-test-os: 'ubuntu-20.04'
- make-test-multiworker-os: ''
- '2206':
branch: 'stable/2206'
branch-refspec: ''
@@ -258,9 +220,6 @@
executor-arch: 'aarch64'
exclude:
# os added in 22.10
- - stream: '2202'
- os: 'ubuntu2204'
- # os added in 22.10
- stream: '2206'
os: 'ubuntu2204'
# [end] VPP-AARCH64 PROJECT
@@ -352,9 +311,6 @@
- 'master':
branch: 'master'
branch-refspec: ''
- - '2202':
- branch: 'stable/2202'
- branch-refspec: ''
- '2206':
branch: 'stable/2206'
branch-refspec: ''
@@ -372,9 +328,6 @@
- stream: 'master'
os: 'ubuntu2004'
# os added in 22.10
- - stream: '2202'
- os: 'ubuntu2204'
- # os added in 22.10
- stream: '2206'
os: 'ubuntu2204'
# [end] VPP-CSIT-API-CRC PROJECT