diff options
author | 2018-09-06 07:48:11 +0000 | |
---|---|---|
committer | 2018-09-06 07:48:11 +0000 | |
commit | bb2c391860925d09fe43aba926926a9b436459c2 (patch) | |
tree | 3dd7c6d9b23512c1e2319ec4558b8ee58700769a | |
parent | 395cb6b211fd075709a7bd84b3b68de52c362185 (diff) | |
parent | 4dcfcc740da938035158f7a86a1f975e7e2309fb (diff) |
Merge "Run tempest_full and tempest_scenario in daily jjbs"
-rwxr-xr-x | jjb/functest/functest-alpine.sh | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh index 744a7de4e..5002eb515 100755 --- a/jjb/functest/functest-alpine.sh +++ b/jjb/functest/functest-alpine.sh @@ -61,15 +61,15 @@ run_test() { case ${test_name} in connection_check|tenantnetwork1|tenantnetwork2|vmready1|vmready2|singlevm1|singlevm2|vping_ssh|vping_userdata|cinder_test|odl|api_check|snaps_health_check) FUNCTEST_IMAGE=${REPO}/functest-healthcheck:${DOCKER_TAG} ;; - tempest_smoke|rally_sanity|refstack_defcore|patrole|snaps_smoke|neutron_trunk|barbican) + tempest_smoke|neutron-tempest-plugin-api|rally_sanity|refstack_defcore|patrole|snaps_smoke|neutron_trunk|networking-bgpvpn|networking-sfc|barbican) FUNCTEST_IMAGE=${REPO}/functest-smoke:${DOCKER_TAG} ;; shaker|vmtp) FUNCTEST_IMAGE=${REPO}/functest-benchmarking:${DOCKER_TAG} ;; - tempest_full|rally_full) + tempest_full|tempest_scenario|rally_full) FUNCTEST_IMAGE=${REPO}/functest-components:${DOCKER_TAG} ;; - cloudify_ims|vyos_vrouter|juju_epc) + cloudify|cloudify_ims|heat_ims|vyos_vrouter|juju_epc) FUNCTEST_IMAGE=${REPO}/functest-vnf:${DOCKER_TAG} ;; - doctor-notification|bgpvpn|functest-odl-sfc|barometercollectd|fds) + doctor-notification|bgpvpn|functest-odl-sfc|barometercollectd|fds|vgpu|stor4nfv_os) FUNCTEST_IMAGE=${REPO}/functest-features:${DOCKER_TAG} ;; *) echo "Unkown test case $test_name" @@ -168,18 +168,24 @@ elif [ ${FUNCTEST_MODE} == 'tier' ]; then tiers=(${FUNCTEST_TIER}) run_tiers ${tiers} else + tests=(tempest_full tempest_scenario) if [ ${DEPLOY_TYPE} == 'baremetal' ] && [ "${HOST_ARCH}" != "aarch64" ]; then if [[ ${BRANCH} == "stable/fraser" ]]; then tiers=(healthcheck smoke features vnf parser) + tests=(tempest_full) else tiers=(healthcheck smoke benchmarking features vnf) fi else if [[ ${BRANCH} == "stable/fraser" ]]; then tiers=(healthcheck smoke features parser) + tests=(tempest_full) else tiers=(healthcheck smoke benchmarking features) fi fi run_tiers ${tiers} + for test in "${tests[@]}"; do + run_test "$test" + done fi |