diff options
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/apex/apex.yml | 10 | ||||
| -rw-r--r-- | jjb/apex/apex.yml.j2 | 6 | ||||
| -rw-r--r-- | jjb/compass4nfv/compass-ci-jobs.yml | 8 | ||||
| -rwxr-xr-x | jjb/functest/set-functest-env.sh | 11 | ||||
| -rwxr-xr-x | jjb/securedlab/check-jinja2.sh | 2 | ||||
| -rw-r--r-- | jjb/yardstick/yardstick-project-jobs.yml | 13 |
6 files changed, 36 insertions, 14 deletions
diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml index 43a0b9fdd..de565ed66 100644 --- a/jjb/apex/apex.yml +++ b/jjb/apex/apex.yml @@ -528,6 +528,8 @@ block-level: 'NODE' blocking-jobs: - 'apex-deploy.*' + - 'functest.*' + - 'yardstick.*' - throttle: max-per-node: 1 max-total: 10 @@ -662,7 +664,7 @@ current-parameters: false predefined-parameters: | GERRIT_BRANCH=$GERRIT_BRANCH - GERRIT_REFSPEC=$GERRIT_REFSPEC + GERRIT_REFSPEC= GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE node-parameters: true @@ -678,7 +680,7 @@ predefined-parameters: | BUILD_DIRECTORY=apex-build-danube/.build GERRIT_BRANCH=$GERRIT_BRANCH - GERRIT_REFSPEC=$GERRIT_REFSPEC + GERRIT_REFSPEC= GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE node-parameters: true @@ -993,7 +995,7 @@ current-parameters: false predefined-parameters: | GERRIT_BRANCH=$GERRIT_BRANCH - GERRIT_REFSPEC=$GERRIT_REFSPEC + GERRIT_REFSPEC= GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE node-parameters: true @@ -1009,7 +1011,7 @@ predefined-parameters: | BUILD_DIRECTORY=apex-build-master/.build GERRIT_BRANCH=$GERRIT_BRANCH - GERRIT_REFSPEC=$GERRIT_REFSPEC + GERRIT_REFSPEC= GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE node-parameters: true diff --git a/jjb/apex/apex.yml.j2 b/jjb/apex/apex.yml.j2 index a3c56cd82..d739a7068 100644 --- a/jjb/apex/apex.yml.j2 +++ b/jjb/apex/apex.yml.j2 @@ -528,6 +528,8 @@ block-level: 'NODE' blocking-jobs: - 'apex-deploy.*' + - 'functest.*' + - 'yardstick.*' - throttle: max-per-node: 1 max-total: 10 @@ -662,7 +664,7 @@ current-parameters: false predefined-parameters: | GERRIT_BRANCH=$GERRIT_BRANCH - GERRIT_REFSPEC=$GERRIT_REFSPEC + GERRIT_REFSPEC= GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE node-parameters: true @@ -678,7 +680,7 @@ predefined-parameters: | BUILD_DIRECTORY=apex-build-{{ stream }}/.build GERRIT_BRANCH=$GERRIT_BRANCH - GERRIT_REFSPEC=$GERRIT_REFSPEC + GERRIT_REFSPEC= GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE node-parameters: true diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml index 7cd73484c..e1e760dab 100644 --- a/jjb/compass4nfv/compass-ci-jobs.yml +++ b/jjb/compass4nfv/compass-ci-jobs.yml @@ -163,7 +163,7 @@ - conditional-step: condition-kind: regex-match regex: os-(nosdn|odl_l2)-(nofeature|bgpvpn)-ha - label: ${scenario} + label: '{scenario}' steps: - trigger-builds: - project: 'dovetail-compass-{pod}-proposed_tests-{stream}' @@ -173,9 +173,9 @@ block: true same-node: true block-thresholds: - build-step-failure-threshold: 'never' - failure-threshold: 'never' - unstable-threshold: 'FAILURE' + build-step-failure-threshold: 'never' + failure-threshold: 'never' + unstable-threshold: 'FAILURE' - job-template: name: 'compass-deploy-{pod}-daily-{stream}' diff --git a/jjb/functest/set-functest-env.sh b/jjb/functest/set-functest-env.sh index 1acf0a2ad..89dabb056 100755 --- a/jjb/functest/set-functest-env.sh +++ b/jjb/functest/set-functest-env.sh @@ -48,7 +48,6 @@ if [[ ${INSTALLER_TYPE} == 'apex' ]]; then fi - # Set iptables rule to allow forwarding return traffic for container if ! sudo iptables -C FORWARD -j RETURN 2> ${redirect} || ! sudo iptables -L FORWARD | awk 'NR==3' | grep RETURN 2> ${redirect}; then sudo iptables -I FORWARD -j RETURN @@ -59,6 +58,12 @@ DEPLOY_TYPE=baremetal echo "Functest: Start Docker and prepare environment" +echo "Functest: Download images that will be used by test cases" +images_dir="${HOME}/opnfv/functest/images" +chmod +x ${WORKSPACE}/functest/ci/download_images.sh +${WORKSPACE}/functest/ci/download_images.sh ${images_dir} +images_vol="-v ${images_dir}:/home/opnfv/functest/images" + dir_result="${HOME}/opnfv/functest/results/${BRANCH##*/}" mkdir -p ${dir_result} sudo rm -rf ${dir_result}/* @@ -80,7 +85,7 @@ if [[ ${INSTALLER_TYPE} == 'compass' && ${DEPLOY_SCENARIO} == *'os-nosdn-openo-h envs=${env}" -e OPENO_MSB_ENDPOINT=${openo_msb_endpoint}" fi -volumes="${results_vol} ${sshkey_vol} ${stackrc_vol} ${rc_file_vol}" +volumes="${images_vol} ${results_vol} ${sshkey_vol} ${stackrc_vol} ${rc_file_vol}" HOST_ARCH=$(uname -m) FUNCTEST_IMAGE="opnfv/functest" @@ -88,7 +93,7 @@ if [ "$HOST_ARCH" = "aarch64" ]; then FUNCTEST_IMAGE="${FUNCTEST_IMAGE}_${HOST_ARCH}" fi -echo "Functest: Pulling image ${FUNCTEST_IMAGE}:${DOCKER_TAG}" +echo "Functest: Pulling Functest Docker image ${FUNCTEST_IMAGE}:${DOCKER_TAG}" docker pull ${FUNCTEST_IMAGE}:$DOCKER_TAG >/dev/null cmd="sudo docker run --privileged=true -id ${envs} ${volumes} \ diff --git a/jjb/securedlab/check-jinja2.sh b/jjb/securedlab/check-jinja2.sh index 57650ec28..4c1927d77 100755 --- a/jjb/securedlab/check-jinja2.sh +++ b/jjb/securedlab/check-jinja2.sh @@ -1,7 +1,7 @@ #!/bin/bash set +x set -o errexit -for lab_configs in $(find labs/ -name 'pod.yaml'); do +for lab_configs in $(find labs/ -name 'pod*.yaml'); do while IFS= read -r jinja_templates; do echo "./utils/generate_config.py -y $lab_configs -j $jinja_templates" ./utils/generate_config.py -y $lab_configs -j $jinja_templates diff --git a/jjb/yardstick/yardstick-project-jobs.yml b/jjb/yardstick/yardstick-project-jobs.yml index bbfa152a2..643c1f932 100644 --- a/jjb/yardstick/yardstick-project-jobs.yml +++ b/jjb/yardstick/yardstick-project-jobs.yml @@ -58,6 +58,13 @@ branches: - branch-compare-type: 'ANT' branch-pattern: '**/{branch}' + + wrappers: + - ssh-agent-wrapper + - timeout: + timeout: 30 + fail: true + builders: - yardstick-unit-tests-and-docs-build @@ -93,6 +100,12 @@ - branch-compare-type: 'ANT' branch-pattern: '**/{branch}' + wrappers: + - ssh-agent-wrapper + - timeout: + timeout: 30 + fail: true + builders: - yardstick-unit-tests-and-docs-build |