Merge "New stream for hc2vpp stable/1701"

diff --git a/jjb/csit/csit.yaml b/jjb/csit/csit.yaml
index e3fdbe8..e92d5c8 100644 (file)
--- a/jjb/csit/csit.yaml
+++ b/jjb/csit/csit.yaml
@@ -3,6 +3,7 @@
     description: 'CSIT jenkins jobs.'
 
     jobs:
+        - 'csit-dpdk-perf-{stream}-{type}'
         - 'csit-vpp-perf-{stream}-{type}'
         - 'csit-vpp-functional-{stream}-virl'
         - 'csit-vpp-verify-{stream_timed}-weekly'
@@ -83,6 +84,58 @@
         - fdio-infra-shiplogs:
             maven-version: 'mvn33-new'
 
+- job-template:
+    name: 'csit-dpdk-perf-{stream}-{type}'
+
+    project-type: freestyle
+    node: ubuntu1604-basebuild-4c-4g
+    concurrent: false
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
+        - type-parameter:
+            type: '{type}'
+
+    scm:
+        - gerrit-trigger-scm:
+            credentials-id: 'jenkins-gerrit-credentials'
+            refspec: '$GERRIT_REFSPEC'
+            choosing-strategy: 'gerrit'
+
+    wrappers:
+      - fdio-infra-wrappers-non-activity-timeout:
+          build-timeout: 30
+
+    triggers:
+        - gerrit-trigger-manually-triggered:
+            name: '{project}'
+            branch: '{branch}'
+            comment-trigger-value: 'verify-perf-dpdk-{type}'
+
+    builders:
+        - shell:
+            !include-raw-escape: jjb/csit/include-raw-csit-dpdk-perf-hw.sh
+
+    publishers:
+        - archive-artifacts:
+            artifacts: 'report.html, log.html, output.xml, output_perf_data.xml'
+            latest-only: false
+
+        - robot-report:
+            output-path: ''
+
+        - fdio-infra-shiplogs:
+            maven-version: 'mvn33-new'
+
 - job-template:
     name: 'csit-vpp-perf-{stream}-{type}'
 
@@ -646,8 +699,8 @@
     scm:
         - gerrit-trigger-scm:
             credentials-id: 'jenkins-gerrit-credentials'
-            refspec: '$GERRIT_REFSPEC'
-            choosing-strategy: 'gerrit'
+            refspec: ''
+            choosing-strategy: 'default'
 
     wrappers:
         - fdio-infra-wrappers:
@@ -657,12 +710,19 @@
 
     triggers:
         - reverse:
-            jobs: 'csit-vpp-verify-master-weekly'
+            jobs: 'csit-vpp-verify-{stream}-weekly'
             result: 'success'
         - gerrit:
+            server-name: 'Primary'
             trigger-on:
                 - comment-added-contains-event:
                     comment-contains-value: 'run-docs'
+            projects:
+              - project-compare-type: 'ANT'
+                project-pattern: '{project}'
+                branches:
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
             skip-vote:
                 successful: true
                 failed: true

diff --git a/jjb/csit/include-raw-csit-dpdk-perf-hw.sh b/jjb/csit/include-raw-csit-dpdk-perf-hw.sh
new file mode 100644 (file)
index 0000000..4b513fb
--- /dev/null
+++ b/jjb/csit/include-raw-csit-dpdk-perf-hw.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+export TEST_TAG="PERFTEST_${TYPE^^}"
+
+# execute csit bootstrap script if it exists
+if [ ! -e bootstrap-verify-perf-DPDK.sh ]
+then
+    echo 'ERROR: No bootstrap-verify-perf-DPDK.sh found'
+    exit 1
+fi
+
+# make sure that bootstrap-verify-perf.sh is executable
+chmod +x bootstrap-verify-perf-DPDK.sh
+# run the script
+./bootstrap-verify-perf-DPDK.sh *.deb
+
+# vim: ts=4 ts=4 sts=4 et :