summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authorJose Lausuch <jalausuch@suse.com>2017-11-15 15:47:27 +0100
committerJose Lausuch <jalausuch@suse.com>2017-11-23 09:06:52 +0100
commitf1f6b8a52349d65b50ea8eb336003b73af1ad15d (patch)
treebbd7de01e2192a0bdf4d3fc01e111851eb1508a9 /jjb
parent3b97f089806ef7f81aec2c56e740aa1f1e418649 (diff)
[Functest] Remove prepare_env from the docker cmds
When [1] is merged, prepare_env won't exist and the call will fail. Keeps the former call until Euphrates jobs are stopped. [1] https://gerrit.opnfv.org/gerrit/#/c/47267/ Change-Id: Ia41906f9e8ee15409cb28bb9bb621a7ab1964eee Signed-off-by: Jose Lausuch <jalausuch@suse.com>
Diffstat (limited to 'jjb')
-rwxr-xr-xjjb/functest/functest-alpine.sh42
1 files changed, 33 insertions, 9 deletions
diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh
index 3c1ac28bb..735ca6f7f 100755
--- a/jjb/functest/functest-alpine.sh
+++ b/jjb/functest/functest-alpine.sh
@@ -4,10 +4,30 @@ set -e
set +u
set +o pipefail
+check_os_deployment() {
+ FUNCTEST_IMAGE=opnfv/functest-healthcheck:${DOCKER_TAG}
+ cmd="docker run --rm --privileged=true ${volumes} ${FUNCTEST_IMAGE} check_deployment"
+ eval ${cmd}
+ ret_value=$?
+ if [ ${ret_value} != 0 ]; then
+ echo "ERROR: Problem while checking OpenStack deployment."
+ exit 1
+ else
+ echo "OpenStack deployment OK."
+ fi
+
+}
+
+
run_tiers() {
tiers=$1
- cmd_opt="prepare_env start && run_tests -r -t all"
- [[ $BUILD_TAG =~ "suite" ]] && cmd_opt="prepare_env start && run_tests -t all"
+ if [[ ${BRANCH##*/} == "master" ]]; then
+ cmd_opt="run_tests -r -t all"
+ [[ $BUILD_TAG =~ "suite" ]] && cmd_opt="run_tests -t all"
+ else
+ cmd_opt="prepare_env start && run_tests -r -t all"
+ [[ $BUILD_TAG =~ "suite" ]] && cmd_opt="prepare_env start && run_tests -t all"
+ fi
ret_val_file="${HOME}/opnfv/functest/results/${BRANCH##*/}/return_value"
echo 0 > ${ret_val_file}
@@ -15,7 +35,7 @@ run_tiers() {
FUNCTEST_IMAGE=opnfv/functest-${tier}:${DOCKER_TAG}
echo "Functest: Pulling Functest Docker image ${FUNCTEST_IMAGE} ..."
docker pull ${FUNCTEST_IMAGE}>/dev/null
- cmd="docker run --privileged=true ${envs} ${volumes} ${TESTCASE_OPTIONS} ${FUNCTEST_IMAGE} /bin/bash -c '${cmd_opt}'"
+ cmd="docker run --rm --privileged=true ${envs} ${volumes} ${TESTCASE_OPTIONS} ${FUNCTEST_IMAGE} /bin/bash -c '${cmd_opt}'"
echo "Running Functest tier '${tier}'. CMD: ${cmd}"
eval ${cmd}
ret_value=$?
@@ -31,21 +51,24 @@ run_tiers() {
run_test() {
test_name=$1
- cmd_opt="prepare_env start && run_tests -t ${test_name}"
- [[ $BUILD_TAG =~ "suite" ]] && cmd_opt="prepare_env start && run_tests -t ${test_name}"
+ if [[ ${BRANCH##*/} == "master" ]]; then
+ cmd_opt="run_tests -t ${test_name}"
+ else
+ cmd_opt="prepare_env start && run_tests -t ${test_name}"
+ fi
ret_val_file="${HOME}/opnfv/functest/results/${BRANCH##*/}/return_value"
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)
FUNCTEST_IMAGE=opnfv/functest-healthcheck:${DOCKER_TAG} ;;
- vping_ssh|vping_userdata|tempest_smoke_serial|rally_sanity|refstack_defcore|odl|odl_netvirt|fds|snaps_smoke)
+ vping_ssh|vping_userdata|tempest_smoke_serial|rally_sanity|refstack_defcore|odl|odl_netvirt|snaps_smoke)
FUNCTEST_IMAGE=opnfv/functest-smoke:${DOCKER_TAG} ;;
- tempest_full_parallel|tempest_custom|rally_full)
+ tempest_full_parallel|rally_full)
FUNCTEST_IMAGE=opnfv/functest-components:${DOCKER_TAG} ;;
cloudify_ims|orchestra_openims|orchestra_clearwaterims|vyos_vrouter)
FUNCTEST_IMAGE=opnfv/functest-vnf:${DOCKER_TAG} ;;
- promise|doctor-notification|bgpvpn|functest-odl-sfc|domino-multinode|barometercollectd)
+ promise|doctor-notification|bgpvpn|functest-odl-sfc|domino-multinode|barometercollectd|fds)
FUNCTEST_IMAGE=opnfv/functest-features:${DOCKER_TAG} ;;
parser-basics)
FUNCTEST_IMAGE=opnfv/functest-parser:${DOCKER_TAG} ;;
@@ -56,7 +79,7 @@ run_test() {
esac
echo "Functest: Pulling Functest Docker image ${FUNCTEST_IMAGE} ..."
docker pull ${FUNCTEST_IMAGE}>/dev/null
- cmd="docker run --privileged=true ${envs} ${volumes} ${TESTCASE_OPTIONS} ${FUNCTEST_IMAGE} /bin/bash -c '${cmd_opt}'"
+ cmd="docker run --rm --privileged=true ${envs} ${volumes} ${TESTCASE_OPTIONS} ${FUNCTEST_IMAGE} /bin/bash -c '${cmd_opt}'"
echo "Running Functest test case '${test_name}'. CMD: ${cmd}"
eval ${cmd}
ret_value=$?
@@ -132,6 +155,7 @@ set +e
if [[ ${DEPLOY_SCENARIO} =~ ^os-.* ]]; then
+ [[ ${BRANCH##*/} == "master" ]] && check_os_deployment
if [ ${FUNCTEST_MODE} == 'testcase' ]; then
echo "FUNCTEST_MODE=testcase, FUNCTEST_SUITE_NAME=${FUNCTEST_SUITE_NAME}"
run_test ${FUNCTEST_SUITE_NAME}