diff options
| author |   Dave Wallace <dwallacelf@gmail.com> | 2020-11-16 19:46:21 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@fd.io> | 2020-11-16 19:46:21 +0000 |
| commit | c4ace68da07efe8ee67955ccbff55a766c543a5f (patch) | |
| tree | 750e2d15d7f1090680bab2e3c625abd90a83a79b | |
| parent | a928454ff9b6cbc8acb6cc2615371c59760c6bdf (diff) | |
| parent | 2d4341cc811f45b554612adb43ac19c4685b5aae (diff) | |
Merge "Update 1n-tx2 VPP Device jobs"
| -rw-r--r-- | jjb/csit/csit-vpp-device.yaml | 11 | ||||
| -rw-r--r-- | jjb/vpp/vpp.yaml | 15 |
2 files changed, 20 insertions, 6 deletions
diff --git a/jjb/csit/csit-vpp-device.yaml b/jjb/csit/csit-vpp-device.yaml index 73d909e2..0b67ee03 100644 --- a/jjb/csit/csit-vpp-device.yaml +++ b/jjb/csit/csit-vpp-device.yaml @@ -19,6 +19,9 @@ - 'ubuntu1804' node-arch: - '1n-skx' + - '1n-tx2': + executor: 'vpp-csit-arm-ubuntu18' + skip-vote: 'true' jobs: - 'csit-vpp-device-{stream}-{os}-{node-arch}' - 'csit-vpp-device-{stream}-{os}-{node-arch}-semiweekly': @@ -48,7 +51,6 @@ executor: 'vpp-csit-device' branch: 'master' branch-id: 'oper' - trigger: 'gerrit-trigger-csit-vpp-devicetest-full' stream: - master: branch: 'master' @@ -65,6 +67,11 @@ - '2009_lts': branch: 'rls2009_lts' branch-id: 'oper-rls2009_lts' + exclude: + - stream: '1908_2' + node-arch: '1n-tx2' + - stream: '2005' + node-arch: '1n-tx2' - job-template: name: 'csit-vpp-device-{stream}-{os}-{node-arch}' @@ -145,7 +152,7 @@ build-timeout: '{build-timeout}' triggers: - - '{trigger}': + - 'gerrit-trigger-csit-vpp-devicetest-full': project: '{project}' branch: '{branch}' skip-vote: '{skip-vote}' diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml index b237c8db..908ef7ce 100644 --- a/jjb/vpp/vpp.yaml +++ b/jjb/vpp/vpp.yaml @@ -12,7 +12,7 @@ # TODO: see if there is a refspec that works without requiring # use of get_gerrit_refspec and hand entering the result # in the WebUI 'Build With Parameters' gerrit refspec field. -# - Use the following to import get_gerrit_refspec into a bash shell +# - Use the following to import get_gerrit_refspec into a bash shell # from the ci-management directory: # $ eval "$(grep -A12 get_gerrit ./docker/scripts/lib_common.sh)" # [end] NOTES @@ -342,7 +342,6 @@ device-executor: 'vpp-csit-device' executor: '{os}-us' skip-vote: 'false' - trigger: 'gerrit-trigger-vpp-csit-devicetest-full' stream: - master: branch: 'master' @@ -360,7 +359,7 @@ - 1n-skx - 1n-tx2: device-executor: 'vpp-csit-arm-ubuntu18' - trigger: 'gerrit-trigger-vpp-csit-devicetest-manual' + skip-vote: 'true' node-arch: - 2n-clx - 2n-skx @@ -372,6 +371,14 @@ - 3n-tsh: executor: 'ubuntu1804arm-s' make-parallel-jobs: '16' + exclude: + - stream: '1908' + device-node-arch: '1n-tx2' + - stream: '2001' + device-node-arch: '1n-tx2' + - stream: '2005' + device-node-arch: '1n-tx2' + # [end] VPP-CSIT-PERPATCH PROJECT # VPP-CSIT-API-CRC PROJECT @@ -1037,7 +1044,7 @@ build-timeout: '90' triggers: - - '{trigger}': + - 'gerrit-trigger-vpp-csit-devicetest-full': name: '{project}' branch: '{branch}' skip-vote: '{skip-vote}' |