diff options
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/compass4nfv/compass-ci-jobs.yml | 4 | ||||
| -rw-r--r-- | jjb/functest/functest-alpine.sh | 10 |
2 files changed, 10 insertions, 4 deletions
diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml index 3335391ca..467e168bc 100644 --- a/jjb/compass4nfv/compass-ci-jobs.yml +++ b/jjb/compass4nfv/compass-ci-jobs.yml @@ -385,7 +385,7 @@ - trigger: name: 'compass-os-nosdn-kvm-ha-baremetal-master-trigger' triggers: - - timed: '' + - timed: '0 14 * * *' - trigger: name: 'compass-os-nosdn-nofeature-ha-baremetal-danube-trigger' @@ -459,7 +459,7 @@ - trigger: name: 'compass-os-nosdn-kvm-ha-virtual-master-trigger' triggers: - - timed: '' + - timed: '0 23 * * *' - trigger: name: 'compass-os-nosdn-nofeature-ha-virtual-danube-trigger' diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh index 4b4c36503..512a01edc 100644 --- a/jjb/functest/functest-alpine.sh +++ b/jjb/functest/functest-alpine.sh @@ -33,8 +33,14 @@ 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} ${DEPLOY_SCENARIO} ${HOST_ARCH} 2> ${redirect} +download_script=${WORKSPACE}/functest/ci/download_images.sh +if [[ ! -f ${download_script} ]]; then + # to support Danube as well + wget https://git.opnfv.org/functest/plain/functest/ci/download_images.sh -O ${download_script} 2> ${redirect} +fi +chmod +x ${download_script} +${download_script} ${images_dir} ${DEPLOY_SCENARIO} ${HOST_ARCH} 2> ${redirect} + images_vol="-v ${images_dir}:${FUNCTEST_DIR}/images" dir_result="${HOME}/opnfv/functest/results/${BRANCH##*/}" |