Merge "[calipso] Create stable/fraser branch"

[releng.git] / jjb / functest / functest-alpine.sh

diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh
index dfadf9a..72b94bd 100755 (executable)
--- a/jjb/functest/functest-alpine.sh
+++ b/jjb/functest/functest-alpine.sh
@@ -28,12 +28,12 @@ check_os_deployment() {
 
 run_tiers() {
     tiers=$1
-    if [[ ${BRANCH##*/} == "master" ]]; then
-        cmd_opt="run_tests -r -t all"
-        [[ $BUILD_TAG =~ "suite" ]] && cmd_opt="run_tests -t all"
-    else
+    if [[ ${BRANCH##*/} == "stable/euphrates" ]]; then
         cmd_opt="prepare_env start && run_tests -r -t all"
         [[ $BUILD_TAG =~ "suite" ]] && cmd_opt="prepare_env start && run_tests -t all"
+    else
+        cmd_opt="run_tests -r -t all"
+        [[ $BUILD_TAG =~ "suite" ]] && cmd_opt="run_tests -t all"
     fi
     ret_val_file="${HOME}/opnfv/functest/results/${BRANCH##*/}/return_value"
     echo 0 > ${ret_val_file}
@@ -58,10 +58,10 @@ run_tiers() {
 
 run_test() {
     test_name=$1
-    if [[ ${BRANCH##*/} == "master" ]]; then
-        cmd_opt="run_tests -t ${test_name}"
-    else
+    if [[ ${BRANCH##*/} == "stable/euphrates" ]]; then
         cmd_opt="prepare_env start && run_tests -t ${test_name}"
+    else
+        cmd_opt="run_tests -t ${test_name}"
     fi
     ret_val_file="${HOME}/opnfv/functest/results/${BRANCH##*/}/return_value"
     echo 0 > ${ret_val_file}
@@ -177,7 +177,6 @@ volumes="${images_vol} ${results_vol} ${sshkey_vol} ${userconfig_vol} ${rc_file_
 
 set +e
 
-[[ ${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}