Add arm 1n-tx2 VPP Device jobs

Change-Id: I7bd77d96c3451415dabe20e097185b871eb2c8a2
Signed-off-by: juraj.linkes <juraj.linkes@pantheon.tech>

3 files changed, 23 insertions, 26 deletions

diff --git a/jjb/vpp/include-raw-vpp-parallel-vars.sh b/jjb/vpp/include-raw-vpp-parallel-vars.sh
index c0d2e4bd5..1a5de149f 100644
--- a/jjb/vpp/include-raw-vpp-parallel-vars.sh
+++ b/jjb/vpp/include-raw-vpp-parallel-vars.sh
@@ -1,24 +1,8 @@
 #!/bin/bash
 CORES=4
-if [[ -z ${NODE_NAME+x} || -z ${NODE_LABELS+x} ]]
+if [[ $(uname -m) == 'aarch64' ]]
 then
-    echo "NODE_NAME or NODE_LABELS is not set, using defaults for parallel build/test"
-else
-    for NODE_LABEL in $NODE_LABELS
-    do
-        # NODE_LABELS is jenkins-SOMEHEX and the label we're looking for
-        # NODE_NAME is jenkins-SOMEHEX
-        if [[ $NODE_NAME != $NODE_LABEL ]]
-        then
-            # Found label such as ubuntu1804arm-us
-            break
-        fi
-    done
-
-    if [[ $NODE_LABEL == ubuntu*arm-* ]]
-    then
-        CORES=16
-    fi
+    CORES=16
 fi
 
 echo "Using MAKE_PARALLEL_FLAGS='-j $CORES' TEST_JOBS=$CORES for parallel build/test"
diff --git a/jjb/vpp/vpp-macros.yaml b/jjb/vpp/vpp-macros.yaml
index 5b544d464..8b1fe65c3 100644
--- a/jjb/vpp/vpp-macros.yaml
+++ b/jjb/vpp/vpp-macros.yaml
@@ -76,7 +76,7 @@
                 - branch-compare-type: 'ANT'
                   branch-pattern: '**/{branch}'
           skip-vote:
-            successful: true
-            failed: true
-            unstable: true
-            notbuilt: true
+            successful: '{skip-vote}'
+            failed: '{skip-vote}'
+            unstable: '{skip-vote}'
+            notbuilt: '{skip-vote}'
diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index 1a3192012..eebe0a32d 100644
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -62,9 +62,11 @@
 - project:
     name: vpp-perpatch
     jobs:
-      - 'vpp-csit-verify-device-{stream}-1n-skx'
+      - 'vpp-csit-verify-device-{stream}-{device-node-arch}'
       - 'vpp-csit-verify-perf-{stream}-{node-arch}'
     project: 'vpp'
+    executor: 'vpp-csit-device'
+    skip-vote: 'true'
     stream:
       - master:
           branch: 'master'
@@ -73,10 +75,18 @@
           branch: 'stable/1904'
           repo-stream-part: 'stable.1904'
     os: ubuntu1804
+    device-node-arch:
+      - 1n-skx
+      - 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'
 
 - project:
     name: vpp-master-only
@@ -748,10 +758,10 @@
           fixed-delay: 90
 
 - job-template:
-    name: 'vpp-csit-verify-device-{stream}-1n-skx'
+    name: 'vpp-csit-verify-device-{stream}-{device-node-arch}'
 
     project-type: freestyle
-    node: 'vpp-csit-device'
+    node: '{executor}'
     concurrent: true
     archive-artifacts: '**/csit_current/**/*.*'
     latest-only: false
@@ -796,6 +806,7 @@
       - gerrit-trigger-csit-devicetest:
           name: '{project}'
           branch: '{branch}'
+          skip-vote: '{skip-vote}'
 
     builders:
       - shell:
@@ -803,7 +814,9 @@
       - shell:
           !include-raw-escape: ../scripts/setup_vpp_dpdk_dev_env.sh
       - shell:
-          !include-raw-escape: include-raw-vpp-csit-device.sh
+          !include-raw-escape:
+            - include-raw-vpp-parallel-vars.sh
+            - include-raw-vpp-csit-device.sh
 
     publishers:
       - robot-report: