Support more testbeds in vpp perf job

The downside is that triggers have to be different.
Specifically, "perftest" cannot be an alias of "perftest-2n-skx",
because it would also fire on "perftest-3n-skx".

Change-Id: I4aa356ecb6702dfa86ff6af34a6773ab4006cfcb
Signed-off-by: Vratko Polak <vrpolak@cisco.com>

diff --git a/jjb/vpp/vpp-macros.yaml b/jjb/vpp/vpp-macros.yaml
index 36cf959..185efe6 100644 (file)
--- a/jjb/vpp/vpp-macros.yaml
+++ b/jjb/vpp/vpp-macros.yaml
@@ -46,7 +46,7 @@
           server-name: 'Primary'
           trigger-on:
             - comment-added-contains-event:
-                comment-contains-value: 'perftest'
+                comment-contains-value: 'perftest-{node-arch}'
           projects:
             - project-compare-type: 'ANT'
               project-pattern: '{name}'

diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index 5e8769a..a9fb106 100644 (file)
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -80,14 +80,18 @@
 - project:
     name: vpp-perpatch
     jobs:
-      - 'vpp-csit-verify-perf-{stream}-2n-skx'
       - 'vpp-csit-verify-device-{stream}-1n-skx'
+      - 'vpp-csit-verify-perf-{stream}-{node-arch}'
     project: 'vpp'
     stream:
       - master:
           branch: 'master'
           repo-stream-part: 'master'
     os: ubuntu1804
+    node-arch:
+      - 2n-skx
+      - 3n-skx
+      - 3n-hsw
 
 - project:
     name: vpp-master-only
@@ -992,7 +996,7 @@
           maven-version: 'mvn33-new'
 
 - job-template:
-    name: 'vpp-csit-verify-perf-{stream}-2n-skx'
+    name: 'vpp-csit-verify-perf-{stream}-{node-arch}'
 
     project-type: freestyle
     node: '{os}-us'
@@ -1042,6 +1046,7 @@
       - gerrit-trigger-csit-perftest:
           name: '{project}'
           branch: '{branch}'
+          node-arch: '{node-arch}'
 
     builders:
       - shell: