chore(vpp): remove ubuntu2004 and debian11 jobs

Change-Id: I64f4e4a89d434201febfcdfc7c95ac9d66cde9d7
Signed-off-by: Dave Wallace <[email protected]>

diff --git a/docker/scripts/README.md b/docker/scripts/README.md
index 5fb4cee..fc1552a 100644 (file)
--- a/docker/scripts/README.md
+++ b/docker/scripts/README.md
@@ -111,7 +111,7 @@ The following commands are useful to build the initial builder images:
 
 `cd <ci-managment repository directory>`
 
-`sudo ./docker/scripts/build_executor_docker_image.sh ubuntu-20.04 2>&1 | tee u2004-$(uname -m).log | grep -ve '^+'`
+`sudo ./docker/scripts/build_executor_docker_image.sh ubuntu-24.04 2>&1 | tee u2004-$(uname -m).log | grep -ve '^+'`
 
 `sudo ./docker/scripts/build_executor_docker_image.sh -apr sandbox 2>&1 | tee all-sandbox-$(uname -m).log | grep -ve '^+'`
 
@@ -133,10 +133,10 @@ avoids the pitfalls encountered with Docker-In-Docker environments:
 The environment in the docker shell contains all of the necessary
 environment variable definitions so the docker scripts can be run
 directly on the cli.  Here is an example command that would be used in a CI job
-which automates the generation and testing of a new ubuntu-20.04 docker image
+which automates the generation and testing of a new ubuntu-24.04 docker image
 and push it to Docker Hub fdiotools/builder-ubuntu2004:test-<arch>:
 
-`build_executor_docker_image.sh -pr test ubuntu-20.04`
+`build_executor_docker_image.sh -pr test ubuntu-24.04`
 
 In the future, a fully automated CI/CD pipeline may be created for production
 docker images.
@@ -249,11 +249,9 @@ script will be written to automate the process.
 
 ## DockerHub Repositories
 
-- fdiotools/builder-debian11
-- fdiotools/builder-ubuntu2004
+- fdiotools/builder-debian12
 - fdiotools/builder-ubuntu2204
-- fdiotools/csit_dut-ubuntu2004
-- fdiotools/csit_shim-ubuntu2004
+- fdiotools/builder-ubuntu2404
 
 ## Docker Image Tags
 

diff --git a/docker/scripts/lib_apt.sh b/docker/scripts/lib_apt.sh
index d5ec158..356e881 100644 (file)
--- a/docker/scripts/lib_apt.sh
+++ b/docker/scripts/lib_apt.sh
@@ -101,7 +101,7 @@ ENV LANG="en_US.UTF-8" LANGUAGE="en_US" LC_ALL="en_US.UTF-8"
 # TODO:  Fix broken project requirement install targets
 #        graphviz         for doxygen (HICN)
 #        doxygen          for doxygen (HICN)
-#        libffi-dev       for python cffi install (Ubuntu20.04/VPP/aarch64)
+#        libffi-dev       for python cffi install (Ubuntu24.04/VPP/aarch64)
 #        liblapack-dev    for python numpy/scipy (CSIT/aarch64)
 #        libopenblas-dev  for python numpy/scipy (CSIT/aarch64)
 #        libpcap-dev      for python pypcap install (CSIT)

diff --git a/docker/scripts/lib_common.sh b/docker/scripts/lib_common.sh
index 916191b..262e635 100644 (file)
--- a/docker/scripts/lib_common.sh
+++ b/docker/scripts/lib_common.sh
@@ -153,8 +153,8 @@ export EXECUTOR_CLASS_ARCH="$EXECUTOR_DEFAULT_CLASS-$OS_ARCH"
 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 ubuntu-24.04"
-EXECUTOR_CLASS_ARCH_OS_NAMES["builder-x86_64"]="debian-11 debian-12 ubuntu-20.04 ubuntu-22.04 ubuntu-24.04"
+EXECUTOR_CLASS_ARCH_OS_NAMES["builder-aarch64"]="ubuntu-22.04 ubuntu-24.04"
+EXECUTOR_CLASS_ARCH_OS_NAMES["builder-x86_64"]="debian-12 ubuntu-22.04 ubuntu-24.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 440c920..3d827a1 100644 (file)
--- a/docker/scripts/lib_vpp.sh
+++ b/docker/scripts/lib_vpp.sh
@@ -122,9 +122,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-11"]="stable/2406 stable/2410 master"
 VPP_BRANCHES["debian-12"]="stable/2410 master"
