From a857617f6df5d391f226dbe1631c102ba9a1aa47 Mon Sep 17 00:00:00 2001 From: Tibor Frank Date: Thu, 12 Jul 2018 12:35:30 +0200 Subject: [PATCH] CSIT-1117: Update jenkins job infrastructure for 2n/3n testing + 'csit-dpdk-perf-{stream}-{topo}-{arch}' - {stream} [branch_id] - {topo} [2n|3n] - {arch} [skx|hsw|arm] Change-Id: Id179cd1152d0f77bf2ad559603eb9bc964ef9216 Signed-off-by: Tibor Frank --- jjb/csit/csit.yaml | 100 ++++++++++++++++++++++++++ jjb/csit/include-raw-csit-dpdk-perf-verify.sh | 28 ++++++++ 2 files changed, 128 insertions(+) create mode 100644 jjb/csit/include-raw-csit-dpdk-perf-verify.sh diff --git a/jjb/csit/csit.yaml b/jjb/csit/csit.yaml index d6e1ffcc0..88650902a 100644 --- a/jjb/csit/csit.yaml +++ b/jjb/csit/csit.yaml @@ -37,6 +37,7 @@ - 'csit-report-merge-1801_2' - 'csit-trending-daily-master' - 'csit-dpdk-perf-{stream}-{type}' + - 'csit-dpdk-perf-verify-{stream}-{topo}-{arch}' - 'csit-dpdk-perf-mrr-weekly-master' - 'csit-ligato-perf-{stream}-{type}' - 'csit-vpp-perf-{stream}-{type}' @@ -180,6 +181,104 @@ - fdio-infra-shiplogs: maven-version: 'mvn33-new' +- job-template: + name: 'csit-dpdk-perf-verify-{stream}-{topo}-{arch}' + + description: | + + + 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: 'csit-dpdk-{topo}-{arch}-perftest' + 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-dpdk-perf-verify.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-{stream}-{type}' @@ -1103,6 +1202,7 @@
  • analyse: no + project-type: freestyle node: 'ubuntu1604-basebuild-4c-4g' concurrent: true diff --git a/jjb/csit/include-raw-csit-dpdk-perf-verify.sh b/jjb/csit/include-raw-csit-dpdk-perf-verify.sh new file mode 100644 index 000000000..8e6baa7d6 --- /dev/null +++ b/jjb/csit/include-raw-csit-dpdk-perf-verify.sh @@ -0,0 +1,28 @@ +#!/bin/bash + +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-DPDK.sh ] +then + echo 'ERROR: No bootstrap-verify-perf-DPDK.sh found' + exit 1 +fi + +# make sure that bootstrap-verify-perf-DPDK.sh is executable +chmod +x bootstrap-verify-perf-DPDK.sh +# run the script +./bootstrap-verify-perf-DPDK.sh + +# vim: ts=4 ts=4 sts=4 et : -- 2.16.6