diff options
| author |   Dave Wallace <dwallacelf@gmail.com> | 2022-08-30 17:51:08 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@fd.io> | 2022-08-30 17:51:08 +0000 |
| commit | e6b0e1614b3e0d245116596a79505d0555da6f38 (patch) | |
| tree | d81dc71fc90cf8daf2f0b9e22cb0ff1b7eef6d2c | |
| parent | 2179967fa6166e7660d8f2ab42a58cc2bce800d0 (diff) | |
| parent | d8eb5eafedc383e0a6e0bc8ed23ccea6c8ebef81 (diff) | |
Merge "feat(csit): Switch 2n-clx and vpp_device to ubuntu2204"
| -rw-r--r-- | jjb/csit/csit-perf.yaml | 26 | ||||
| -rw-r--r-- | jjb/csit/csit-vpp-device.yaml | 4 | ||||
| -rw-r--r-- | jjb/vpp/vpp.yaml | 6 |
3 files changed, 15 insertions, 21 deletions
diff --git a/jjb/csit/csit-perf.yaml b/jjb/csit/csit-perf.yaml index 6223d9aa5..e5d6a0187 100644 --- a/jjb/csit/csit-perf.yaml +++ b/jjb/csit/csit-perf.yaml @@ -24,7 +24,7 @@ os: 'ubuntu2004' executor-arch: 'x86_64' - 2n-clx: - os: 'ubuntu2004' + os: 'ubuntu2204' executor-arch: 'x86_64' - 2n-dnv: os: 'ubuntu2004' @@ -56,7 +56,7 @@ os: 'ubuntu2004' executor-arch: 'x86_64' - 2n-clx: - os: 'ubuntu2004' + os: 'ubuntu2204' executor-arch: 'x86_64' - 2n-zn2: os: 'ubuntu2004' @@ -88,7 +88,7 @@ os: 'ubuntu2004' executor-arch: 'x86_64' - 2n-clx: - os: 'ubuntu2004' + os: 'ubuntu2204' executor-arch: 'x86_64' - 2n-dnv: os: 'ubuntu2004' @@ -131,7 +131,7 @@ executor-arch: 'x86_64' periodicity: '30 22 * * 0-4' - 2n-clx: - os: 'ubuntu2004' + os: 'ubuntu2204' executor-arch: 'x86_64' periodicity: '30 22 * * 0-4' - 2n-dnv: @@ -172,7 +172,7 @@ os: 'ubuntu2004' executor-arch: 'x86_64' - 2n-clx: - os: 'ubuntu2004' + os: 'ubuntu2204' executor-arch: 'x86_64' - 3n-icx: os: 'ubuntu2004' @@ -194,25 +194,19 @@ os: 'ubuntu2004' executor-arch: 'x86_64' - 2n-clx: - os: 'ubuntu2004' + os: 'ubuntu2204' executor-arch: 'x86_64' - 3n-icx: os: 'ubuntu2004' executor-arch: 'x86_64' periodicity: '0 0 * * 6' - - 'csit-trex-perf-ndrpdr-weekly-master-{node-arch}': - node-arch: - - 2n-skx: - os: 'ubuntu2004' - executor-arch: 'x86_64' - periodicity: '0 0 * * 6' - 'csit-vpp-perf-report-iterative-{stream_report}-{node-arch}': node-arch: - 2n-icx: os: 'ubuntu2004' executor-arch: 'x86_64' - 2n-clx: - os: 'ubuntu2004' + os: 'ubuntu2204' executor-arch: 'x86_64' - 2n-dnv: os: 'ubuntu2004' @@ -250,7 +244,7 @@ os: 'ubuntu2004' executor-arch: 'x86_64' - 2n-clx: - os: 'ubuntu2004' + os: 'ubuntu2204' executor-arch: 'x86_64' - 2n-dnv: os: 'ubuntu2004' @@ -293,7 +287,7 @@ os: 'ubuntu2004' executor-arch: 'x86_64' - 2n-clx: - os: 'ubuntu2004' + os: 'ubuntu2204' executor-arch: 'x86_64' - 2n-dnv: os: 'ubuntu2004' @@ -331,7 +325,7 @@ os: 'ubuntu2004' executor-arch: 'x86_64' - 2n-clx: - os: 'ubuntu2004' + os: 'ubuntu2204' executor-arch: 'x86_64' - 2n-dnv: os: 'ubuntu2004' diff --git a/jjb/csit/csit-vpp-device.yaml b/jjb/csit/csit-vpp-device.yaml index 3c518efd2..b30913057 100644 --- a/jjb/csit/csit-vpp-device.yaml +++ b/jjb/csit/csit-vpp-device.yaml @@ -17,12 +17,12 @@ description: 'CSIT jenkins jobs.' node-arch: - '1n-skx': - os: 'ubuntu2004' + os: 'ubuntu2204' executor-arch: 'x86_64' make-parallel-jobs: '32' skip-vote: 'false' - '1n-tx2': - os: 'ubuntu2004' + os: 'ubuntu2204' executor-arch: 'aarch64' make-parallel-jobs: '32' skip-vote: 'true' diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml index e8de49c85..102078c35 100644 --- a/jjb/vpp/vpp.yaml +++ b/jjb/vpp/vpp.yaml @@ -181,10 +181,10 @@ branch-refspec: '' testbed-arch: - 1n-skx: - os: 'ubuntu2004' + os: 'ubuntu2204' executor-arch: 'x86_64' - 1n-tx2: - os: 'ubuntu2004' + os: 'ubuntu2204' executor-arch: 'aarch64' skip-vote: 'true' @@ -212,7 +212,7 @@ os: 'ubuntu2004' executor-arch: 'x86_64' - 2n-clx: - os: 'ubuntu2004' + os: 'ubuntu2204' executor-arch: 'x86_64' - 2n-zn2: os: 'ubuntu2004' |