diff options
author | pmikus <pmikus@cisco.com> | 2021-03-08 19:06:33 +0000 |
---|---|---|
committer | Peter Mikus <pmikus@cisco.com> | 2021-03-15 06:15:58 +0000 |
commit | b77697c63ec0199922dc394b5a718136913ec949 (patch) | |
tree | 5a36844e6cb30deb02afe3e6012cebc43ebace16 | |
parent | 9e1c2a0c8548828bb0c878cb6b6e36a914744b39 (diff) |
CSIT: Convert jobs to ubuntu2004 part.II
Signed-off-by: pmikus <pmikus@cisco.com>
Change-Id: I7417c6c14eaa7a9dfd09b972ede4c70aa4ff93f0
-rw-r--r-- | jjb/csit/csit-perf.yaml | 327 |
1 files changed, 229 insertions, 98 deletions
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 |