Merge "CSIT-PERF: New trigger design"

diff --git a/jjb/csit/csit.yaml b/jjb/csit/csit.yaml
index 2b497d5..e96f8d8 100644 (file)
--- a/jjb/csit/csit.yaml
+++ b/jjb/csit/csit.yaml
@@ -34,7 +34,6 @@
         - 'csit-vpp-perf-{stream}-{type}'
         - 'csit-vpp-perf-trend-daily-master'
         - 'csit-vpp-perf-trend-semi-weekly-master'
-        - 'csit-vpp-perf-check-{stream}'
         - 'csit-vpp-perf-mrr-daily-master'
         - 'csit-vpp-perf-verify-{stream}'
         - 'csit-nsh_sfc-verify-perf-{stream}'
@@ -915,106 +914,6 @@
         - fdio-infra-shiplogs:
             maven-version: 'mvn33-new'
 
-- job-template:
-    name: 'csit-vpp-perf-check-{stream}'
-
-    description: |
-      consumer
-          csit-dev perf code base checks
-      objective
-          check csit perf code base
-      job
-          name
-              csit-vpp-perf-check
-          trigger
-              see below
-      perf test-cases selection
-          all CSIT perf suites
-      keywords
-          format - keyword, tag_list
-              verify-perf-ndrdisc, NDRDISC
-              verify-perf-pdrdisc, PDRDISC
-              verify-perf-mrr, MRR
-      default tags for vpp startup config and perf test type
-          1T1C
-              one worker thread, one core
-          2T2C
-              two worker threads, two cores
-      results
-          jjb verify
-              PASS/FAIL
-          present
-              no
-          analyse
-              csit project
-                  catch malfunctions
-                  catch degradations
-
-    project-type: freestyle
-    node: 'ubuntu1604-basebuild-4c-4g'
-    concurrent: true
-
-    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}'
-
-    scm:
-        - gerrit-trigger-scm:
-            credentials-id: 'jenkins-gerrit-credentials'
-            refspec: '$GERRIT_REFSPEC'
-            choosing-strategy: 'gerrit'
-
-    wrappers:
-        - fdio-infra-wrappers-non-activity-timeout:
-            build-timeout: '{build-timeout}'
-
-    triggers:
-        - gerrit:
-            server-name: 'Primary'
-            trigger-on:
-                - comment-added-contains-event:
-                    comment-contains-value: 'verify-perf-ndrdisc'
-                - comment-added-contains-event:
-                    comment-contains-value: 'verify-perf-pdrdisc'
-                - comment-added-contains-event:
-                    comment-contains-value: 'verify-perf-mrr'
-            projects:
-              - project-compare-type: 'ANT'
-                project-pattern: '{project}'
-                branches:
-                  - branch-compare-type: 'ANT'
-                    branch-pattern: '**/{branch}'
-            skip-vote:
-                successful: false
-                failed: false
-                unstable: false
-                notbuilt: false
-
-    builders:
-        - shell:
-            !include-raw-escape: jjb/csit/include-raw-csit-vpp-perf-check.sh
-
-    publishers:
-        - archive-artifacts:
-            artifacts: 'archive/*.*'
-            latest-only: false
-
-        - robot:
-            output-path: archive
-            other-files:
-              - '*.*'
-
-        - fdio-infra-shiplogs:
-            maven-version: 'mvn33-new'
-
 - job-template:
     name: 'csit-vpp-perf-mrr-daily-master'
 
@@ -1167,26 +1066,22 @@
           trigger
               keyword in comment to csit patch
       perf test-cases selection
-          test-cases selected using trigger keywords paired with tags
+          test-cases selected using trigger keyword followed by tags
           all test-cases are labelled with CSIT RF topic tags defined in
           csit/docs/tag_documentation.rst
       proposed keywords
           focus on testing specified vpp packet processing path
-          format - keyword - tag_list
-          perf_verify_ip4 - IP4Base, IP4Scale2M
-          perf_verify_ip6 - IP6Base, IP6Scale2M
-          perf_verify_l2 - L2XC, L2BD
-          perf_verify_lisp - 4Lisp, 6Lisp
-          perf_verify_vxlan - Vxlan
-          perf_verify_vhost - Vhost
-          perf_verify_memif - Memif
+          format - csit-perftest tag_list
       default tags for vpp startup config and perf test type
