X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Ffunctest%2Ffunctest-alpine.sh;h=744a7de4e48ccc55f3231842ec3a810e327dc42e;hb=190c6b1994e9b9504330455b8b791d0994ed50e6;hp=cf63bb5a42cd7bf2376b35064127f31f4e4eb948;hpb=a9ac51e26dcd61b905411d4abcb2c38e6d855d31;p=releng.git diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh index cf63bb5a4..744a7de4e 100755 --- a/jjb/functest/functest-alpine.sh +++ b/jjb/functest/functest-alpine.sh @@ -59,18 +59,18 @@ run_test() { echo 0 > ${ret_val_file} # Determine which Functest image should be used for the test case case ${test_name} in - connection_check|api_check|snaps_health_check) + 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} ;; - vping_ssh|vping_userdata|cinder_test|tempest_smoke_serial|rally_sanity|refstack_defcore|patrole|odl|snaps_smoke|neutron_trunk) + tempest_smoke|rally_sanity|refstack_defcore|patrole|snaps_smoke|neutron_trunk|barbican) FUNCTEST_IMAGE=${REPO}/functest-smoke:${DOCKER_TAG} ;; - tempest_full_parallel|rally_full) + shaker|vmtp) + FUNCTEST_IMAGE=${REPO}/functest-benchmarking:${DOCKER_TAG} ;; + tempest_full|rally_full) FUNCTEST_IMAGE=${REPO}/functest-components:${DOCKER_TAG} ;; cloudify_ims|vyos_vrouter|juju_epc) FUNCTEST_IMAGE=${REPO}/functest-vnf:${DOCKER_TAG} ;; doctor-notification|bgpvpn|functest-odl-sfc|barometercollectd|fds) FUNCTEST_IMAGE=${REPO}/functest-features:${DOCKER_TAG} ;; - parser-basics) - FUNCTEST_IMAGE=${REPO}/functest-parser:${DOCKER_TAG} ;; *) echo "Unkown test case $test_name" exit 1 @@ -172,13 +172,13 @@ else if [[ ${BRANCH} == "stable/fraser" ]]; then tiers=(healthcheck smoke features vnf parser) else - tiers=(healthcheck smoke features vnf) + tiers=(healthcheck smoke benchmarking features vnf) fi else if [[ ${BRANCH} == "stable/fraser" ]]; then tiers=(healthcheck smoke features parser) else - tiers=(healthcheck smoke features) + tiers=(healthcheck smoke benchmarking features) fi fi run_tiers ${tiers}