From dd8b5cab10f7c7801f2307d5335b1c1676fd4204 Mon Sep 17 00:00:00 2001 From: Jose Lausuch Date: Tue, 26 Sep 2017 10:26:10 +0200 Subject: [PATCH] [Functest] Add argument in function run_tiers() Replace single by double quotes, variables should be within double quotes. Change-Id: I5dae42178f5638689a8c46e03a01c12bd42b65e1 Signed-off-by: Jose Lausuch --- jjb/functest/functest-alpine.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh index 8ede529a1..fdc34810a 100755 --- a/jjb/functest/functest-alpine.sh +++ b/jjb/functest/functest-alpine.sh @@ -5,8 +5,9 @@ set +u set +o pipefail run_tiers() { - cmd_opt='prepare_env start && run_tests -r -t all' - [[ $BUILD_TAG =~ "suite" ]] && cmd_opt='prepare_env start && run_tests -t all' + tiers=$1 + cmd_opt="prepare_env start && run_tests -r -t all" + [[ $BUILD_TAG =~ "suite" ]] && cmd_opt="prepare_env start && run_tests -t all" ret_val_file="${HOME}/opnfv/functest/results/${BRANCH##*/}/return_value" echo 0 > ${ret_val_file} @@ -26,8 +27,8 @@ run_tiers() { run_test() { test_name=$1 - cmd_opt='prepare_env start && run_tests -r -t $test_name' - [[ $BUILD_TAG =~ "suite" ]] && cmd_opt='prepare_env start && run_tests -t $test_name' + cmd_opt="prepare_env start && run_tests -r -t ${test_name}" + [[ $BUILD_TAG =~ "suite" ]] && cmd_opt="prepare_env start && run_tests -t ${test_name}" 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 @@ -42,7 +43,7 @@ run_test() { FUNCTEST_IMAGE=opnfv/functest-vnf ;; promise|doctor-notification|bgpvpn|functest-odl-sfc|domino-multinode|barometercollectd) FUNCTEST_IMAGE=opnfv/functest-features ;; - parser) + parser-basics) FUNCTEST_IMAGE=opnfv/functest-parser ;; *) echo "Unkown test case $test_name" -- 2.16.6