Merge "HC2VPP-372: Update HC2VPP jobs for bionic"

diff --git a/jjb/csit/csit.yaml b/jjb/csit/csit.yaml
index aad5508..4ce551b 100644 (file)
--- a/jjb/csit/csit.yaml
+++ b/jjb/csit/csit.yaml
@@ -64,9 +64,6 @@
       - master:
           branch: 'master'
           branch-id: 'oper'
-      - '1901':
-          branch: 'rls1901'
-          branch-id: 'oper-rls1901'
     stream:
       - master:
           branch: 'master'
@@ -1035,7 +1032,7 @@
           build-timeout: '{build-timeout}'
 
     triggers:
-      - timed: '0 16 * * 1,3,5'
+      - timed: '0 16 * * *'
 
     builders:
       - shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop'
@@ -1103,7 +1100,7 @@
           build-timeout: '{build-timeout}'
 
     triggers:
-      - timed: '0 16 * * 1,3,5'
+      - timed: '0 2,14 * * *'
 
     builders:
       - shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop'
@@ -1171,7 +1168,7 @@
           build-timeout: '{build-timeout}'
 
     triggers:
-      - timed: '0 16 * * 1,3,5'
+      - timed: '0 2,14 * * *'
 
     builders:
       - shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop'
@@ -1239,7 +1236,7 @@
           build-timeout: '{build-timeout}'
 
     triggers:
-      - timed: '0 16 * * 1,3,5'
+      - timed: '0 2,14 * * *'
 
     builders:
       - shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop'

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: