Set arm executor for taishan

[ci-management.git] / jjb / vpp / vpp.yaml

diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index 42beead..80363f1 100644 (file)
--- 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/**/*.*