-VPP_BRANCHES["ubuntu-20.04"]="stable/2406 stable/2410 master"
 VPP_BRANCHES["ubuntu-22.04"]="stable/2406 stable/2410 master"
 VPP_BRANCHES["ubuntu-24.04"]="stable/2410 master"
 export VPP_BRANCHES

diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian11-prod-x86_64-jobtemplate.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian11-prod-x86_64-jobtemplate.yaml
deleted file mode 100644 (file)
index 178ae9b..0000000
--- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian11-prod-x86_64-jobtemplate.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-Job:
-  Constraints:
-    - LTarget: ^${attr.cpu.arch}
-      Operand: =
-      RTarget: amd64
-    - LTarget: ^${node.class}
-      Operand: =
-      RTarget: builder
-  TaskGroups:
-    - Name: jenkins-worker-taskgroup
-      Tasks:
-        - Name: jenkins-worker
-          Config:
-            image: fdiotools/builder-debian11:prod-x86_64
-            volumes:
-              - /tmp/ccache.debian11:/scratch/ccache
-              - /scratch/nomad:/scratch/nomad:ro

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
deleted file mode 100644 (file)
index 3c219a2..0000000
--- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian11-prod-x86_64.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-templates:
-  - prefix: "builder-debian11-prod-x86_64"
-    labels: "builder-debian11-prod-x86_64"

diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian11-sandbox-x86_64-jobtemplate.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian11-sandbox-x86_64-jobtemplate.yaml
deleted file mode 100644 (file)
index b1e5fe1..0000000
--- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian11-sandbox-x86_64-jobtemplate.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
----
-Job:
-  Constraints:
-    - LTarget: ^${attr.cpu.arch}
-      Operand: =
-      RTarget: amd64
-    - LTarget: ^${node.class}
-      Operand: =
-      RTarget: builder
-  TaskGroups:
-    - Name: jenkins-worker-taskgroup
-      Tasks:
-        - Name: jenkins-worker
-          Config:
-            args:
-              - -cp
-              - /local/slave.jar
-              - hudson.remoting.jnlp.Main
-              - -headless
-              - -url
-              - https://jenkins.fd.io/sandbox
-              - -workDir
-              - /w/
-              - '%WORKER_SECRET%'
-              - '%WORKER_NAME%'
-            image: fdiotools/builder-debian11:sandbox-x86_64
-            volumes:
-              - /tmp/ccache.debian11:/scratch/ccache
-              - /scratch/nomad:/scratch/nomad:ro
-          Artifacts:
-            - GetterSource: https://jenkins.fd.io/sandbox/jnlpJars/slave.jar

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
deleted file mode 100644 (file)
index 029f44e..0000000
--- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-debian11-sandbox-x86_64.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-templates:
-  - prefix: "builder-debian11-sandbox-x86_64"
-    labels: "builder-debian11-sandbox-x86_64"

diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-prod-aarch64-jobtemplate.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-prod-aarch64-jobtemplate.yaml
deleted file mode 100644 (file)
index 8b0164e..0000000
--- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-prod-aarch64-jobtemplate.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
----
-Job:
-  TaskGroups:
-    - Name: jenkins-worker-taskgroup
-      Tasks:
-        - Name: jenkins-worker
-          Config:
-            image: fdiotools/builder-ubuntu2004:prod-aarch64
-            volumes:
-              - /tmp/ccache.ubuntu2004:/scratch/ccache
-              - /scratch/nomad:/scratch/nomad:ro

diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-prod-aarch64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-prod-aarch64.yaml
deleted file mode 100644 (file)
index 0643191..0000000
--- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-prod-aarch64.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-templates:
-  - prefix: "builder-ubuntu2004-prod-aarch64"
-    labels: "builder-ubuntu2004-prod-aarch64"

diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-prod-x86_64-jobtemplate.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-prod-x86_64-jobtemplate.yaml
deleted file mode 100644 (file)
index 80a819d..0000000
--- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-prod-x86_64-jobtemplate.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-Job:
-  Constraints:
-    - LTarget: ^${attr.cpu.arch}
-      Operand: =
-      RTarget: amd64
-    - LTarget: ^${node.class}
-      Operand: =
-      RTarget: builder
-  TaskGroups:
-    - Name: jenkins-worker-taskgroup
-      Tasks:
-        - Name: jenkins-worker
-          Config:
-            image: fdiotools/builder-ubuntu2004:prod-x86_64
-            volumes:
-              - /tmp/ccache.ubuntu2004:/scratch/ccache
-              - /scratch/nomad:/scratch/nomad:ro

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
deleted file mode 100644 (file)
index 5e6a766..0000000
--- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-prod-x86_64.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-templates:
-  - prefix: "builder-ubuntu2004-prod-x86_64"
-    labels: "builder-ubuntu2004-prod-x86_64"

diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-sandbox-aarch64-jobtemplate.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-sandbox-aarch64-jobtemplate.yaml
deleted file mode 100644 (file)
index e4e359b..0000000
--- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-sandbox-aarch64-jobtemplate.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
----
-Job:
-  TaskGroups:
-    - Name: jenkins-worker-taskgroup
-      Tasks:
-        - Name: jenkins-worker
-          Config:
-            args:
-              - -cp
-              - /local/slave.jar
-              - hudson.remoting.jnlp.Main
-              - -headless
-              - -url
-              - https://jenkins.fd.io/sandbox
-              - -workDir
-              - /w/
-              - '%WORKER_SECRET%'
-              - '%WORKER_NAME%'
-            image: fdiotools/builder-ubuntu2004:sandbox-aarch64
-            volumes:
-              - /tmp/ccache.ubuntu2004:/scratch/ccache
-              - /scratch/nomad:/scratch/nomad:ro
-          Artifacts:
-            - GetterSource: https://jenkins.fd.io/sandbox/jnlpJars/slave.jar

diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-sandbox-aarch64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-sandbox-aarch64.yaml
deleted file mode 100644 (file)
index 3998c53..0000000
--- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-sandbox-aarch64.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-templates:
-  - prefix: "builder-ubuntu2004-sandbox-aarch64"
-    labels: "builder-ubuntu2004-sandbox-aarch64"

diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-sandbox-x86_64-jobtemplate.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-sandbox-x86_64-jobtemplate.yaml
deleted file mode 100644 (file)
index f50d367..0000000
--- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-sandbox-x86_64-jobtemplate.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
----
-Job:
-  Constraints:
-    - LTarget: ^${attr.cpu.arch}
-      Operand: =
-      RTarget: amd64
-    - LTarget: ^${node.class}
-      Operand: =
-      RTarget: builder
-  TaskGroups:
-    - Name: jenkins-worker-taskgroup
-      Tasks:
-        - Name: jenkins-worker
-          Config:
-            args:
-              - -cp
-              - /local/slave.jar
-              - hudson.remoting.jnlp.Main
-              - -headless
-              - -url
-              - https://jenkins.fd.io/sandbox
-              - -workDir
-              - /w/
-              - '%WORKER_SECRET%'
-              - '%WORKER_NAME%'
-            image: fdiotools/builder-ubuntu2004:sandbox-x86_64
-            volumes:
-              - /tmp/ccache.ubuntu2004:/scratch/ccache
-              - /scratch/nomad:/scratch/nomad:ro
-          Artifacts:
-            - GetterSource: https://jenkins.fd.io/sandbox/jnlpJars/slave.jar

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
deleted file mode 100644 (file)
index 0afdb7b..0000000
--- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-sandbox-x86_64.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-templates:
-  - prefix: "builder-ubuntu2004-sandbox-x86_64"
-    labels: "builder-ubuntu2004-sandbox-x86_64"

diff --git a/jjb/scripts/vpp/build.sh b/jjb/scripts/vpp/build.sh
index 850d610..c6fc1c6 100755 (executable)
--- a/jjb/scripts/vpp/build.sh
+++ b/jjb/scripts/vpp/build.sh
@@ -34,7 +34,7 @@ IS_CSIT_VPP_JOB="${IS_CSIT_VPP_JOB:-}"
 MAKE_PARALLEL_FLAGS="${MAKE_PARALLEL_FLAGS:-}"
 MAKE_PARALLEL_JOBS="${MAKE_PARALLEL_JOBS:-}"
 MAKE_TEST_OS="${MAKE_TEST_OS:-ubuntu-22.04}"
