Rename job to performance

- rename csit-vpp-functional-hw-tb2 job to csit-vpp-perf-hw (as testing performance) with unified trigger for performance testing
- parameterized job for future extension

Change-Id: I72d1562fad8ad188930f39374f3ebfe8ebb984aa
Signed-off-by: pmikus <pmikus@cisco.com>

diff --git a/jjb/csit/csit-vpp-functional.yaml b/jjb/csit/csit-vpp-functional.yaml
index 3e70389..603000f 100644 (file)
--- a/jjb/csit/csit-vpp-functional.yaml
+++ b/jjb/csit/csit-vpp-functional.yaml
@@ -3,14 +3,15 @@
     description: 'Run VPP functional tests on VIRL.'
 
     jobs:
-        - 'csit-vpp-functional-hw-tb2'
+        - 'csit-vpp-perf-hw-{type}'
         - 'csit-vpp-functional-virl'
         - 'csit-vpp-functional-nodepool'
         - 'csit-vpp-master-verify-weekly'
 
     project: 'csit'
     branch: 'master'
-
+    type:
+        - all
 
 - job-template:
     name: 'csit-vpp-functional-virl'
@@ -60,7 +61,7 @@
             output-path: ''
 
 - job-template:
-    name: 'csit-vpp-functional-hw-tb2'
+    name: 'csit-vpp-perf-hw-{type}'
 
     project-type: freestyle
     node: verify
@@ -77,6 +78,8 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
+        - type-parameter:
+            type: '{type}'
 
     scm:
         - gerrit-trigger-scm:
@@ -93,11 +96,11 @@
         - gerrit-trigger-manually-triggered:
             name: '{project}'
             branch: '{branch}'
-            comment-trigger-value: 'hw-perf-check'
+            comment-trigger-value: 'verify-perf-{type}'
 
     builders:
         - shell:
-            !include-raw-escape jjb/csit/include-raw-csit-vpp-functional-hw-tb2.sh
+            !include-raw-escape jjb/csit/include-raw-csit-vpp-perf-hw.sh
 
     publishers:
         - archive-artifacts:
@@ -189,3 +192,12 @@
                        message: "Verified CSIT version for VPP testing"
                        create-tag: true
                        update-tag: true
+
+- parameter:
+    name: test-type-parameter
+
+    parameters:
+        - string:
+            name: TYPE
+            default: '{type}'
+            description: "Test TYPE parameter if not given by trigger"

diff --git a/jjb/csit/include-raw-csit-vpp-functional-hw-tb2.sh b/jjb/csit/include-raw-csit-vpp-functional-hw-tb2.sh
deleted file mode 100644 (file)
index 8fa41cb..0000000
--- a/jjb/csit/include-raw-csit-vpp-functional-hw-tb2.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-# execute csit bootstrap script if it exists
-if [ -e bootstrap-hw-tb2.sh ]
-then
-    # make sure that bootstrap.sh is executable
-    chmod +x bootstrap-hw-tb2.sh
-    # run the script
-    ./bootstrap-hw-tb2.sh
-else
-    echo 'ERROR: No bootstrap-hw-tb2.sh found'
-    exit 1
-fi
-
-# vim: ts=4 ts=4 sts=4 et :

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