diff options
Diffstat (limited to 'jjb')
21 files changed, 515 insertions, 54 deletions
diff --git a/jjb/csit/csit.yaml b/jjb/csit/csit.yaml index 510cc6cce..a7966088d 100644 --- a/jjb/csit/csit.yaml +++ b/jjb/csit/csit.yaml @@ -1,3 +1,17 @@ +# Copyright (c) 2017 Cisco and/or its affiliates. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at: +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + + - project: name: csit description: 'CSIT jenkins jobs.' @@ -20,6 +34,9 @@ - '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' + - 'csit-tldk-verify-func-{stream}-{os}-virl' project: 'csit' branch: 'master' @@ -32,9 +49,9 @@ - master: branch: 'master' branch-id: 'oper' - - '1704': - branch: 'rls1704' - branch-id: 'oper-rls1704' + - '1707': + branch: 'rls1707' + branch-id: 'oper-rls1707' stream: - master: branch: 'master' @@ -51,6 +68,9 @@ - '1704': branch: 'rls1704' branch-id: 'oper-rls1704' + - '1707': + branch: 'rls1707' + branch-id: 'oper-rls1707' - job-template: @@ -1311,6 +1331,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.' @@ -3688,6 +3763,160 @@ - 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' + +- job-template: + name: 'csit-tldk-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_verify_tldk_func' + + builders: + - shell: + !include-raw-escape: include-raw-csit-tldk-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-tldk-functional-virl.sh b/jjb/csit/include-raw-csit-tldk-functional-virl.sh new file mode 100644 index 000000000..bcaf17bd2 --- /dev/null +++ b/jjb/csit/include-raw-csit-tldk-functional-virl.sh @@ -0,0 +1,38 @@ +#!/bin/bash +# Copyright (c) 2017 Cisco and/or its affiliates. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at: +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +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 + +# execute tldk bootstrap script if it exists +if [ -e bootstrap-TLDK.sh ] +then + # make sure that bootstrap-TLDK.sh is executable + chmod +x bootstrap-TLDK.sh + # run the script + ./bootstrap-TLDK.sh +else + echo 'ERROR: No bootstrap-TLDK.sh found' + exit 1 +fi + +# vim: ts=4 ts=4 sts=4 et : 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/hc2vpp/hc2vpp-csit.yaml b/jjb/hc2vpp/hc2vpp-csit.yaml index 4b4036569..54921a438 100644 --- a/jjb/hc2vpp/hc2vpp-csit.yaml +++ b/jjb/hc2vpp/hc2vpp-csit.yaml @@ -18,6 +18,9 @@ - '1704': branch: 'stable/1704' repo-stream-part: 'stable.1704' + - '1707': + branch: 'stable/1707' + repo-stream-part: 'stable.1707' os: - ubuntu1604: repo-os-part: 'ubuntu.xenial.main' diff --git a/jjb/hc2vpp/hc2vpp.yaml b/jjb/hc2vpp/hc2vpp.yaml index 68282f3c3..7df7cc501 100644 --- a/jjb/hc2vpp/hc2vpp.yaml +++ b/jjb/hc2vpp/hc2vpp.yaml @@ -23,6 +23,9 @@ - '1704': branch: 'stable/1704' repo-stream-part: 'stable.1704' + - '1707': + branch: 'stable/1707' + repo-stream-part: 'stable.1707' - job-template: name: 'hc2vpp-verify-{stream}-{os}' diff --git a/jjb/hc2vpp/include-raw-hc2vpp-csit-verify-prebuild.sh b/jjb/hc2vpp/include-raw-hc2vpp-csit-verify-prebuild.sh index 77992b450..c08b8309d 100644 --- a/jjb/hc2vpp/include-raw-hc2vpp-csit-verify-prebuild.sh +++ b/jjb/hc2vpp/include-raw-hc2vpp-csit-verify-prebuild.sh @@ -25,9 +25,9 @@ fi cd csit if [ ${STREAM} == 'master' ]; then - ./resources/tools/download_hc_build_pkgs.sh ${STREAM} ${OS} + ./resources/tools/scripts/download_hc_build_pkgs.sh ${STREAM} ${OS} else - ./resources/tools/download_hc_build_pkgs.sh 'stable.'${STREAM} ${OS} + ./resources/tools/scripts/download_hc_build_pkgs.sh 'stable.'${STREAM} ${OS} fi cd ${current_dir} diff --git a/jjb/honeycomb/honeycomb.yaml b/jjb/honeycomb/honeycomb.yaml index 69fa8373a..c049a8749 100644 --- a/jjb/honeycomb/honeycomb.yaml +++ b/jjb/honeycomb/honeycomb.yaml @@ -21,6 +21,9 @@ - '1704': branch: 'stable/1704' repo-stream-part: 'stable.1704' + - '1707': + branch: 'stable/1707' + repo-stream-part: 'stable.1707' - job-template: name: 'honeycomb-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 7d630becd..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: 'csit/report.html, csit/log.html, csit/output.xml, csit/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: 'csit/report.html, csit/log.html, csit/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/scripts/setup_vpp_dpdk_dev_env.sh b/jjb/scripts/setup_vpp_dpdk_dev_env.sh index cfb99615e..f36bcaad8 100644 --- a/jjb/scripts/setup_vpp_dpdk_dev_env.sh +++ b/jjb/scripts/setup_vpp_dpdk_dev_env.sh @@ -26,6 +26,7 @@ function setup { echo "deb ${REPO_URL} ./" | sudo tee /etc/apt/sources.list.d/99fd.io.list sudo apt-get update || true sudo apt-get -y --force-yes install vpp-dpdk-dev || true + sudo apt-get -y --force-yes install vpp-dpdk-dkms || true elif [[ $DISTRIB_ID == "CentOS" ]]; then sudo cat << EOF > fdio-master.repo [fdio-master] diff --git a/jjb/tldk/include-raw-csit-tldk-functional-virl.sh b/jjb/tldk/include-raw-csit-tldk-functional-virl.sh deleted file mode 100644 index 1f57e8255..000000000 --- a/jjb/tldk/include-raw-csit-tldk-functional-virl.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/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 -fi - -cd csit - -# execute nsh_sfc bootstrap script if it exists -if [ -e bootstrap-TLDK.sh ] -then - # make sure that bootstrap-TLDK.sh is executable - chmod +x bootstrap-TLDK.sh - # run the script - ./bootstrap-TLDK.sh -else - echo 'ERROR: No bootstrap-TLDK.sh found' - exit 1 -fi - -# vim: ts=4 ts=4 sts=4 et : diff --git a/jjb/tldk/include-raw-tldk-csit-functional-virl.sh b/jjb/tldk/include-raw-tldk-csit-functional-virl.sh new file mode 100644 index 000000000..547a000f7 --- /dev/null +++ b/jjb/tldk/include-raw-tldk-csit-functional-virl.sh @@ -0,0 +1,52 @@ +#!/bin/bash +# Copyright (c) 2017 Cisco and/or its affiliates. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at: +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +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 + +# Move the tldk to the csit dir +sudo mv -f ./tldk/ ./csit/ + +cd csit + +# execute nsh_sfc bootstrap script if it exists +if [ -e bootstrap-TLDK.sh ] +then + # make sure that bootstrap-TLDK.sh is executable + chmod +x bootstrap-TLDK.sh + # run the script + ./bootstrap-TLDK.sh +else + echo 'ERROR: No bootstrap-TLDK.sh found' + exit 1 +fi + +# vim: ts=4 ts=4 sts=4 et : diff --git a/jjb/tldk/tldk.yaml b/jjb/tldk/tldk.yaml index 3f86e96a2..41e1b5469 100644 --- a/jjb/tldk/tldk.yaml +++ b/jjb/tldk/tldk.yaml @@ -1,10 +1,24 @@ +# Copyright (c) 2017 Cisco and/or its affiliates. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at: +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + + - project: name: tldk jobs: - '{project}-verify-{stream}-{os}' - '{project}-merge-{stream}-{os}' - '{project}-verify-image-{stream}-{os}' - - 'csit-tldk-verify-func-{stream}-{os}-virl' + - 'tldk-csit-verify-func-{stream}-{os}-virl' project: 'tldk' os: @@ -170,7 +184,7 @@ maven-version: 'mvn33-new' - job-template: - name: 'csit-tldk-verify-func-{stream}-{os}-virl' + name: 'tldk-csit-verify-func-{stream}-{os}-virl' project-type: freestyle node: '{os}-basebuild-4c-4g' @@ -199,17 +213,18 @@ 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: - !include-raw-escape: include-raw-csit-tldk-functional-virl.sh + !include-raw-escape: include-raw-tldk-csit-functional-virl.sh publishers: - archive-artifacts: - artifacts: 'report.html, log.html, output.xml' + artifacts: 'csit/report.html, csit/log.html, csit/output.xml' latest-only: false - robot-report: diff --git a/jjb/vpp/include-raw-vpp-build.sh b/jjb/vpp/include-raw-vpp-build.sh index b51b41a32..5bcd35734 100644 --- a/jjb/vpp/include-raw-vpp-build.sh +++ b/jjb/vpp/include-raw-vpp-build.sh @@ -39,7 +39,9 @@ then echo "Building using \"make verify\"" [ "x${DRYRUN}" == "xTrue" ] || make UNATTENDED=yes verify else - echo "Building using \"build-root/vagrant/build.sh\"" + echo "Building using \"make build-root/vagrant/build.sh\"" + [ "x${DRYRUN}" == "xTrue" ] || make install-dep + [ "x${DRYRUN}" == "xTrue" ] || make UNATTENDED=yes dpdk-install-dev [ "x${DRYRUN}" == "xTrue" ] || build-root/vagrant/build.sh fi diff --git a/jjb/vpp/include-raw-vpp-csit-functional.sh b/jjb/vpp/include-raw-vpp-csit-functional.sh index 33eef0f38..38ef7e08e 100644 --- a/jjb/vpp/include-raw-vpp-csit-functional.sh +++ b/jjb/vpp/include-raw-vpp-csit-functional.sh @@ -18,6 +18,13 @@ if [ $? != 0 ]; then fi cp build-root/*.deb csit/ +if [ -e dpdk/vpp-dpdk-dkms*.deb ] +then + cp dpdk/vpp-dpdk-dkms*.deb csit/ +else + cp /var/cache/apt/archives/vpp-dpdk-dkms*.deb csit/ +fi + cd csit # execute csit bootstrap script if it exists if [ -e bootstrap.sh ] diff --git a/jjb/vpp/include-raw-vpp-csit-verify-perf.sh b/jjb/vpp/include-raw-vpp-csit-verify-perf.sh index b601137b0..4a7480ae1 100644 --- a/jjb/vpp/include-raw-vpp-csit-verify-perf.sh +++ b/jjb/vpp/include-raw-vpp-csit-verify-perf.sh @@ -23,6 +23,13 @@ if [ $? != 0 ]; then fi cp build-root/*.deb csit/ +if [ -e dpdk/vpp-dpdk-dkms*.deb ] +then + cp dpdk/vpp-dpdk-dkms*.deb csit/ +else + cp /var/cache/apt/archives/vpp-dpdk-dkms*.deb csit/ +fi + cd csit # execute csit bootstrap script if it exists if [ ! -e bootstrap-verify-perf.sh ] diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml index 70f844fa9..4cd56a7dc 100644 --- a/jjb/vpp/vpp.yaml +++ b/jjb/vpp/vpp.yaml @@ -317,13 +317,15 @@ builders: - shell: - !include-raw-escape: include-raw-vpp-checkstyle.sh + !include-raw-escape: + - include-raw-vpp-checkstyle.sh - shell: !include-raw-escape: - ../scripts/setup_vpp_dpdk_dev_env.sh - include-raw-vpp-build.sh - shell: - !include-raw-escape: include-raw-vpp-csit-functional.sh + !include-raw-escape: + - include-raw-vpp-csit-functional.sh publishers: - archive-artifacts: @@ -405,7 +407,8 @@ - ../scripts/setup_vpp_dpdk_dev_env.sh - include-raw-vpp-build.sh - shell: - !include-raw-escape: include-raw-vpp-csit-verify-perf.sh + !include-raw-escape: + - include-raw-vpp-csit-verify-perf.sh publishers: - archive-artifacts: |