diff options
21 files changed, 269 insertions, 133 deletions
diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-builder-2c-2g.cfg b/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-builder-2c-2g.cfg index b08b4fb38..cf844cd28 100644 --- a/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-builder-2c-2g.cfg +++ b/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-builder-2c-2g.cfg @@ -1,4 +1,4 @@ IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200115-151843.366 LABELS=centos7-builder-2c-2g -HARDWARE_ID=v2-highcpu-2 +HARDWARE_ID=v3-standard-2 VOLUME_SIZE=40 diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-builder-4c-4g.cfg index ec1d18ac0..0b62d1abc 100644 --- a/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-builder-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-builder-4c-4g.cfg @@ -1,4 +1,4 @@ IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200115-151843.366 LABELS=centos7-builder-4c-4g -HARDWARE_ID=v2-highcpu-4 +HARDWARE_ID=v3-standard-4 VOLUME_SIZE=40 diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-builder-8c-8g.cfg b/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-builder-8c-8g.cfg index 4b7974d0c..3d0de1e72 100644 --- a/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-builder-8c-8g.cfg +++ b/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-builder-8c-8g.cfg @@ -1,4 +1,4 @@ IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200115-151843.366 LABELS=centos7-builder-8c-8g -HARDWARE_ID=v2-highcpu-8 +HARDWARE_ID=v3-standard-8 VOLUME_SIZE=40 diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-docker-2c-2g.cfg b/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-docker-2c-2g.cfg index 1a2f361fc..e23628812 100644 --- a/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-docker-2c-2g.cfg +++ b/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-docker-2c-2g.cfg @@ -1,4 +1,4 @@ IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20200405-094320.230 LABELS=centos7-docker-2c-2g -HARDWARE_ID=v2-standard-2 +HARDWARE_ID=v3-standard-2 VOLUME_SIZE=20 diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-docker-4c-4g.cfg b/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-docker-4c-4g.cfg index b78877254..caae37aea 100644 --- a/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-docker-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-docker-4c-4g.cfg @@ -1,4 +1,4 @@ IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20200405-094320.230 LABELS=centos7-docker-4c-4g -HARDWARE_ID=v2-standard-4 +HARDWARE_ID=v3-standard-4 VOLUME_SIZE=20 diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/cloud.cfg b/jenkins-config/clouds/openstack/FDIOVEX-CI/cloud.cfg index f0c8fad11..7b8aa5bf6 100644 --- a/jenkins-config/clouds/openstack/FDIOVEX-CI/cloud.cfg +++ b/jenkins-config/clouds/openstack/FDIOVEX-CI/cloud.cfg @@ -8,7 +8,7 @@ OS_CLOUD=vexci # Default Template Configuration IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200115-151843.366 VOLUME_SIZE=20 -HARDWARE_ID=v2-highcpu-2 +HARDWARE_ID=v3-standard-2 NETWORK_ID=bcb9a62c-5a82-4293-a8c6-d73e8c2dbd03 USER_DATA_ID=jenkins-init-system INSTANCE_CAP=20 diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1604-builder-2c-2g.cfg b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1604-builder-2c-2g.cfg index e7e86ebdd..9677c8726 100644 --- a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1604-builder-2c-2g.cfg +++ b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1604-builder-2c-2g.cfg @@ -1,4 +1,4 @@ IMAGE_NAME=ZZCI - Ubuntu 16.04 - builder - x86_64 - 20200213-210225.109 LABELS=ubuntu1604-builder-2c-2g -HARDWARE_ID=v2-highcpu-2 +HARDWARE_ID=v3-standard-2 VOLUME_SIZE=40 diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1604-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1604-builder-4c-4g.cfg index e10ae422f..35e7ad980 100644 --- a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1604-builder-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1604-builder-4c-4g.cfg @@ -1,4 +1,4 @@ IMAGE_NAME=ZZCI - Ubuntu 16.04 - builder - x86_64 - 20200213-210225.109 LABELS=ubuntu1604-builder-4c-4g -HARDWARE_ID=v2-highcpu-4 +HARDWARE_ID=v3-standard-4 VOLUME_SIZE=40 diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1604-builder-8c-32g.cfg b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1604-builder-8c-32g.cfg index 7e763360e..0ac5a9abe 100644 --- a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1604-builder-8c-32g.cfg +++ b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1604-builder-8c-32g.cfg @@ -1,4 +1,4 @@ IMAGE_NAME=ZZCI - Ubuntu 16.04 - builder - x86_64 - 20200213-210225.109 LABELS=ubuntu1604-builder-8c-32g -HARDWARE_ID=v2-highcpu-32 +HARDWARE_ID=v3-standard-8 VOLUME_SIZE=20 diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1604-builder-8c-8g.cfg b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1604-builder-8c-8g.cfg index fc52ef219..ab77b0faa 100644 --- a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1604-builder-8c-8g.cfg +++ b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1604-builder-8c-8g.cfg @@ -1,4 +1,4 @@ IMAGE_NAME=ZZCI - Ubuntu 16.04 - builder - x86_64 - 20200213-210225.109 LABELS=ubuntu1604-builder-8c-8g -HARDWARE_ID=v2-highcpu-8 +HARDWARE_ID=v3-standard-8 VOLUME_SIZE=40 diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1604-docker-4c-4g.cfg b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1604-docker-4c-4g.cfg index 597c0b4ac..0eea568ea 100644 --- a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1604-docker-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1604-docker-4c-4g.cfg @@ -1,4 +1,4 @@ IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - x86_64 - 20200510-225624.603 LABELS=ubuntu1604-docker-4c-4g -HARDWARE_ID=v2-standard-4 +HARDWARE_ID=v3-standard-4 VOLUME_SIZE=20 diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804-builder-2c-2g.cfg b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804-builder-2c-2g.cfg index ec72efa84..f608ab4cf 100644 --- a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804-builder-2c-2g.cfg +++ b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804-builder-2c-2g.cfg @@ -1,4 +1,4 @@ IMAGE_NAME=ZZCI - Ubuntu 18.04 - builder - x86_64 - 20190410-150820.173 LABELS=ubuntu1804-builder-2c-2g.cfg -HARDWARE_ID=v2-highcpu-2 +HARDWARE_ID=v3-standard-2 VOLUME_SIZE=40 diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804-builder-4c-4g.cfg index 618b1fa03..b16259d81 100644 --- a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804-builder-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804-builder-4c-4g.cfg @@ -1,4 +1,4 @@ IMAGE_NAME=ZZCI - Ubuntu 18.04 - builder - x86_64 - 20190410-150820.173 LABELS=ubuntu1804-builder-4c-4g -HARDWARE_ID=v2-highcpu-4 +HARDWARE_ID=v3-standard-4 VOLUME_SIZE=40 diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804-builder-8c-8g.cfg b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804-builder-8c-8g.cfg index 23df2a643..12ed334a7 100644 --- a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804-builder-8c-8g.cfg +++ b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804-builder-8c-8g.cfg @@ -1,4 +1,4 @@ IMAGE_NAME=ZZCI - Ubuntu 18.04 - builder - x86_64 - 20190410-150820.173 LABELS=ubuntu1804-builder-8c-8g.cfg -HARDWARE_ID=v2-highcpu-8 +HARDWARE_ID=v3-standard-8 VOLUME_SIZE=40 diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804-docker-4c-4g.cfg b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804-docker-4c-4g.cfg index d4be182b2..eebda9e49 100644 --- a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804-docker-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804-docker-4c-4g.cfg @@ -1,4 +1,4 @@ IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20200107-191807.978 LABELS=ubuntu1804-docker-4c-4g -HARDWARE_ID=v2-standard-4 +HARDWARE_ID=v3-standard-4 VOLUME_SIZE=20 diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804arm-docker-4c-4g b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804arm-docker-4c-4g index 789129e0a..b2cb36567 100644 --- a/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804arm-docker-4c-4g +++ b/jenkins-config/clouds/openstack/FDIOVEX-CI/ubuntu1804arm-docker-4c-4g @@ -1,5 +1,5 @@ IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - arm64 - 20191209-185146.016 LABELS=ubuntu1804arm-docker-4c-4g -HARDWARE_ID=v2-standard-4 +HARDWARE_ID=v3-standard-4 VOLUME_SIZE=20 diff --git a/jjb/csit/csit-perf.yaml b/jjb/csit/csit-perf.yaml index bfc57551c..bccda9e55 100644 --- a/jjb/csit/csit-perf.yaml +++ b/jjb/csit/csit-perf.yaml @@ -1,4 +1,4 @@ -# Copyright (c) 2020 Cisco and/or its affiliates. +# Copyright (c) 2021 Cisco and/or its affiliates. # Copyright (c) 2019 PANTHEON.tech s.r.o. 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. @@ -20,49 +20,90 @@ jobs: - 'csit-dpdk-perf-verify-{stream}-{node-arch}': node-arch: - - 2n-clx - - 2n-skx - - 2n-dnv - - 2n-zn2 + - 2n-clx: + os: 'ubuntu2004' + executor-arch: 'x86_64' + - 2n-skx: + os: 'ubuntu2004' + executor-arch: 'x86_64' + - 2n-dnv: + os: 'ubuntu1804' + executor-arch: 'x86_64' + - 2n-zn2: + os: 'ubuntu2004' + executor-arch: 'x86_64' - 2n-tx2: - executor: 'ubuntu1804arm-us' - - 3n-skx - - 3n-hsw - - 3n-dnv + os: 'ubuntu1804' + executor-arch: 'aarch64' + - 3n-skx: + os: 'ubuntu2004' + executor-arch: 'x86_64' + - 3n-hsw: + os: 'ubuntu2004' + executor-arch: 'x86_64' + - 3n-dnv: + os: 'ubuntu1804' + executor-arch: 'x86_64' - 3n-tsh: - executor: 'ubuntu1804arm-us' + os: 'ubuntu1804' + executor-arch: 'aarch64' - 'csit-dpdk-perf-mrr-weekly-master{node-arch}': node-arch: - - '' - - -2n-clx - - -2n-skx - - -2n-zn2 + - '': + os: 'ubuntu2004' + executor-arch: 'x86_64' + - -2n-clx: + os: 'ubuntu2004' + executor-arch: 'x86_64' + - -2n-skx: + os: 'ubuntu2004' + executor-arch: 'x86_64' + - -2n-zn2: + os: 'ubuntu2004' + executor-arch: 'x86_64' - -2n-tx2: - executor: 'ubuntu1804arm-us' - - -3n-skx + os: 'ubuntu1804' + executor-arch: 'aarch64' + - -3n-skx: + os: 'ubuntu2004' + executor-arch: 'x86_64' - -3n-tsh: - executor: 'ubuntu1804arm-us' + os: 'ubuntu1804' + executor-arch: 'aarch64' periodicity: '0 0 * * 6' - 'csit-vpp-perf-verify-{stream}-{node-arch}': node-arch: - - 2n-clx - - 2n-skx - - 2n-dnv - - 2n-zn2 + - 2n-clx: + os: 'ubuntu2004' + executor-arch: 'x86_64' + - 2n-skx: + os: 'ubuntu2004' + executor-arch: 'x86_64' + - 2n-dnv: + os: 'ubuntu1804' + executor-arch: 'x86_64' + - 2n-zn2: + os: 'ubuntu2004' + executor-arch: 'x86_64' - 2n-tx2: - executor: 'ubuntu1804arm-us' - - 3n-skx - - 3n-hsw - - 3n-dnv + os: 'ubuntu1804' + executor-arch: 'aarch64' + - 3n-skx: + os: 'ubuntu2004' + executor-arch: 'x86_64' + - 3n-hsw: + os: 'ubuntu2004' + executor-arch: 'x86_64' + - 3n-dnv: + os: 'ubuntu1804' + executor-arch: 'x86_64' - 3n-tsh: - executor: 'ubuntu1804arm-us' + os: 'ubuntu1804' + executor-arch: 'aarch64' stream: - master: branch: 'master' branch-id: 'oper' - - '2005': - branch: 'rls2005' - branch-id: 'oper-rls2005' - '2009': branch: 'rls2009' branch-id: 'oper-rls2009' @@ -75,30 +116,52 @@ - 'csit-vpp-perf-mrr-daily-master{node-arch}': node-arch: - '': + os: 'ubuntu2004' + executor-arch: 'x86_64' periodicity: '0 2,14 * * *' - -2n-clx: + os: 'ubuntu2004' + executor-arch: 'x86_64' periodicity: '0 2,14 * * *' - -2n-skx: + os: 'ubuntu2004' + executor-arch: 'x86_64' periodicity: '0 2,14 * * *' - -2n-dnv: + os: 'ubuntu1804' + executor-arch: 'x86_64' periodicity: '0 2,14 * * *' - -2n-zn2: + os: 'ubuntu2004' + executor-arch: 'x86_64' periodicity: '0 2,14 * * *' - -2n-tx2: - executor: 'ubuntu1804arm-us' + os: 'ubuntu1804' + executor-arch: 'aarch64' periodicity: '0 14 * * *' - -3n-skx: + os: 'ubuntu2004' + executor-arch: 'x86_64' periodicity: '0 2,14 * * *' - -3n-dnv: + os: 'ubuntu1804' + executor-arch: 'x86_64' periodicity: '0 2,14 * * *' - -3n-tsh: - executor: 'ubuntu1804arm-us' + os: 'ubuntu1804' + executor-arch: 'aarch64' periodicity: '0 14 * * *' - 'csit-vpp-perf-mrr-weekly-{stream}-{node-arch}': node-arch: - - 2n-clx - - 2n-skx - - 3n-skx + - 2n-clx: + os: 'ubuntu2004' + executor-arch: 'x86_64' + - 2n-skx: + os: 'ubuntu2004' + executor-arch: 'x86_64' + - 3n-skx: + os: 'ubuntu2004' + executor-arch: 'x86_64' stream: - master: branch: 'master' @@ -109,66 +172,137 @@ periodicity: '0 0 * * 6' - 'csit-vpp-perf-ndrpdr-weekly-master-{node-arch}': node-arch: - - 2n-clx - - 2n-skx - - 3n-skx - - 3n-hsw + - 2n-clx: + os: 'ubuntu2004' + executor-arch: 'x86_64' + - 2n-skx: + os: 'ubuntu2004' + executor-arch: 'x86_64' + - 3n-skx: + os: 'ubuntu2004' + executor-arch: 'x86_64' + - 3n-hsw: + os: 'ubuntu2004' + executor-arch: 'x86_64' periodicity: '0 0 * * 6' - 'csit-vpp-perf-report-iterative-{stream_report}-{node-arch}': node-arch: - - 2n-clx - - 2n-skx - - 2n-dnv - - 2n-zn2 + - 2n-clx: + os: 'ubuntu2004' + executor-arch: 'x86_64' + - 2n-skx: + os: 'ubuntu2004' + executor-arch: 'x86_64' + - 2n-dnv: + os: 'ubuntu1804' + executor-arch: 'x86_64' + - 2n-zn2: + os: 'ubuntu2004' + executor-arch: 'x86_64' - 2n-tx2: - executor: 'ubuntu1804arm-us' - - 3n-skx - - 3n-hsw - - 3n-dnv + os: 'ubuntu1804' + executor-arch: 'aarch64' + - 3n-skx: + os: 'ubuntu2004' + executor-arch: 'x86_64' + - 3n-hsw: + os: 'ubuntu2004' + executor-arch: 'x86_64' + - 3n-dnv: + os: 'ubuntu1804' + executor-arch: 'x86_64' - 3n-tsh: - executor: 'ubuntu1804arm-us' + os: 'ubuntu1804' + executor-arch: 'aarch64' - 'csit-dpdk-perf-report-iterative-{stream_report}-{node-arch}': node-arch: - - 2n-clx - - 2n-skx - - 2n-dnv - - 2n-zn2 + - 2n-clx: + os: 'ubuntu2004' + executor-arch: 'x86_64' + - 2n-skx: + os: 'ubuntu2004' + executor-arch: 'x86_64' + - 2n-dnv: + os: 'ubuntu1804' + executor-arch: 'x86_64' + - 2n-zn2: + os: 'ubuntu2004' + executor-arch: 'x86_64' - 2n-tx2: - executor: 'ubuntu1804arm-us' - - 3n-skx - - 3n-hsw - - 3n-dnv + os: 'ubuntu1804' + executor-arch: 'aarch64' + - 3n-skx: + os: 'ubuntu2004' + executor-arch: 'x86_64' + - 3n-hsw: + os: 'ubuntu2004' + executor-arch: 'x86_64' + - 3n-dnv: + os: 'ubuntu1804' + executor-arch: 'x86_64' - 3n-tsh: - executor: 'ubuntu1804arm-us' + os: 'ubuntu1804' + executor-arch: 'aarch64' - 'csit-vpp-perf-report-coverage-{stream_report}-{node-arch}': node-arch: - - 2n-clx - - 2n-skx - - 2n-dnv - - 2n-zn2 + - 2n-clx: + os: 'ubuntu2004' + executor-arch: 'x86_64' + - 2n-skx: + os: 'ubuntu2004' + executor-arch: 'x86_64' + - 2n-dnv: + os: 'ubuntu1804' + executor-arch: 'x86_64' + - 2n-zn2: + os: 'ubuntu2004' + executor-arch: 'x86_64' - 2n-tx2: - executor: 'ubuntu1804arm-us' - - 3n-skx - - 3n-hsw - - 3n-dnv + os: 'ubuntu1804' + executor-arch: 'aarch64' + - 3n-skx: + os: 'ubuntu2004' + executor-arch: 'x86_64' + - 3n-hsw: + os: 'ubuntu2004' + executor-arch: 'x86_64' + - 3n-dnv: + os: 'ubuntu1804' + executor-arch: 'x86_64' - 3n-tsh: - executor: 'ubuntu1804arm-us' + os: 'ubuntu1804' + executor-arch: 'aarch64' - 'csit-dpdk-perf-report-coverage-{stream_report}-{node-arch}': node-arch: - - 2n-clx - - 2n-skx - - 2n-dnv - - 2n-zn2 + - 2n-clx: + os: 'ubuntu2004' + executor-arch: 'x86_64' + - 2n-skx: + os: 'ubuntu2004' + executor-arch: 'x86_64' + - 2n-dnv: + os: 'ubuntu1804' + executor-arch: 'x86_64' + - 2n-zn2: + os: 'ubuntu2004' + executor-arch: 'x86_64' - 2n-tx2: - executor: 'ubuntu1804arm-us' - - 3n-skx - - 3n-hsw - - 3n-dnv + os: 'ubuntu1804' + executor-arch: 'aarch64' + - 3n-skx: + os: 'ubuntu2004' + executor-arch: 'x86_64' + - 3n-hsw: + os: 'ubuntu2004' + executor-arch: 'x86_64' + - 3n-dnv: + os: 'ubuntu1804' + executor-arch: 'x86_64' - 3n-tsh: - executor: 'ubuntu1804arm-us' + os: 'ubuntu1804' + executor-arch: 'aarch64' project: 'csit' - executor: 'ubuntu1804-us' branch: 'master' branch-id: 'oper' csit-perf-trial-duration: "1.0" @@ -177,9 +311,6 @@ - master: branch: 'master' branch-id: 'oper' - - '2005': - branch: 'rls2005' - branch-id: 'oper-rls2005' - '2009': branch: 'rls2009' branch-id: 'oper-rls2009' @@ -217,7 +348,7 @@ </ul> <li>executor <ul> - <li>{executor} + <li>builder-{os}-prod-{executor-arch} </ul> <li>perf test-cases selection <ul> @@ -247,7 +378,7 @@ </ul> project-type: freestyle - node: '{executor}' + node: 'builder-{os}-prod-{executor-arch}' concurrent: true archive-artifacts: 'archive/*.*' latest-only: false @@ -325,7 +456,7 @@ </ul> <li>executor <ul> - <li>{executor} + <li>builder-{os}-prod-{executor-arch} </ul> <li>perf test-cases selection <ul> @@ -340,7 +471,7 @@ </ul> project-type: freestyle - node: '{executor}' + node: 'builder-{os}-prod-{executor-arch}' concurrent: false archive-artifacts: 'csit/archive/*.*' latest-only: false @@ -403,7 +534,7 @@ </ul> <li>executor <ul> - <li>{executor} + <li>builder-{os}-prod-{executor-arch} </ul> <li>perf test-cases selection <ul> @@ -418,7 +549,7 @@ </ul> project-type: freestyle - node: '{executor}' + node: 'builder-{os}-prod-{executor-arch}' concurrent: false archive-artifacts: 'csit/archive/*.*' latest-only: false @@ -481,7 +612,7 @@ </ul> <li>executor <ul> - <li>{executor} + <li>builder-{os}-prod-{executor-arch} </ul> <li>perf test-cases selection <ul> @@ -495,7 +626,7 @@ </ul> </ul> project-type: freestyle - node: '{executor}' + node: 'builder-{os}-prod-{executor-arch}' concurrent: false archive-artifacts: 'csit/archive/*.*' latest-only: false @@ -560,7 +691,7 @@ </ul> <li>executor <ul> - <li>{executor} + <li>builder-{os}-prod-{executor-arch} </ul> <li>perf test-cases selection <ul> @@ -585,7 +716,7 @@ </ul> project-type: freestyle - node: '{executor}' + node: 'builder-{os}-prod-{executor-arch}' concurrent: true archive-artifacts: 'archive/*.*' latest-only: false @@ -655,7 +786,7 @@ </ul> <li>executor <ul> - <li>{executor} + <li>builder-{os}-prod-{executor-arch} </ul> <li>perf test-cases selection <ul> @@ -670,7 +801,7 @@ </ul> project-type: freestyle - node: '{executor}' + node: 'builder-{os}-prod-{executor-arch}' concurrent: false archive-artifacts: 'csit/archive/*.*' latest-only: false @@ -744,7 +875,7 @@ </ul> <li>executor <ul> - <li>{executor} + <li>builder-{os}-prod-{executor-arch} </ul> <li>perf test-cases selection <ul> @@ -762,7 +893,7 @@ </ul> project-type: freestyle - node: '{executor}' + node: 'builder-{os}-prod-{executor-arch}' concurrent: true archive-artifacts: 'archive/*.*' latest-only: false @@ -846,7 +977,7 @@ </ul> <li>executor <ul> - <li>{executor} + <li>builder-{os}-prod-{executor-arch} </ul> <li>perf test-cases selection <ul> @@ -864,7 +995,7 @@ </ul> project-type: freestyle - node: '{executor}' + node: 'builder-{os}-prod-{executor-arch}' concurrent: true archive-artifacts: 'archive/*.*' latest-only: false @@ -948,7 +1079,7 @@ </ul> <li>executor <ul> - <li>{executor} + <li>builder-{os}-prod-{executor-arch} </ul> <li>perf test-cases selection <ul> @@ -966,7 +1097,7 @@ </ul> project-type: freestyle - node: '{executor}' + node: 'builder-{os}-prod-{executor-arch}' concurrent: true archive-artifacts: 'archive/*.*' latest-only: false @@ -1050,7 +1181,7 @@ </ul> <li>executor <ul> - <li>{executor} + <li>builder-{os}-prod-{executor-arch} </ul> <li>perf test-cases selection <ul> @@ -1068,7 +1199,7 @@ </ul> project-type: freestyle - node: '{executor}' + node: 'builder-{os}-prod-{executor-arch}' concurrent: true archive-artifacts: 'archive/*.*' latest-only: false diff --git a/jjb/csit/csit-tox.yaml b/jjb/csit/csit-tox.yaml index 3999144e8..f5f7b2b1f 100644 --- a/jjb/csit/csit-tox.yaml +++ b/jjb/csit/csit-tox.yaml @@ -16,10 +16,12 @@ name: csit-validate jobs: - - 'csit-verify-tox-{stream}' + - 'csit-verify-tox-{stream}-{os}-{executor-arch}' project: 'csit' branch: 'master' + os: 'ubuntu2004' + executor-arch: 'x86_64' stream: - master: branch: 'master' @@ -33,15 +35,14 @@ branch: 'rls2101' - job-template: - name: 'csit-verify-tox-{stream}' + name: 'csit-verify-tox-{stream}-{os}-{executor-arch}' project-type: freestyle - node: ubuntu1804-us + node: 'builder-{os}-prod-{executor-arch}' concurrent: true archive-artifacts: '*.log' latest-only: false - build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' diff --git a/jjb/csit/csit.yaml b/jjb/csit/csit.yaml index 5ec40ab7b..75da7df52 100644 --- a/jjb/csit/csit.yaml +++ b/jjb/csit/csit.yaml @@ -1,4 +1,4 @@ -# Copyright (c) 2020 Cisco and/or its affiliates. +# Copyright (c) 2021 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: @@ -17,15 +17,16 @@ description: 'CSIT Jenkins jobs.' jobs: - - 'csit-docs-merge-{stream}' - - 'csit-report-merge-{stream}' - - 'csit-trending-daily-master' - - 'csit-trending-weekly-2009-lts' + - 'csit-docs-merge-{stream}-{os}-{executor-arch}' + - 'csit-report-merge-{stream}-{os}-{executor-arch}' + - 'csit-trending-daily-master-{os}-{executor-arch}' + - 'csit-trending-weekly-2009-lts-{os}-{executor-arch}' project: 'csit' branch: 'master' - executor: 'ubuntu1804-us' - executor-large: 'ubuntu1804-l' + os: + - 'ubuntu2004' + executor-arch: 'x86_64' build-artifact-num-to-keep: 10 stream: - master: @@ -46,10 +47,10 @@ project-name: csit - job-template: - name: 'csit-docs-merge-{stream}' + name: 'csit-docs-merge-{stream}-{os}-{executor-arch}' project-type: freestyle - node: '{executor}' + node: 'builder-{os}-prod-{executor-arch}' concurrent: true allow-empty: 'true' fingerprint: false @@ -128,10 +129,10 @@ maven-version: 'mvn33-new' - job-template: - name: 'csit-report-merge-{stream}' + name: 'csit-report-merge-{stream}-{os}-{executor-arch}' project-type: freestyle - node: '{executor-large}' + node: 'builder-{os}-prod-{executor-arch}' concurrent: false allow-empty: 'true' fingerprint: false @@ -207,10 +208,10 @@ maven-version: 'mvn33-new' - job-template: - name: 'csit-trending-daily-master' + name: 'csit-trending-daily-master-{os}-{executor-arch}' project-type: freestyle - node: '{executor-large}' + node: 'builder-{os}-prod-{executor-arch}' concurrent: false build-discarder: @@ -308,10 +309,10 @@ maven-version: 'mvn33-new' - job-template: - name: 'csit-trending-weekly-2009-lts' + name: 'csit-trending-weekly-2009-lts-{os}-{executor-arch}' project-type: freestyle - node: '{executor-large}' + node: 'builder-{os}-prod-{executor-arch}' concurrent: false build-discarder: diff --git a/jjb/scripts/setup_executor_env.sh b/jjb/scripts/setup_executor_env.sh index 2bfbe8b32..ee483b87e 100644..100755 --- a/jjb/scripts/setup_executor_env.sh +++ b/jjb/scripts/setup_executor_env.sh @@ -56,3 +56,6 @@ echo "$long_line" echo "Executor Downloads cache '$downloads_cache':" ls -lh "$downloads_cache" || true echo "$long_line" +echo "DNS nameserver config in '/etc/resolv.conf':" +cat /etc/resolv.conf || true +echo "$long_line" diff --git a/packer/common-packer b/packer/common-packer -Subproject e96974fa52edb7d8e7f27d314155bd088255e07 +Subproject 74b6be7301b5c407d1ccf4cf6093b3b8cd308ad |