diff options
| -rwxr-xr-x | jjb/functest/functest-alpine.sh | 16 | ||||
| -rw-r--r-- | jjb/functest/functest-docker.yaml | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh index 52f65ba7e..45f88ba39 100755 --- a/jjb/functest/functest-alpine.sh +++ b/jjb/functest/functest-alpine.sh @@ -59,10 +59,8 @@ run_test() { FUNCTEST_IMAGE=${REPO}/functest-healthcheck:${DOCKER_TAG} ;; neutron-tempest-plugin-api|rally_sanity|refstack_defcore|tempest_full|tempest_scenario|patrole|snaps_smoke|neutron_trunk|networking-bgpvpn|networking-sfc|barbican) FUNCTEST_IMAGE=${REPO}/functest-smoke:${DOCKER_TAG} ;; - rally_jobs|shaker|vmtp) + rally_full|rally_jobs|shaker|vmtp) FUNCTEST_IMAGE=${REPO}/functest-benchmarking:${DOCKER_TAG} ;; - rally_full) - FUNCTEST_IMAGE=${REPO}/functest-components:${DOCKER_TAG} ;; cloudify|cloudify_ims|heat_ims|vyos_vrouter|juju_epc) FUNCTEST_IMAGE=${REPO}/functest-vnf:${DOCKER_TAG} ;; doctor-notification|bgpvpn|functest-odl-sfc|barometercollectd|fds|vgpu|stor4nfv_os) @@ -85,7 +83,6 @@ run_test() { [[ $CI_DEBUG == true ]] && redirect="/dev/stdout" || redirect="/dev/null" -redirect="/dev/stdout" FUNCTEST_DIR=/home/opnfv/functest DEPLOY_TYPE=baremetal [[ $BUILD_TAG =~ "virtual" ]] && DEPLOY_TYPE=virt @@ -108,9 +105,6 @@ rc_file_vol="-v ${rc_file}:${FUNCTEST_DIR}/conf/env_file" echo "Functest: Start Docker and prepare environment" echo "Functest: Download images that will be used by test cases" -env -pwd -ls -l images_dir="${HOME}/opnfv/functest/images" download_script=${WORKSPACE}/functest/ci/download_images.sh chmod +x ${download_script} @@ -273,15 +267,19 @@ else if [[ ${BRANCH} == "stable/fraser" ]]; then tiers=(healthcheck smoke features vnf parser) tests=(tempest_full_parallel) - else + elif [[ ${BRANCH} == "stable/gambia" ]]; then tiers=(healthcheck smoke benchmarking features vnf components) + else + tiers=(healthcheck smoke benchmarking features vnf) fi else if [[ ${BRANCH} == "stable/fraser" ]]; then tiers=(healthcheck smoke features parser) tests=(tempest_full_parallel) + elif [[ ${BRANCH} == "stable/gambia" ]]; then + tiers=(healthcheck smoke benchmarking features vnf components) else - tiers=(healthcheck smoke benchmarking features components) + tiers=(healthcheck smoke benchmarking features) fi fi run_tiers ${tiers} diff --git a/jjb/functest/functest-docker.yaml b/jjb/functest/functest-docker.yaml index 03ef43629..71215cae1 100644 --- a/jjb/functest/functest-docker.yaml +++ b/jjb/functest/functest-docker.yaml @@ -43,6 +43,8 @@ exclude: - stream: 'master' image: 'components' + - stream: 'hunter' + image: 'components' - stream: 'master' image: 'parser' - stream: 'hunter' |