-MAKE_TEST_MULTIWORKER_OS="${MAKE_TEST_MULTIWORKER_OS:-debian-11}"
+MAKE_TEST_MULTIWORKER_OS="${MAKE_TEST_MULTIWORKER_OS:-debian-12}"
 VPPAPIGEN_TEST_OS="${VPPAPIGEN_TEST_OS:-${MAKE_TEST_OS}}"
 BUILD_RESULT="SUCCESSFULLY COMPLETED"
 BUILD_ERROR=""

diff --git a/jjb/scripts/vpp/cov-build.sh b/jjb/scripts/vpp/cov-build.sh
index 15f86c3..268b9b4 100755 (executable)
--- a/jjb/scripts/vpp/cov-build.sh
+++ b/jjb/scripts/vpp/cov-build.sh
@@ -32,7 +32,7 @@ IS_CSIT_VPP_JOB="${IS_CSIT_VPP_JOB:-}"
 MAKE_PARALLEL_FLAGS="${MAKE_PARALLEL_FLAGS:-}"
 MAKE_PARALLEL_JOBS="${MAKE_PARALLEL_JOBS:-}"
 MAKE_TEST_OS="${MAKE_TEST_OS:-ubuntu-22.04}"
-MAKE_TEST_MULTIWORKER_OS="${MAKE_TEST_MULTIWORKER_OS:-debian-11}"
+MAKE_TEST_MULTIWORKER_OS="${MAKE_TEST_MULTIWORKER_OS:-debian-12}"
 VPPAPIGEN_TEST_OS="${VPPAPIGEN_TEST_OS:-${MAKE_TEST_OS}}"
 BUILD_RESULT="SUCCESSFULLY COMPLETED"
 BUILD_ERROR=""

diff --git a/jjb/scripts/vpp/debug-build.sh b/jjb/scripts/vpp/debug-build.sh
index 68338df..0867a15 100755 (executable)
--- a/jjb/scripts/vpp/debug-build.sh
+++ b/jjb/scripts/vpp/debug-build.sh
@@ -64,9 +64,6 @@ make_build_test_debug() {
     fi
 }
 
-# clang is not working with ASAN right now - see change 27268
-# also, it does not work with gcc-7, we need gcc-8 at least
-# on ubuntu 20.04 executor the gcc is gcc9
 if [ "${DRYRUN,,}" != "true" ] ; then
     make_build_test_debug
 fi

diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index 5500399..2cf84db 100644 (file)
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -101,14 +101,12 @@
       - 'vpp-merge-{stream}-{os}-{executor-arch}'
     project: 'vpp'
     os:
-      - 'debian11'
       - 'debian12'
-      - 'ubuntu2004'
       - 'ubuntu2204'
       - 'ubuntu2404'
     make-parallel-jobs: '4'
-    make-test-multiworker-os: 'debian-11 debian-12'
-    make-test-os: 'ubuntu-20.04 ubuntu-22.04 ubuntu-24.04'
+    make-test-multiworker-os: 'debian-12'
+    make-test-os: 'ubuntu-22.04 ubuntu-24.04'
     stream:
       - 'master':
           branch: 'master'
@@ -137,7 +135,6 @@
       - 'vpp-gcc-verify-{stream}-{os}-{executor-arch}'
     project: 'vpp'
     os:
-      - 'ubuntu2004'
       - 'ubuntu2404'
     make-parallel-jobs: '4'
     executor-arch: 'x86_64'
@@ -171,7 +168,7 @@
     project: 'vpp'
     os: 'ubuntu2404'
     make-parallel-jobs: '4'
-    make-test-os: 'ubuntu-20.04 ubuntu-22.04 ubuntu-24.04'
+    make-test-os: 'ubuntu-22.04 ubuntu-24.04'
     comment-trigger-value: 'debug-verify'
     stream:
       - 'master':
@@ -247,12 +244,11 @@
       - 'vpp-merge-{stream}-{os}-{executor-arch}'
     project: 'vpp'
     os:
-      - 'ubuntu2004'
       - 'ubuntu2204'
       - 'ubuntu2404'
     make-parallel-jobs: '4'
-    make-test-multiworker-os: 'debian-11'
-    make-test-os: 'ubuntu-20.04 ubuntu-22.04 ubuntu-24.04'
+    make-test-multiworker-os: 'debian-12'
+    make-test-os: 'ubuntu-22.04 ubuntu-24.04'
     stream:
       - 'master':
           branch: 'master'