diff options
Diffstat (limited to 'jjb')
-rw-r--r-- | jjb/csit/csit.yaml | 168 | ||||
-rw-r--r-- | jjb/csit/include-raw-csit-nsh_sfc-functional-virl.sh | 16 | ||||
-rw-r--r-- | jjb/csit/include-raw-csit-nsh_sfc-perf-hw.sh (renamed from jjb/nsh_sfc/include-raw-csit-nsh_sfc-perf-hw.sh) | 0 | ||||
-rw-r--r-- | jjb/csit/include-raw-csit-vpp-verify-nightly.sh | 47 | ||||
-rw-r--r-- | jjb/deb_dpdk/deb_dpdk.yaml | 3 | ||||
-rw-r--r-- | jjb/nsh_sfc/include-raw-nsh_sfc-csit-functional-virl.sh (renamed from jjb/nsh_sfc/include-raw-csit-nsh_sfc-functional-virl.sh) | 2 | ||||
-rw-r--r-- | jjb/nsh_sfc/include-raw-nsh_sfc-csit-perf-hw.sh | 28 | ||||
-rw-r--r-- | jjb/nsh_sfc/nsh_sfc.yaml | 55 | ||||
-rw-r--r-- | jjb/tldk/include-raw-csit-tldk-functional-virl.sh | 21 | ||||
-rw-r--r-- | jjb/tldk/tldk.yaml | 5 | ||||
-rw-r--r-- | jjb/vpp/vpp.yaml | 6 |
11 files changed, 329 insertions, 22 deletions
diff --git a/jjb/csit/csit.yaml b/jjb/csit/csit.yaml index 71f91a366..0e2a62b74 100644 --- a/jjb/csit/csit.yaml +++ b/jjb/csit/csit.yaml @@ -20,6 +20,8 @@ - 'csit-vpp-perf-check-{stream}' - 'csit-vpp-perf-ndrchk-daily-master' - 'csit-vpp-perf-verify-{stream}' + - 'csit-nsh_sfc-verify-perf-{stream}' + - 'csit-nsh_sfc-verify-func-{stream}-{os}-virl' project: 'csit' branch: 'master' @@ -32,9 +34,6 @@ - master: branch: 'master' branch-id: 'oper' - - '1704': - branch: 'rls1704' - branch-id: 'oper-rls1704' stream: - master: branch: 'master' @@ -1311,6 +1310,61 @@ maven-version: 'mvn33-new' - job-template: + name: 'csit-vpp-verify-{stream_timed}-centos7-nightly' + description: 'Purpose of this job is to validate latest centos7 vpp build from corresponding branch stored in nexus against verified CSIT codebase of corresponding branch.' + + project-type: freestyle + node: centos7-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}' + + scm: + - git-scm: + credentials-id: 'jenkins-gerrit-credentials' + branch: '{branch}' + + wrappers: + - fdio-infra-wrappers: + build-timeout: '{build-timeout}' + + triggers: + - timed: 'H H(3-4) * * *' + + - gerrit-trigger-manually-triggered: + comment-trigger-value: 'vpp-verify-func-centos7' + name: '{project}' + branch: '{branch}' + + builders: + - shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop' + - inject: + properties-file: variables.prop + - shell: + !include-raw-escape: jjb/csit/include-raw-csit-vpp-verify-nightly.sh + + publishers: + - archive-artifacts: + artifacts: 'csit/archive/*.*' + latest-only: false + + - robot-report: + output-path: 'csit/archive' + + - fdio-infra-shiplogs: + maven-version: 'mvn33-new' + +- job-template: name: 'csit-vpp-verify-perf-master-nightly-all' description: 'Purpose of this job is to validate latest vpp build from corresponding branch stored in nexus against verified CSIT codebase of corresponding branch.' @@ -2690,7 +2744,7 @@ build-timeout: '1440' triggers: - - timed: 'H H(20-23) * * *' + - timed: 'H H(17-20) * * *' builders: - shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop' @@ -3078,7 +3132,7 @@ build-timeout: '1440' triggers: - - timed: 'H H(20-23) * * 2,6' + - timed: 'H H(17-20) * * 2,6' builders: - shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop' @@ -3561,7 +3615,7 @@ build-timeout: '1440' triggers: - - timed: 'H H(2-4) * * *' + - timed: 'H H(0-2) * * *' builders: - shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop' @@ -3688,6 +3742,108 @@ - fdio-infra-shiplogs: maven-version: 'mvn33-new' +- job-template: + name: 'csit-nsh_sfc-verify-perf-{stream}' + + 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: 30 + + triggers: + - gerrit-trigger-manually-triggered: + name: '{project}' + branch: '{branch}' + comment-trigger-value: 'csit_nsh_sfc_perf' + + builders: + - shell: + !include-raw-escape: jjb/csit/include-raw-csit-nsh_sfc-perf-hw.sh + + publishers: + - archive-artifacts: + artifacts: 'archive/*.*' + latest-only: false + + - robot-report: + output-path: 'archive' + + - fdio-infra-shiplogs: + maven-version: 'mvn33-new' + +- job-template: + name: 'csit-nsh_sfc-verify-func-{stream}-{os}-virl' + + project-type: freestyle + node: '{os}-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}' + - os-parameter: + os: '{os}' + + scm: + - gerrit-trigger-scm: + credentials-id: 'jenkins-gerrit-credentials' + refspec: '$GERRIT_REFSPEC' + choosing-strategy: 'gerrit' + + wrappers: + - fdio-infra-wrappers: + build-timeout: '{build-timeout}' + + triggers: + - gerrit-trigger-manually-triggered: + name: '{project}' + branch: '{branch}' + comment-trigger-value: 'csit_nsh_sfc_func' + + builders: + - shell: + !include-raw-escape: include-raw-csit-nsh_sfc-functional-virl.sh + + publishers: + - archive-artifacts: + artifacts: 'archive/*.*' + latest-only: false + + - robot-report: + output-path: 'archive' + + - fdio-infra-shiplogs: + maven-version: 'mvn33-new' + - parameter: name: test-type-parameter parameters: diff --git a/jjb/csit/include-raw-csit-nsh_sfc-functional-virl.sh b/jjb/csit/include-raw-csit-nsh_sfc-functional-virl.sh new file mode 100644 index 000000000..3e8857954 --- /dev/null +++ b/jjb/csit/include-raw-csit-nsh_sfc-functional-virl.sh @@ -0,0 +1,16 @@ +#!/bin/bash +set -xeu -o pipefail + +# execute nsh_sfc bootstrap script if it exists +if [ -e bootstrap-nsh_sfc-functional-virl.sh ] +then + # make sure that bootstrap-nsh_sfc-functional-virl.sh is executable + chmod +x bootstrap-nsh_sfc-functional-virl.sh + # run the script + ./bootstrap-nsh_sfc-functional-virl.sh +else + echo 'ERROR: No bootstrap-nsh_sfc-functional-virl.sh found' + exit 1 +fi + +# vim: ts=4 ts=4 sts=4 et : diff --git a/jjb/nsh_sfc/include-raw-csit-nsh_sfc-perf-hw.sh b/jjb/csit/include-raw-csit-nsh_sfc-perf-hw.sh index e79020460..e79020460 100644 --- a/jjb/nsh_sfc/include-raw-csit-nsh_sfc-perf-hw.sh +++ b/jjb/csit/include-raw-csit-nsh_sfc-perf-hw.sh diff --git a/jjb/csit/include-raw-csit-vpp-verify-nightly.sh b/jjb/csit/include-raw-csit-vpp-verify-nightly.sh new file mode 100644 index 000000000..267072bae --- /dev/null +++ b/jjb/csit/include-raw-csit-vpp-verify-nightly.sh @@ -0,0 +1,47 @@ +#!/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 : diff --git a/jjb/deb_dpdk/deb_dpdk.yaml b/jjb/deb_dpdk/deb_dpdk.yaml index 62d55a531..abc238cfe 100644 --- a/jjb/deb_dpdk/deb_dpdk.yaml +++ b/jjb/deb_dpdk/deb_dpdk.yaml @@ -18,6 +18,9 @@ - 1611: branch: '16.11.x' repo-stream-part: 'deb_dpdk_1611' + - 1705: + branch: '17.05.x' + repo-stream-part: 'deb_dpdk_1705' - job-template: name: 'deb_dpdk-verify-{stream}-{os}' diff --git a/jjb/nsh_sfc/include-raw-csit-nsh_sfc-functional-virl.sh b/jjb/nsh_sfc/include-raw-nsh_sfc-csit-functional-virl.sh index 87dd9b8ca..f2144c29c 100644 --- a/jjb/nsh_sfc/include-raw-csit-nsh_sfc-functional-virl.sh +++ b/jjb/nsh_sfc/include-raw-nsh_sfc-csit-functional-virl.sh @@ -7,7 +7,7 @@ git clone https://gerrit.fd.io/r/csit # If the git clone fails, complain clearly and exit if [ $? != 0 ]; then echo "Failed to run: git clone https://gerrit.fd.io/r/csit" -exit + exit 1 fi cd csit diff --git a/jjb/nsh_sfc/include-raw-nsh_sfc-csit-perf-hw.sh b/jjb/nsh_sfc/include-raw-nsh_sfc-csit-perf-hw.sh new file mode 100644 index 000000000..98b1d070e --- /dev/null +++ b/jjb/nsh_sfc/include-raw-nsh_sfc-csit-perf-hw.sh @@ -0,0 +1,28 @@ +#!/bin/bash + +set -xeu -o pipefail + +# Clone csit and start tests +git clone https://gerrit.fd.io/r/csit + +# If the git clone fails, complain clearly and exit +if [ $? != 0 ]; then + echo "Failed to run: git clone https://gerrit.fd.io/r/csit" + exit 1 +fi + +cd csit + +# execute nsh_sfc bootstrap script if it exists +if [ ! -e bootstrap-verify-perf-nsh_sfc.sh ] +then + echo 'ERROR: No bootstrap-verify-perf-nsh_sfc.sh found' + exit 1 +fi + +# make sure that bootstrap-verify-perf.sh is executable +chmod +x bootstrap-verify-perf-nsh_sfc.sh +# run the script +./bootstrap-verify-perf-nsh_sfc.sh + +# vim: ts=4 ts=4 sts=4 et : diff --git a/jjb/nsh_sfc/nsh_sfc.yaml b/jjb/nsh_sfc/nsh_sfc.yaml index 0dde7e323..a21f086b8 100644 --- a/jjb/nsh_sfc/nsh_sfc.yaml +++ b/jjb/nsh_sfc/nsh_sfc.yaml @@ -7,8 +7,6 @@ - 'nsh_sfc-verify-image-{stream}-{os}' - 'nsh_sfc-verify-docs-{stream}' - 'nsh_sfc-merge-docs-{stream}' - - 'csit-nsh_sfc-verify-perf-{stream}' - - 'csit-nsh_sfc-verify-func-{stream}-{os}-virl' project: 'nsh_sfc' os: @@ -27,6 +25,35 @@ - '1704': branch: 'stable/1704' repo-stream-part: 'stable.1704' + - '1707': + branch: 'stable/1707' + repo-stream-part: 'stable.1707' + +- project: + name: nsh_sfc-misc + jobs: + - 'nsh_sfc-csit-verify-perf-{stream}' + - 'nsh_sfc-csit-verify-func-{stream}-{os}-virl' + + project: 'nsh_sfc' + stream: + - master: + branch: 'master' + repo-stream-part: 'master' + - '1609': + branch: 'stable/1609' + repo-stream-part: 'stable.1609' + - '1701': + branch: 'stable/1701' + repo-stream-part: 'stable.1609' + - '1704': + branch: 'stable/1704' + repo-stream-part: 'stable.1704' + - '1707': + branch: 'stable/1707' + repo-stream-part: 'stable.1707' + + os: ubuntu1604 - job-template: name: 'nsh_sfc-verify-{stream}-{os}' @@ -456,7 +483,7 @@ maven-version: 'mvn33-new' - job-template: - name: 'csit-nsh_sfc-verify-perf-{stream}' + name: 'nsh_sfc-csit-verify-perf-{stream}' project-type: freestyle node: 'ubuntu1604-basebuild-4c-4g' @@ -473,6 +500,10 @@ project: '{project}' - gerrit-parameter: branch: '{branch}' + - os-parameter: + os: '{os}' + - repo-name-parameter: + repo-name: '{repo-stream-part}.ubuntu.xenial.main' scm: - gerrit-trigger-scm: @@ -488,25 +519,25 @@ - gerrit-trigger-manually-triggered: name: '{project}' branch: '{branch}' - comment-trigger-value: 'nsh_sfc_perf_weekly' + comment-trigger-value: 'nsh_sfc_perf' builders: - shell: - !include-raw-escape: jjb/nsh_sfc/include-raw-csit-nsh_sfc-perf-hw.sh + !include-raw-escape: include-raw-nsh_sfc-csit-perf-hw.sh publishers: - archive-artifacts: - artifacts: 'report.html, log.html, output.xml, output_perf_data.xml' + artifacts: 'csit/archive/*.*' latest-only: false - robot-report: - output-path: '' + output-path: 'csit/archive' - fdio-infra-shiplogs: maven-version: 'mvn33-new' - job-template: - name: 'csit-nsh_sfc-verify-func-{stream}-{os}-virl' + name: 'nsh_sfc-csit-verify-func-{stream}-{os}-virl' project-type: freestyle node: '{os}-basebuild-4c-4g' @@ -526,7 +557,7 @@ - os-parameter: os: '{os}' - repo-name-parameter: - repo-name: '{repo-stream-part}.{repo-os-part}' + repo-name: '{repo-stream-part}.ubuntu.xenial.main' scm: - gerrit-trigger-scm: @@ -546,15 +577,15 @@ builders: - shell: - !include-raw-escape: include-raw-csit-nsh_sfc-functional-virl.sh + !include-raw-escape: include-raw-nsh_sfc-csit-functional-virl.sh publishers: - archive-artifacts: - artifacts: 'report.html, log.html, output.xml' + artifacts: 'csit/archive/*.*' latest-only: false - robot-report: - output-path: '' + output-path: 'csit/archive' - fdio-infra-shiplogs: maven-version: 'mvn33-new' diff --git a/jjb/tldk/include-raw-csit-tldk-functional-virl.sh b/jjb/tldk/include-raw-csit-tldk-functional-virl.sh index b18290cdc..0192a125b 100644 --- a/jjb/tldk/include-raw-csit-tldk-functional-virl.sh +++ b/jjb/tldk/include-raw-csit-tldk-functional-virl.sh @@ -1,4 +1,25 @@ #!/bin/bash +set -xeu -o pipefail + +# Clone tldk and start tests +git clone https://gerrit.fd.io/r/tldk + +# If the git clone fails, complain clearly and exit +if [ $? != 0 ]; then + echo "Failed to run: git clone https://gerrit.fd.io/r/tldk" + exit 1 +fi + +# Clone csit and start tests +git clone https://gerrit.fd.io/r/csit + +# If the git clone fails, complain clearly and exit +if [ $? != 0 ]; then + echo "Failed to run: git clone https://gerrit.fd.io/r/csit" + exit 1 +fi + +cd csit # execute nsh_sfc bootstrap script if it exists if [ -e bootstrap-TLDK.sh ] diff --git a/jjb/tldk/tldk.yaml b/jjb/tldk/tldk.yaml index a91183cb2..766e0a724 100644 --- a/jjb/tldk/tldk.yaml +++ b/jjb/tldk/tldk.yaml @@ -8,9 +8,7 @@ project: 'tldk' os: - - ubuntu1404 - ubuntu1604 - - centos7 stream: - master: branch: 'master' @@ -201,9 +199,10 @@ build-timeout: '{build-timeout}' triggers: - - gerrit-trigger-patch-submitted: + - gerrit-trigger-manually-triggered: name: '{project}' branch: '{branch}' + comment-trigger-value: 'verify-tldk-func' builders: - shell: diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml index f936158c3..4cd56a7dc 100644 --- a/jjb/vpp/vpp.yaml +++ b/jjb/vpp/vpp.yaml @@ -35,6 +35,9 @@ - '1704': branch: 'stable/1704' repo-stream-part: 'stable.1704' + - '1707': + branch: 'stable/1707' + repo-stream-part: 'stable.1707' type: - short - long @@ -64,6 +67,9 @@ - '1704': branch: 'stable/1704' repo-stream-part: 'stable.1704' + - '1707': + branch: 'stable/1707' + repo-stream-part: 'stable.1707' os: ubuntu1604 |