summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
Diffstat (limited to 'jjb')
-rw-r--r--jjb/csit/csit-vpp-device.yaml33
-rw-r--r--jjb/vpp/vpp.yaml35
2 files changed, 35 insertions, 33 deletions
diff --git a/jjb/csit/csit-vpp-device.yaml b/jjb/csit/csit-vpp-device.yaml
index 30fb10c4b..1f108838b 100644
--- a/jjb/csit/csit-vpp-device.yaml
+++ b/jjb/csit/csit-vpp-device.yaml
@@ -19,9 +19,10 @@
- 'ubuntu1804'
node-arch:
- '1n-skx'
- - '1n-tx2':
- executor: 'vpp-csit-arm-ubuntu18'
- skip-vote: 'true'
+# Is there a good way to allow manual triggers for tx2?
+# - '1n-tx2':
+# executor: 'vpp-csit-arm-ubuntu18'
+# skip-vote: 'true'
jobs:
- 'csit-vpp-device-{stream}-{os}-{node-arch}'
- 'csit-vpp-device-{stream_timed}-{os}-{node-arch}-semiweekly'
@@ -51,19 +52,19 @@
- '1904':
branch: 'rls1904'
branch-id: 'oper-rls1904'
- exclude:
- - stream: '1810'
- os: 'ubuntu1804'
- node-arch: '1n-tx2'
- - stream: '1901'
- os: 'ubuntu1804'
- node-arch: '1n-tx2'
- - stream: '1904'
- os: 'ubuntu1804'
- node-arch: '1n-tx2'
- - stream_timed: '1904'
- os: 'ubuntu1804'
- node-arch: '1n-tx2'
+# exclude:
+# - stream: '1810'
+# os: 'ubuntu1804'
+# node-arch: '1n-tx2'
+# - stream: '1901'
+# os: 'ubuntu1804'
+# node-arch: '1n-tx2'
+# - stream: '1904'
+# os: 'ubuntu1804'
+# node-arch: '1n-tx2'
+# - stream_timed: '1904'
+# os: 'ubuntu1804'
+# node-arch: '1n-tx2'
- job-template:
name: 'csit-vpp-device-{stream}-{os}-{node-arch}'
diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index 66ec3056b..71015b38a 100644
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -86,16 +86,17 @@
os: ubuntu1804
device-node-arch:
- 1n-skx
- - 1n-tx2:
- executor: 'vpp-csit-arm-ubuntu18'
+# Is there a good way to allow manual triggers for tx2?
+# - 1n-tx2:
+# executor: 'vpp-csit-arm-ubuntu18'
node-arch:
- 2n-skx
- 3n-skx
- 3n-hsw
- exclude:
- - stream: '1904'
- os: 'ubuntu1804'
- device-node-arch: '1n-tx2'
+# exclude:
+# - stream: '1904'
+# os: 'ubuntu1804'
+# device-node-arch: '1n-tx2'
- project:
name: vpp-master-only
@@ -237,7 +238,7 @@
publishers:
- fdio-infra-shiplogs:
- maven-version: 'mvn33-new'
+ maven-version: 'mvn36'
- naginator:
rerun-unstable-builds: false
max-failed-builds: 1
@@ -323,7 +324,7 @@
publishers:
- fdio-infra-shiplogs:
- maven-version: 'mvn33-new'
+ maven-version: 'mvn36'
- job-template:
name: 'vpp-arm-verify-{stream}-{os}'
@@ -389,7 +390,7 @@
publishers:
- fdio-infra-shiplogs:
- maven-version: 'mvn33-new'
+ maven-version: 'mvn36'
archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core'
- naginator:
rerun-unstable-builds: false
@@ -478,7 +479,7 @@
publishers:
- fdio-infra-shiplogs:
- maven-version: 'mvn33-new'
+ maven-version: 'mvn36'
- job-template:
name: 'vpp-checkstyle-verify-{stream}'
@@ -569,7 +570,7 @@
publishers:
- fdio-infra-shiplogs:
- maven-version: 'mvn33-new'
+ maven-version: 'mvn36'
archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core'
- naginator:
rerun-unstable-builds: true
@@ -639,7 +640,7 @@
publishers:
- fdio-infra-shiplogs:
- maven-version: 'mvn33-new'
+ maven-version: 'mvn36'
archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core'
- naginator:
rerun-unstable-builds: false
@@ -696,7 +697,7 @@
publishers:
- fdio-infra-shiplogs:
- maven-version: 'mvn33-new'
+ maven-version: 'mvn36'
archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core'
- naginator:
rerun-unstable-builds: false
@@ -785,7 +786,7 @@
publishers:
- fdio-infra-shiplogs:
- maven-version: 'mvn33-new'
+ maven-version: 'mvn36'
- naginator:
rerun-unstable-builds: false
max-failed-builds: 1
@@ -857,7 +858,7 @@
output-path: 'csit_current/'
- fdio-infra-shiplogs:
- maven-version: 'mvn33-new'
+ maven-version: 'mvn36'
- job-template:
name: 'vpp-csit-verify-perf-{stream}-{node-arch}'
@@ -933,7 +934,7 @@
output-path: 'csit_current/0/'
- fdio-infra-shiplogs:
- maven-version: 'mvn33-new'
+ maven-version: 'mvn36'
- job-template:
name: 'vpp-csit-verify-api-crc-{stream}'
@@ -990,4 +991,4 @@
publishers:
- fdio-infra-shiplogs:
- maven-version: 'mvn33-new'
+ maven-version: 'mvn36'