From: Ed Kern <ejk@cisco.com>
Date: Thu, 21 Feb 2019 16:06:59 +0000 (+0000)
Subject: Merge "Support more testbeds in vpp perf job"
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=4934e4c96e53615f73315453808fd8113e27e99d;hp=5183ecc788812a983ddb60bbfaa27f0d5a48c123;p=ci-management.git

Merge "Support more testbeds in vpp perf job"
---

diff --git a/jjb/vpp/vpp-macros.yaml b/jjb/vpp/vpp-macros.yaml
index 36cf95922..185efe6df 100644
--- 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 5e8769a1e..a9fb10653 100644
--- 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: