diff options
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/bottlenecks/bottlenecks-run-suite.sh | 2 | ||||
| -rw-r--r-- | jjb/dovetail/dovetail-ci-jobs.yml | 12 | ||||
| -rwxr-xr-x[-rw-r--r--] | jjb/functest/functest-alpine.sh | 7 | ||||
| -rw-r--r-- | jjb/xci/xci-verify-jobs.yml | 8 |
4 files changed, 19 insertions, 10 deletions
diff --git a/jjb/bottlenecks/bottlenecks-run-suite.sh b/jjb/bottlenecks/bottlenecks-run-suite.sh index a7570431d..6d4d2d8d1 100644 --- a/jjb/bottlenecks/bottlenecks-run-suite.sh +++ b/jjb/bottlenecks/bottlenecks-run-suite.sh @@ -125,7 +125,7 @@ if [[ $SUITE_NAME == *posca* ]]; then -e NODE_NAME=${NODE_NAME} -e EXTERNAL_NET=${EXTERNAL_NETWORK} \ -e BRANCH=${BRANCH} -e GERRIT_REFSPEC_DEBUG=${GERRIT_REFSPEC_DEBUG} \ -e BOTTLENECKS_DB_TARGET=${BOTTLENECKS_DB_TARGET} -e PACKAGE_URL=${PACKAGE_URL} \ - -e DEPLOY_SCENARIO=${DEPLOY_SCENARIO}" + -e DEPLOY_SCENARIO=${DEPLOY_SCENARIO} -e BUILD_TAG=${BUILD_TAG}" docker_volume="-v /var/run/docker.sock:/var/run/docker.sock -v /tmp:/tmp" cmd="docker run ${opts} ${envs} --name bottlenecks-load-master ${docker_volume} opnfv/bottlenecks:${DOCKER_TAG} /bin/bash" diff --git a/jjb/dovetail/dovetail-ci-jobs.yml b/jjb/dovetail/dovetail-ci-jobs.yml index c13c93859..32cfcfa19 100644 --- a/jjb/dovetail/dovetail-ci-jobs.yml +++ b/jjb/dovetail/dovetail-ci-jobs.yml @@ -165,7 +165,7 @@ - huawei-pod4: slave-label: huawei-pod4 SUT: apex - auto-trigger-name: 'apex-huawei-pod4-danube-trigger' + auto-trigger-name: 'apex-huawei-pod4-{testsuite}-danube-trigger' <<: *danube #-------------------------------- testsuite: @@ -196,7 +196,7 @@ - build-name: name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO' - timeout: - timeout: 240 + timeout: 300 abort: true - fix-workspace-permissions @@ -268,6 +268,10 @@ # trigger macros #-------------------------- - trigger: - name: 'apex-huawei-pod4-danube-trigger' + name: 'apex-huawei-pod4-proposed_tests-danube-trigger' triggers: - - timed: '* 1 * * *' + - timed: '0 1 * * *' +- trigger: + name: 'apex-huawei-pod4-compliance_set-danube-trigger' + triggers: + - timed: '' diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh index cee302699..9be9fe57f 100644..100755 --- a/jjb/functest/functest-alpine.sh +++ b/jjb/functest/functest-alpine.sh @@ -68,7 +68,12 @@ volumes="${images_vol} ${results_vol} ${sshkey_vol} ${rc_file_vol} ${cacert_file set +e -tiers=(healthcheck smoke features vnf) +if ${FUNCTEST_SUITE_NAME} == 'healthcheck'; then + tiers=(healthcheck) +else + tiers=(healthcheck smoke features vnf) +fi + for tier in ${tiers[@]}; do FUNCTEST_IMAGE=opnfv/functest-${tier} echo "Functest: Pulling Functest Docker image ${FUNCTEST_IMAGE} ..." diff --git a/jjb/xci/xci-verify-jobs.yml b/jjb/xci/xci-verify-jobs.yml index 61d25585c..5fca9bdbb 100644 --- a/jjb/xci/xci-verify-jobs.yml +++ b/jjb/xci/xci-verify-jobs.yml @@ -217,7 +217,7 @@ - builder: name: 'xci-verify-healthcheck-macro' builders: - - shell: | - #!/bin/bash - - echo "Hello World!" + - shell: + !include-raw: ../../utils/fetch_os_creds.sh + - shell: + !include-raw: ../functest/functest-alpine.sh |