+          IP4BASE, IP6BASE, L2XCBASE, L2BDBASE
+          64B/78B
+              64B/78B packet size
           1T1C
               one worker thread, one core
-          X520
-              x520 Niantic NIC
-          NDRDISC
-              discovery of NDR throughput
+          X710
+              x710 Fortville NIC
+          MRR
+              MDR throughput
       results
           jjb verify
               PASS/FAIL
@@ -1225,21 +1120,7 @@
             server-name: 'Primary'
             trigger-on:
                 - comment-added-contains-event:
-                    comment-contains-value: 'verify-perf-l2'
-                - comment-added-contains-event:
-                    comment-contains-value: 'verify-perf-ip4'
-                - comment-added-contains-event:
-                    comment-contains-value: 'verify-perf-ip6'
-                - comment-added-contains-event:
-                    comment-contains-value: 'verify-perf-lisp'
-                - comment-added-contains-event:
-                    comment-contains-value: 'verify-perf-vxlan'
-                - comment-added-contains-event:
-                    comment-contains-value: 'verify-perf-vhost'
-                - comment-added-contains-event:
-                    comment-contains-value: 'verify-perf-memif'
-                - comment-added-contains-event:
-                    comment-contains-value: 'verify-perf-ipsechw'
+                    comment-contains-value: 'csit-perftest'
             projects:
               - project-compare-type: 'ANT'
                 project-pattern: '{project}'

diff --git a/jjb/csit/include-raw-csit-vpp-perf-check.sh b/jjb/csit/include-raw-csit-vpp-perf-check.sh
deleted file mode 100644 (file)
index 9f518e5..0000000
--- a/jjb/csit/include-raw-csit-vpp-perf-check.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-TRIGGER=`echo ${GERRIT_EVENT_COMMENT_TEXT} \
-    | grep -oE 'verify-perf-(ndrdisc|pdrdisc|mrr)' \
-    | awk '{print toupper($0)}'`
-export TEST_TAG=${TRIGGER}
-
-# execute csit bootstrap script if it exists
-if [ ! -e bootstrap-verify-perf.sh ]
-then
-    echo 'ERROR: No bootstrap-verify-perf.sh found'
-    exit 1
-fi
-
-# make sure that bootstrap-verify-perf.sh is executable
-chmod +x bootstrap-verify-perf.sh
-# run the script
-./bootstrap-verify-perf.sh
-
-# vim: ts=4 ts=4 sts=4 et :

