diff options
| author |   Vratko Polak <vrpolak@cisco.com> | 2019-11-14 16:11:38 +0100 |
|---|---|---|
| committer | Vratko Polak <vrpolak@cisco.com> | 2019-11-14 16:11:38 +0100 |
| commit | 3a72c10e36443bba95b4c2d5dd70c44c248a11d8 (patch) | |
| tree | a5e40c5942720c34e846c79de8e3588db902aeba | |
| parent | 38d117a3f1c74089aec468cc9097f86d7df4182f (diff) | |
Set arm executor for taishan
Arm related job need executor override, and one was missing.
In fact, the job definition in question was not ready for overriding,
so it needed edits in multiple places.
+ Added missing executor info to description.
Fixes: 2949329b058bb8ed92d97efb8770ecd713fcca0f
Change-Id: I863a4468abae6d651e20823200889be25094f8ec
Signed-off-by: Vratko Polak <vrpolak@cisco.com>
| -rw-r--r-- | jjb/vpp/vpp.yaml | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml index 42beead6..80363f1d 100644 --- a/jjb/vpp/vpp.yaml +++ b/jjb/vpp/vpp.yaml @@ -72,7 +72,9 @@ - 'vpp-csit-verify-device-{stream}-{device-node-arch}' - 'vpp-csit-verify-perf-{stream}-{node-arch}' project: 'vpp' - executor: 'vpp-csit-device' + os: ubuntu1804 + device-executor: 'vpp-csit-device' + executor: '{os}-us' skip-vote: 'true' trigger: 'gerrit-trigger-csit-devicetest-full' stream: @@ -85,11 +87,10 @@ - '1908': branch: 'stable/1908' repo-stream-part: 'stable.1908' - os: ubuntu1804 device-node-arch: - 1n-skx - 1n-tx2: - executor: 'vpp-csit-arm-ubuntu18' + device-executor: 'vpp-csit-arm-ubuntu18' trigger: 'gerrit-trigger-csit-devicetest-manual' node-arch: - 2n-clx @@ -98,7 +99,8 @@ - 3n-hsw - 2n-dnv - 3n-dnv - - 3n-tsh + - 3n-tsh: + executor: 'ubuntu1804arm-us' exclude: - stream: '1904' os: 'ubuntu1804' @@ -851,12 +853,12 @@ <ul> <li>executor <ul> - <li>{executor} + <li>{device-executor} </ul> </ul> project-type: freestyle - node: '{executor}' + node: '{device-executor}' concurrent: true archive-artifacts: '**/csit_current/**/*.*' latest-only: false @@ -922,9 +924,16 @@ - job-template: name: 'vpp-csit-verify-perf-{stream}-{node-arch}' + description: | + <ul> + <li>executor + <ul> + <li>{executor} + </ul> + </ul> project-type: freestyle - node: '{os}-us' + node: '{executor}' concurrent: true archive-artifacts: > **/csit_current/**/*.* |