summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--jjb/csit/csit-perf.yaml86
-rw-r--r--jjb/csit/csit-tox.yaml2
-rw-r--r--jjb/csit/csit-vpp-device.yaml3
-rw-r--r--jjb/csit/csit.yaml6
-rw-r--r--jjb/scripts/vpp/api-checkstyle.sh4
-rw-r--r--jjb/vpp/vpp.yaml3
6 files changed, 27 insertions, 77 deletions
diff --git a/jjb/csit/csit-perf.yaml b/jjb/csit/csit-perf.yaml
index f4773894..3c5b2135 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,44 +107,40 @@
- '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:
+ periodicity: '0 2 * * 1,3,5'
+ - 2n-skx:
os: 'ubuntu2004'
executor-arch: 'x86_64'
- periodicity: '0 2,14 * * *'
- - -2n-dnv:
+ periodicity: '0 2 * * 1,3,5'
+ - 2n-dnv:
os: 'ubuntu2004'
executor-arch: 'x86_64'
- periodicity: '0 2,14 * * *'
- - -2n-zn2:
+ periodicity: '0 2 * * 1,4'
+ - 2n-zn2:
os: 'ubuntu2004'
executor-arch: 'x86_64'
- periodicity: '0 2,14 * * *'
- - -2n-tx2:
+ periodicity: '0 2 * * 1,4'
+ - 2n-tx2:
os: 'ubuntu2004'
executor-arch: 'aarch64'
- periodicity: '0 14 * * *'
- - -3n-skx:
+ periodicity: '0 2 * * 1,4'
+ - 3n-skx:
os: 'ubuntu2004'
executor-arch: 'x86_64'
- periodicity: '0 2,14 * * *'
- - -3n-dnv:
+ periodicity: '0 2 * * 1,4'
+ - 3n-dnv:
os: 'ubuntu2004'
executor-arch: 'x86_64'
- periodicity: '0 2,14 * * *'
- - -3n-tsh:
+ periodicity: '0 2 * * 1,4'
+ - 3n-tsh:
os: 'ubuntu2004'
executor-arch: 'aarch64'
- periodicity: '0 14 * * *'
+ periodicity: '0 2 * * 4'
- 'csit-vpp-perf-mrr-weekly-{stream}-{node-arch}':
node-arch:
- 2n-clx:
@@ -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'
@@ -327,12 +299,6 @@
branch: 'rls2106'
branch-id: 'oper-rls2106'
stream_report:
- - '2009':
- branch: 'rls2009'
- branch-id: 'oper-rls2009'
- - '2101':
- branch: 'rls2101'
- branch-id: 'oper-rls2101'
- '2106':
branch: 'rls2106'
branch-id: 'oper-rls2106'
@@ -454,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>
@@ -780,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/csit/csit-tox.yaml b/jjb/csit/csit-tox.yaml
index 1fdd6815..725d2ff0 100644
--- a/jjb/csit/csit-tox.yaml
+++ b/jjb/csit/csit-tox.yaml
@@ -25,8 +25,6 @@
stream:
- master:
branch: 'master'
- - '2005':
- branch: 'rls2005'
- '2009':
branch: 'rls2009'
- '2009_lts':
diff --git a/jjb/csit/csit-vpp-device.yaml b/jjb/csit/csit-vpp-device.yaml
index 62cfb2cd..6e619325 100644
--- a/jjb/csit/csit-vpp-device.yaml
+++ b/jjb/csit/csit-vpp-device.yaml
@@ -64,9 +64,6 @@
- master:
branch: 'master'
branch-id: 'oper'
- - '2009':
- branch: 'rls2009'
- branch-id: 'oper-rls2009'
- '2009_lts':
branch: 'rls2009_lts'
branch-id: 'oper-rls2009_lts'
diff --git a/jjb/csit/csit.yaml b/jjb/csit/csit.yaml
index 0aa9474a..96582923 100644
--- a/jjb/csit/csit.yaml
+++ b/jjb/csit/csit.yaml
@@ -31,10 +31,6 @@
stream:
- master:
branch: 'master'
- - '2005':
- branch: 'rls2005'
- - '2009':
- branch: 'rls2009'
- '2009_lts':
branch: 'rls2009_lts'
- '2101':
@@ -239,7 +235,7 @@
build-timeout: '{build-timeout}'
triggers:
- - timed: '0 2,14 * * *'
+ - timed: '0 14 * * 1,3,5'
builders:
- maven-target:
diff --git a/jjb/scripts/vpp/api-checkstyle.sh b/jjb/scripts/vpp/api-checkstyle.sh
index c79884fa..a1c2f84a 100644
--- a/jjb/scripts/vpp/api-checkstyle.sh
+++ b/jjb/scripts/vpp/api-checkstyle.sh
@@ -32,10 +32,6 @@ if [ -f $VPP_CRC_CHECKER ]; then
echo "Running $VPP_CRC_CHECKER_CMD"
if $VPP_CRC_CHECKER_CMD; then
echo "API check successful"
-
- # for now - notify the same room during the monitoring period about the successes as well
- WEBEX_TEAMS_MESSAGE="API check successful for $GERRIT_REFSPEC - see $BUILD_URL"
- send_notify
else
RET_CODE=$?
echo "API check failed: ret code $RET_CODE; please read https://wiki.fd.io/view/VPP/ApiChangeProcess and discuss with ayourtch@gmail.com if unsure how to proceed"
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'