diff --git a/jjb/csit/include-raw-csit-vpp-perf-nightly.sh b/jjb/csit/include-raw-csit-vpp-perf-nightly.sh
deleted file mode 100644 (file)
index c3f9e7d..0000000
--- a/jjb/csit/include-raw-csit-vpp-perf-nightly.sh
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/bash
-set -xeu -o pipefail
-
-# check BRANCH_ID value
-if [ "$BRANCH_ID" == "" ]; then
-    echo "branch_id not provided => 'master' will be used"
-    BRANCH_ID="master"
-fi
-
-#make sure there is no csit directory
-if [ -d "./csit/" ]; then
-    rm -rf ./csit/
-fi
-
-# clone csit
-git clone --depth 1 --no-single-branch https://gerrit.fd.io/r/csit
-
-# if the git clone fails, complain clearly and exit
-if [ $? != 0 ]; then
-    echo "Failed to run: git clone --depth 1 --no-single-branch https://gerrit.fd.io/r/csit"
-    exit 1
-fi
-
-cd csit
-
-# get the latest verified version of the required branch
-BRANCH_NAME=$(echo $(git branch -r | grep -E "${BRANCH_ID}-[0-9]+" | tail -n 1))
-
-if [ "${BRANCH_NAME}" == "" ]; then
-    echo "No verified version found for requested branch - exiting"
-    exit 1
-fi
-
-# remove 'origin/' from the branch name
-BRANCH_NAME=$(echo ${BRANCH_NAME#origin/})
-
-# checkout to the required branch
-git checkout ${BRANCH_NAME}
-
-export TEST_TAG="PERFTEST_NIGHTLY"
-
-# execute csit bootstrap script if it exists
-if [ -e bootstrap-verify-perf.sh ]
-then
-    # make sure that bootstrap.sh is executable
-    chmod +x bootstrap-verify-perf.sh
-    # run the script
-    ./bootstrap-verify-perf.sh
-else
-    echo 'ERROR: No bootstrap-verify-perf.sh found'
-    exit 1
-fi
-
-# vim: ts=4 ts=4 sts=4 et :

diff --git a/jjb/csit/include-raw-csit-vpp-perf-verify.sh b/jjb/csit/include-raw-csit-vpp-perf-verify.sh
index e7d426f..ded4cee 100644 (file)
--- a/jjb/csit/include-raw-csit-vpp-perf-verify.sh
+++ b/jjb/csit/include-raw-csit-vpp-perf-verify.sh
@@ -1,9 +1,17 @@
 #!/bin/bash
 
-TRIGGER=`echo ${GERRIT_EVENT_COMMENT_TEXT} \
-    | grep -oE 'verify-perf-(l2|ip4|ip6|lisp|vxlan|vhost|memif|ipsechw)' \
-    | awk '{print toupper($0)}'`
-export TEST_TAG=${TRIGGER}
+set -xeu -o pipefail
+
+if [[ ${GERRIT_EVENT_TYPE} == 'comment-added' ]]; then
+    TRIGGER=`echo ${GERRIT_EVENT_COMMENT_TEXT} \
+        | grep -oE '(perftest$|perftest[[:space:]].+$)'`
+else
+    TRIGGER=''
+fi
+# Export test type.
+export TEST_TAG="VERIFY-PERF-PATCH"
+# Export test tags as string.
+export TEST_TAG_STRING=${TRIGGER#$"perftest"}
 
 # execute csit bootstrap script if it exists
 if [ ! -e bootstrap-verify-perf.sh ]

diff --git a/jjb/vpp/include-raw-vpp-csit-verify-perf.sh b/jjb/vpp/include-raw-vpp-csit-verify-perf.sh
index c7d091b..c593048 100644 (file)
--- a/jjb/vpp/include-raw-vpp-csit-verify-perf.sh
+++ b/jjb/vpp/include-raw-vpp-csit-verify-perf.sh
@@ -1,10 +1,17 @@
 #!/bin/bash
+
 set -xeu -o pipefail
 
-TRIGGER=`echo ${GERRIT_EVENT_COMMENT_TEXT} \
-    | grep -oE 'vpp-verify-perf-(l2|ip4|ip6|lisp|vxlan|vhost|acl|memif|ipsechw)' \
-    | awk '{print toupper($0)}'`
-export TEST_TAG=${TRIGGER}
+if [[ ${GERRIT_EVENT_TYPE} == 'comment-added' ]]; then
+    TRIGGER=`echo ${GERRIT_EVENT_COMMENT_TEXT} \
+        | grep -oE '(perftest$|perftest[[:space:]].+$)'`
+else
+    TRIGGER=''
+fi
+# Export test type.
+export TEST_TAG="VERIFY-PERF-PATCH"
+# Export test tags as string.
+export TEST_TAG_STRING=${TRIGGER#$"perftest"}
 
 # Get CSIT branch from which to test from
 # running build-root/scripts/csit-test-branch

diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index c130983..b12afd8 100644 (file)
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -799,23 +799,7 @@
             server-name: 'Primary'
             trigger-on:
                 - comment-added-contains-event:
-                    comment-contains-value: 'vpp-verify-perf-l2'
-                - comment-added-contains-event:
-                    comment-contains-value: 'vpp-verify-perf-ip4'
-                - comment-added-contains-event:
-                    comment-contains-value: 'vpp-verify-perf-ip6'
-                - comment-added-contains-event:
-                    comment-contains-value: 'vpp-verify-perf-lisp'
-                - comment-added-contains-event:
-                    comment-contains-value: 'vpp-verify-perf-vxlan'
-                - comment-added-contains-event:
-                    comment-contains-value: 'vpp-verify-perf-vhost'
-                - comment-added-contains-event:
-                    comment-contains-value: 'vpp-verify-perf-acl'
-                - comment-added-contains-event:
-                    comment-contains-value: 'vpp-verify-perf-memif'
-                - comment-added-contains-event:
-                    comment-contains-value: 'vpp-verify-perf-ipsechw'
+                    comment-contains-value: 'perftest'
             projects:
               - project-compare-type: 'ANT'
                 project-pattern: '{project}'