diff options
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/csit/csit.yaml | 16 | ||||
| -rw-r--r-- | jjb/csit/include-raw-csit-vpp-perf-check.sh | 2 | ||||
| -rw-r--r-- | jjb/csit/include-raw-csit-vpp-perf-mrr-daily.sh (renamed from jjb/csit/include-raw-csit-vpp-perf-ndrchk-daily.sh) | 2 | ||||
| -rw-r--r-- | jjb/csit/include-raw-csit-vpp-verify-nightly.sh | 47 |
4 files changed, 10 insertions, 57 deletions
diff --git a/jjb/csit/csit.yaml b/jjb/csit/csit.yaml index 41e88091b..a5639c90e 100644 --- a/jjb/csit/csit.yaml +++ b/jjb/csit/csit.yaml @@ -32,7 +32,7 @@ - 'csit-vpp-perf-trend-daily-master' - 'csit-vpp-perf-trend-semi-weekly-master' - 'csit-vpp-perf-check-{stream}' - - 'csit-vpp-perf-ndrchk-daily-master' + - 'csit-vpp-perf-mrr-daily-master' - 'csit-vpp-perf-verify-{stream}' - 'csit-nsh_sfc-verify-perf-{stream}' - 'csit-nsh_sfc-verify-func-{stream}-{os}-virl' @@ -1431,7 +1431,7 @@ - inject: properties-file: variables.prop - shell: - !include-raw-escape: jjb/csit/include-raw-csit-vpp-verify-nightly.sh + !include-raw-escape: jjb/csit/include-raw-csit-vpp-functional-virl.sh publishers: - archive-artifacts: @@ -2447,7 +2447,7 @@ format - keyword, tag_list verify-perf-ndrdisc, NDRDISC verify-perf-pdrdisc, PDRDISC - verify-perf-ndrchk, NDRCHK + verify-perf-mrr, MRR default tags for vpp startup config and perf test type 1T1C one worker thread, one core @@ -2498,7 +2498,7 @@ - comment-added-contains-event: comment-contains-value: 'verify-perf-pdrdisc' - comment-added-contains-event: - comment-contains-value: 'verify-perf-ndrchk' + comment-contains-value: 'verify-perf-mrr' projects: - project-compare-type: 'ANT' project-pattern: '{project}' @@ -2529,14 +2529,14 @@ maven-version: 'mvn33-new' - job-template: - name: 'csit-vpp-perf-ndrchk-daily-master' + name: 'csit-vpp-perf-mrr-daily-master' description: | objective - check vpp perf ndr chk daily + check vpp perf mrr daily job name - csit-vpp-perf-ndrchk-daily + csit-vpp-perf-mrr-daily trigger daily perf test-cases selection @@ -2579,7 +2579,7 @@ - inject: properties-file: variables.prop - shell: - !include-raw-escape: jjb/csit/include-raw-csit-vpp-perf-ndrchk-daily.sh + !include-raw-escape: jjb/csit/include-raw-csit-vpp-perf-mrr-daily.sh publishers: - archive-artifacts: diff --git a/jjb/csit/include-raw-csit-vpp-perf-check.sh b/jjb/csit/include-raw-csit-vpp-perf-check.sh index 775f78e1c..9f518e51d 100644 --- a/jjb/csit/include-raw-csit-vpp-perf-check.sh +++ b/jjb/csit/include-raw-csit-vpp-perf-check.sh @@ -1,7 +1,7 @@ #!/bin/bash TRIGGER=`echo ${GERRIT_EVENT_COMMENT_TEXT} \ - | grep -oE 'verify-perf-(ndrdisc|pdrdisc|ndrchk)' \ + | grep -oE 'verify-perf-(ndrdisc|pdrdisc|mrr)' \ | awk '{print toupper($0)}'` export TEST_TAG=${TRIGGER} diff --git a/jjb/csit/include-raw-csit-vpp-perf-ndrchk-daily.sh b/jjb/csit/include-raw-csit-vpp-perf-mrr-daily.sh index a4aead5ca..32afbc793 100644 --- a/jjb/csit/include-raw-csit-vpp-perf-ndrchk-daily.sh +++ b/jjb/csit/include-raw-csit-vpp-perf-mrr-daily.sh @@ -37,7 +37,7 @@ BRANCH_NAME=$(echo ${BRANCH_NAME#origin/}) # checkout to the required branch git checkout ${BRANCH_NAME} -export TEST_TAG="PERFTEST_NDRCHK_DAILY" +export TEST_TAG="PERFTEST_MRR_DAILY" # execute csit bootstrap script if it exists if [ -e bootstrap-verify-perf.sh ] diff --git a/jjb/csit/include-raw-csit-vpp-verify-nightly.sh b/jjb/csit/include-raw-csit-vpp-verify-nightly.sh deleted file mode 100644 index 267072bae..000000000 --- a/jjb/csit/include-raw-csit-vpp-verify-nightly.sh +++ /dev/null @@ -1,47 +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 - -# 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} - -# execute csit bootstrap script if it exists -if [ -e bootstrap-vpp-verify-nightly.sh ] -then - # make sure that bootstrap.sh is executable - chmod +x bootstrap-vpp-verify-nightly.sh - # run the script - ./bootstrap-vpp-verify-nightly.sh -else - echo 'ERROR: No bootstrap-vpp-verify-nightly.sh found' - exit 1 -fi - -# vim: ts=4 ts=4 sts=4 et : |