diff options
author | Vratko Polak <vrpolak@cisco.com> | 2021-06-02 08:50:19 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@fd.io> | 2021-06-02 08:50:19 +0000 |
commit | 381367d3b33aedb5bea293aaa9be25580ebad80b (patch) | |
tree | 76fd3694ba666fa5ad89f85a9015032cacdf2757 | |
parent | 003f5fd85f51a0a09d1e2301682b0c483d2979ed (diff) | |
parent | 8ef17afe18f75ef19c4b9d68cb17455315352fe0 (diff) |
Merge "CSIT: Decommission 3n-hsw - jobs"
-rw-r--r-- | jjb/csit/csit-perf.yaml | 64 | ||||
-rw-r--r-- | jjb/vpp/vpp.yaml | 3 |
2 files changed, 18 insertions, 49 deletions
diff --git a/jjb/csit/csit-perf.yaml b/jjb/csit/csit-perf.yaml index d36dc4d5..c4058b89 100644 --- a/jjb/csit/csit-perf.yaml +++ b/jjb/csit/csit-perf.yaml @@ -38,36 +38,30 @@ - 3n-skx: os: 'ubuntu2004' executor-arch: 'x86_64' - - 3n-hsw: - os: 'ubuntu2004' - executor-arch: 'x86_64' - 3n-dnv: os: 'ubuntu2004' executor-arch: 'x86_64' - 3n-tsh: os: 'ubuntu2004' executor-arch: 'aarch64' - - 'csit-dpdk-perf-mrr-weekly-master{node-arch}': + - 'csit-dpdk-perf-mrr-weekly-master-{node-arch}': node-arch: - - '': - os: 'ubuntu2004' - executor-arch: 'x86_64' - - -2n-clx: + - 2n-clx: os: 'ubuntu2004' executor-arch: 'x86_64' - - -2n-skx: + - 2n-skx: os: 'ubuntu2004' executor-arch: 'x86_64' - - -2n-zn2: + - 2n-zn2: os: 'ubuntu2004' executor-arch: 'x86_64' - - -2n-tx2: + - 2n-tx2: os: 'ubuntu2004' executor-arch: 'aarch64' - - -3n-skx: + - 3n-skx: os: 'ubuntu2004' executor-arch: 'x86_64' - - -3n-tsh: + - 3n-tsh: os: 'ubuntu2004' executor-arch: 'aarch64' periodicity: '0 0 * * 6' @@ -91,9 +85,6 @@ - 3n-skx: os: 'ubuntu2004' executor-arch: 'x86_64' - - 3n-hsw: - os: 'ubuntu2004' - executor-arch: 'x86_64' - 3n-dnv: os: 'ubuntu2004' executor-arch: 'x86_64' @@ -116,41 +107,37 @@ - '2106': branch: 'rls2106' branch-id: 'oper-rls2106' - - 'csit-vpp-perf-mrr-daily-master{node-arch}': + - 'csit-vpp-perf-mrr-daily-master-{node-arch}': node-arch: - - '': - os: 'ubuntu2004' - executor-arch: 'x86_64' - periodicity: '0 2,14 * * *' - - -2n-clx: + - 2n-clx: os: 'ubuntu2004' executor-arch: 'x86_64' periodicity: '0 2,14 * * *' - - -2n-skx: + - 2n-skx: os: 'ubuntu2004' executor-arch: 'x86_64' periodicity: '0 2,14 * * *' - - -2n-dnv: + - 2n-dnv: os: 'ubuntu2004' executor-arch: 'x86_64' periodicity: '0 2,14 * * *' - - -2n-zn2: + - 2n-zn2: os: 'ubuntu2004' executor-arch: 'x86_64' periodicity: '0 2,14 * * *' - - -2n-tx2: + - 2n-tx2: os: 'ubuntu2004' executor-arch: 'aarch64' periodicity: '0 14 * * *' - - -3n-skx: + - 3n-skx: os: 'ubuntu2004' executor-arch: 'x86_64' periodicity: '0 2,14 * * *' - - -3n-dnv: + - 3n-dnv: os: 'ubuntu2004' executor-arch: 'x86_64' periodicity: '0 2,14 * * *' - - -3n-tsh: + - 3n-tsh: os: 'ubuntu2004' executor-arch: 'aarch64' periodicity: '0 14 * * *' @@ -184,9 +171,6 @@ - 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: @@ -208,9 +192,6 @@ - 3n-skx: os: 'ubuntu2004' executor-arch: 'x86_64' - - 3n-hsw: - os: 'ubuntu2004' - executor-arch: 'x86_64' - 3n-dnv: os: 'ubuntu2004' executor-arch: 'x86_64' @@ -237,9 +218,6 @@ - 3n-skx: os: 'ubuntu2004' executor-arch: 'x86_64' - - 3n-hsw: - os: 'ubuntu2004' - executor-arch: 'x86_64' - 3n-dnv: os: 'ubuntu2004' executor-arch: 'x86_64' @@ -266,9 +244,6 @@ - 3n-skx: os: 'ubuntu2004' executor-arch: 'x86_64' - - 3n-hsw: - os: 'ubuntu2004' - executor-arch: 'x86_64' - 3n-dnv: os: 'ubuntu2004' executor-arch: 'x86_64' @@ -295,9 +270,6 @@ - 3n-skx: os: 'ubuntu2004' executor-arch: 'x86_64' - - 3n-hsw: - os: 'ubuntu2004' - executor-arch: 'x86_64' - 3n-dnv: os: 'ubuntu2004' executor-arch: 'x86_64' @@ -448,7 +420,7 @@ - fdio-infra-publish - job-template: - name: 'csit-vpp-perf-mrr-daily-master{node-arch}' + name: 'csit-vpp-perf-mrr-daily-master-{node-arch}' description: | <ul> @@ -774,7 +746,7 @@ - fdio-infra-publish - job-template: - name: 'csit-dpdk-perf-mrr-weekly-master{node-arch}' + name: 'csit-dpdk-perf-mrr-weekly-master-{node-arch}' description: | <ul> diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml index 7167f6e5..3e8ef617 100644 --- a/jjb/vpp/vpp.yaml +++ b/jjb/vpp/vpp.yaml @@ -330,9 +330,6 @@ - 3n-skx: os: 'ubuntu2004' executor-arch: 'x86_64' - - 3n-hsw: - os: 'ubuntu2004' - executor-arch: 'x86_64' - 2n-dnv: os: 'ubuntu2004' executor-arch: 'x86_64' |