diff options
13 files changed, 157 insertions, 61 deletions
diff --git a/docker/scripts/lib_csit.sh b/docker/scripts/lib_csit.sh index 06cfb471b..72b32bbd9 100644 --- a/docker/scripts/lib_csit.sh +++ b/docker/scripts/lib_csit.sh @@ -34,8 +34,8 @@ export CIMAN_DOCKER_SCRIPTS="${CIMAN_DOCKER_SCRIPTS:-$(dirname ${BASH_SOURCE[0]} # to create an enumerated set of jobs jobs that match the # definitions here. declare -A CSIT_VPP_BRANCHES -CSIT_VPP_BRANCHES["ubuntu-22.04"]="stable/2406 master" -CSIT_VPP_BRANCHES["ubuntu-24.04"]="master" +CSIT_VPP_BRANCHES["ubuntu-22.04"]="stable/2410 stable/2502 master" +CSIT_VPP_BRANCHES["ubuntu-24.04"]="stable/2410 stable/2502 master" export CSIT_VPP_BRANCHES CSIT_SUPPORTED_EXECUTOR_CLASSES="builder csit_dut" diff --git a/docker/scripts/lib_vpp.sh b/docker/scripts/lib_vpp.sh index 3d827a15c..83dd2c9d0 100644 --- a/docker/scripts/lib_vpp.sh +++ b/docker/scripts/lib_vpp.sh @@ -122,7 +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-12"]="stable/2410 master" -VPP_BRANCHES["ubuntu-22.04"]="stable/2406 stable/2410 master" -VPP_BRANCHES["ubuntu-24.04"]="stable/2410 master" +VPP_BRANCHES["debian-12"]="stable/2410 stable/2502 master" +VPP_BRANCHES["ubuntu-22.04"]="stable/2410 stable/2502 master" +VPP_BRANCHES["ubuntu-24.04"]="stable/2410 stable/2502 master" export VPP_BRANCHES diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/hst-ubuntu2204-prod-aarch64-jobtemplate.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/hst-ubuntu2204-prod-aarch64-jobtemplate.yaml new file mode 100644 index 000000000..9d099ad07 --- /dev/null +++ b/jenkins-config/clouds/nomad/FDIONOMAD/hst-ubuntu2204-prod-aarch64-jobtemplate.yaml @@ -0,0 +1,23 @@ +--- +Job: + Constraints: + - LTarget: ^${attr.cpu.arch} + Operand: = + RTarget: arm64 + - LTarget: ^${node.class} + Operand: = + RTarget: hst + TaskGroups: + - Name: jenkins-worker-taskgroup + Tasks: + - Name: jenkins-worker + Config: + image: fdiotools/builder-ubuntu2204:prod-aarch64 + volumes: + - /tmp/ccache.ubuntu2204:/scratch/ccache + - /scratch/nomad:/scratch/nomad:ro + Resources: + # Limit scheduling of only 1 job per server by specifying max cpushares and more than half memory + CPU: 262144 + MemoryMB: 384000 + diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/hst-ubuntu2204-prod-aarch64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/hst-ubuntu2204-prod-aarch64.yaml new file mode 100644 index 000000000..e0e05b436 --- /dev/null +++ b/jenkins-config/clouds/nomad/FDIONOMAD/hst-ubuntu2204-prod-aarch64.yaml @@ -0,0 +1,4 @@ +--- +templates: + - prefix: "hst-ubuntu2204-prod-aarch64" + labels: "hst-ubuntu2204-prod-aarch64" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/hst-ubuntu2204-sandbox-aarch64-jobtemplate.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/hst-ubuntu2204-sandbox-aarch64-jobtemplate.yaml new file mode 100644 index 000000000..721beb1c3 --- /dev/null +++ b/jenkins-config/clouds/nomad/FDIONOMAD/hst-ubuntu2204-sandbox-aarch64-jobtemplate.yaml @@ -0,0 +1,35 @@ +--- +Job: + Constraints: + - LTarget: ^${attr.cpu.arch} + Operand: = + RTarget: arm64 + - LTarget: ^${node.class} + Operand: = + RTarget: hst + 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-ubuntu2204:sandbox-aarch64 + volumes: + - /tmp/ccache.ubuntu2204:/scratch/ccache + - /scratch/nomad:/scratch/nomad:ro + Artifacts: + - GetterSource: https://jenkins.fd.io/sandbox/jnlpJars/slave.jar + Resources: + # Limit scheduling of only 1 job per server by specifying max cpushares and more than half memory + CPU: 262144 + MemoryMB: 384000 diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/hst-ubuntu2204-sandbox-aarch64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/hst-ubuntu2204-sandbox-aarch64.yaml new file mode 100644 index 000000000..a0c193e4d --- /dev/null +++ b/jenkins-config/clouds/nomad/FDIONOMAD/hst-ubuntu2204-sandbox-aarch64.yaml @@ -0,0 +1,4 @@ +--- +templates: + - prefix: "hst-ubuntu2204-sandbox-aarch64" + labels: "hst-ubuntu2204-sandbox-aarch64" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/hst-ubuntu2404-prod-x86_64-jobtemplate.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/hst-ubuntu2404-prod-x86_64-jobtemplate.yaml new file mode 100644 index 000000000..dfa3489ad --- /dev/null +++ b/jenkins-config/clouds/nomad/FDIONOMAD/hst-ubuntu2404-prod-x86_64-jobtemplate.yaml @@ -0,0 +1,23 @@ +--- +Job: + Constraints: + - LTarget: ^${attr.cpu.arch} + Operand: = + RTarget: amd64 + - LTarget: ^${node.class} + Operand: = + RTarget: hst + TaskGroups: + - Name: jenkins-worker-taskgroup + Tasks: + - Name: jenkins-worker + Config: + image: fdiotools/builder-ubuntu2404:prod-x86_64 + volumes: + - /tmp/ccache.ubuntu2404:/scratch/ccache + - /scratch/nomad:/scratch/nomad:ro + Resources: + # Limit scheduling of only 1 job per server by specifying max cpushares and more than half memory + CPU: 262144 + MemoryMB: 128000 + diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/hst-ubuntu2404-prod-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/hst-ubuntu2404-prod-x86_64.yaml new file mode 100644 index 000000000..66e982977 --- /dev/null +++ b/jenkins-config/clouds/nomad/FDIONOMAD/hst-ubuntu2404-prod-x86_64.yaml @@ -0,0 +1,4 @@ +--- +templates: + - prefix: "hst-ubuntu2404-prod-x86_64" + labels: "hst-ubuntu2404-prod-x86_64" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/hst-ubuntu2404-sandbox-x86_64-jobtemplate.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/hst-ubuntu2404-sandbox-x86_64-jobtemplate.yaml new file mode 100644 index 000000000..268700a99 --- /dev/null +++ b/jenkins-config/clouds/nomad/FDIONOMAD/hst-ubuntu2404-sandbox-x86_64-jobtemplate.yaml @@ -0,0 +1,35 @@ +--- +Job: + Constraints: + - LTarget: ^${attr.cpu.arch} + Operand: = + RTarget: amd64 + - LTarget: ^${node.class} + Operand: = + RTarget: hst + 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-ubuntu2404:sandbox-x86_64 + volumes: + - /tmp/ccache.ubuntu2404:/scratch/ccache + - /scratch/nomad:/scratch/nomad:ro + Artifacts: + - GetterSource: https://jenkins.fd.io/sandbox/jnlpJars/slave.jar + Resources: + # Limit scheduling of only 1 job per server by specifying max cpushares and more than half memory + CPU: 262144 + MemoryMB: 128000 diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/hst-ubuntu2404-sandbox-x86_64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/hst-ubuntu2404-sandbox-x86_64.yaml new file mode 100644 index 000000000..d2ed3d6fe --- /dev/null +++ b/jenkins-config/clouds/nomad/FDIONOMAD/hst-ubuntu2404-sandbox-x86_64.yaml @@ -0,0 +1,4 @@ +--- +templates: + - prefix: "hst-ubuntu2404-sandbox-x86_64" + labels: "hst-ubuntu2404-sandbox-x86_64" diff --git a/jjb/csit/csit-perf.yaml b/jjb/csit/csit-perf.yaml index 2136cfc73..da02c934d 100644 --- a/jjb/csit/csit-perf.yaml +++ b/jjb/csit/csit-perf.yaml @@ -174,85 +174,85 @@ - 2n-grc: os: 'ubuntu2404' executor-arch: 'aarch64' - periodicity: '30 22 * * 1,4' + periodicity: '30 22 * * 0-4' - 2n-icx: os: 'ubuntu2404' executor-arch: 'x86_64' - periodicity: '30 22 * * 1,4' + periodicity: '30 22 * * 0-4' - 2n-spr: os: 'ubuntu2404' executor-arch: 'x86_64' - periodicity: '30 22 * * 1,4' + periodicity: '30 22 * * 0-4' - 2n-zn2: os: 'ubuntu2404' executor-arch: 'x86_64' - periodicity: '30 22 * * 1,4' + periodicity: '30 22 * * 0-4' - 3n-icx: os: 'ubuntu2404' executor-arch: 'x86_64' - periodicity: '30 22 * * 1,4' + periodicity: '30 22 * * 0-4' - 3n-alt: os: 'ubuntu2404' executor-arch: 'aarch64' - periodicity: '30 22 * * 1,4' + periodicity: '30 22 * * 0-4' - 3n-snr: os: 'ubuntu2404' executor-arch: 'x86_64' - periodicity: '30 22 * * 1,4' + periodicity: '30 22 * * 0-4' - 3n-icxd: os: 'ubuntu2404' executor-arch: 'x86_64' - periodicity: '30 22 * * 1,4' + periodicity: '30 22 * * 0-4' - 3na-spr: os: 'ubuntu2404' executor-arch: 'x86_64' - periodicity: '30 22 * * 1,4' + periodicity: '30 22 * * 0-4' - 3nb-spr: os: 'ubuntu2404' executor-arch: 'x86_64' - periodicity: '30 22 * * 1,4' + periodicity: '30 22 * * 0-4' - 2n-emr: os: 'ubuntu2404' executor-arch: 'x86_64' - periodicity: '30 22 * * 1,4' + periodicity: '30 22 * * 0-4' - 3n-emr: os: 'ubuntu2404' executor-arch: 'x86_64' - periodicity: '30 22 * * 1,4' + periodicity: '30 22 * * 0-4' - 'csit-vpp-perf-hoststack-daily-master-{node-arch}': node-arch: - 2n-grc: os: 'ubuntu2404' executor-arch: 'aarch64' - periodicity: '30 22 * * 1,4' + periodicity: '30 22 * * 0-4' - 2n-icx: os: 'ubuntu2404' executor-arch: 'x86_64' - periodicity: '30 22 * * 1,4' + periodicity: '30 22 * * 0-4' - 2n-spr: os: 'ubuntu2404' executor-arch: 'x86_64' - periodicity: '30 22 * * 1,4' + periodicity: '30 22 * * 0-4' - 3n-icx: os: 'ubuntu2404' executor-arch: 'x86_64' - periodicity: '30 22 * * 1,4' + periodicity: '30 22 * * 0-4' - 3na-spr: os: 'ubuntu2404' executor-arch: 'x86_64' - periodicity: '30 22 * * 1,4' + periodicity: '30 22 * * 0-4' - 3nb-spr: os: 'ubuntu2404' executor-arch: 'x86_64' - periodicity: '30 22 * * 1,4' + periodicity: '30 22 * * 0-4' - 2n-emr: os: 'ubuntu2404' executor-arch: 'x86_64' - periodicity: '30 22 * * 1,4' + periodicity: '30 22 * * 0-4' - 3n-emr: os: 'ubuntu2404' executor-arch: 'x86_64' - periodicity: '30 22 * * 1,4' + periodicity: '30 22 * * 0-4' - 'csit-vpp-perf-mrr-weekly-master-{node-arch}': node-arch: - 2n-icx: diff --git a/jjb/vpp/docs.yaml b/jjb/vpp/docs.yaml index 92e4249a9..eae79eaf3 100644 --- a/jjb/vpp/docs.yaml +++ b/jjb/vpp/docs.yaml @@ -13,10 +13,6 @@ - 'master': branch: 'master' branch-refspec: '' - - '2406': - branch: 'stable/2406' - branch-refspec: '' - os: 'ubuntu2204' - '2410': branch: 'stable/2410' branch-refspec: '' diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml index c6e8b8592..dfc26bf23 100644 --- a/jjb/vpp/vpp.yaml +++ b/jjb/vpp/vpp.yaml @@ -39,10 +39,6 @@ - 'master': branch: 'master' branch-refspec: '' - - '2406': - os: 'ubuntu2204' - branch: 'stable/2406' - branch-refspec: '' - '2410': os: 'ubuntu2204' branch: 'stable/2410' @@ -115,9 +111,6 @@ - 'master': branch: 'master' branch-refspec: '' - - '2406': - branch: 'stable/2406' - branch-refspec: '' - '2410': branch: 'stable/2410' branch-refspec: '' @@ -125,13 +118,6 @@ branch: 'stable/2502' branch-refspec: '' executor-arch: 'x86_64' - exclude: - # ubuntu-24.04 introduced in VPP 24.10 - - stream: '2406' - os: 'ubuntu2404' - # debian-12 introduced in VPP 24.10 - - stream: '2406' - os: 'debian12' # [end] VPP-X86_64 PROJECT @@ -149,19 +135,12 @@ - 'master': branch: 'master' branch-refspec: '' - - '2406': - branch: 'stable/2406' - branch-refspec: '' - '2410': branch: 'stable/2410' branch-refspec: '' - '2502': branch: 'stable/2502' branch-refspec: '' - exclude: - # ubuntu-24.04 introduced in VPP 24.10 - - stream: '2406' - os: 'ubuntu2404' # [end] VPP-GCC-X86_64 PROJECT @@ -260,9 +239,6 @@ - 'master': branch: 'master' branch-refspec: '' - - '2406': - branch: 'stable/2406' - branch-refspec: '' - '2410': branch: 'stable/2410' branch-refspec: '' @@ -270,10 +246,6 @@ branch: 'stable/2502' branch-refspec: '' executor-arch: 'aarch64' - exclude: - # ubuntu-24.04 introduced in VPP 24.10 - - stream: '2406' - os: 'ubuntu2404' # [end] VPP-AARCH64 PROJECT # VPP-ARM-DRIVERS-AARCH64 PROJECT @@ -361,10 +333,6 @@ - 'master': branch: 'master' branch-refspec: '' - - '2406': - branch: 'stable/2406' - branch-refspec: '' - os: 'ubuntu2204' - '2410': branch: 'stable/2410' branch-refspec: '' |