Merge "Change path for liberty and kilo"

slave-scripts/dib.sh

@@ -12,7 +12,7 @@ cluster_name="$HOST-$ZUUL_CHANGE-$CLUSTER_HASH"
 SAHARA_PATH="/tmp/sahara"
 SAHARA_TESTS_PATH="/tmp/sahara-tests"
 sahara_conf_file="$SAHARA_PATH/etc/sahara/sahara.conf"
-sahara_templates_path=$SAHARA_TESTS_PATH/etc/scenario/sahara-ci
+sahara_templates_path=$SAHARA_TESTS_PATH/etc/scenario/defaults
 
 engine=$(echo $JOB_NAME | awk -F '-' '{ print $3 }')
 

slave-scripts/functions-common.sh

@@ -109,11 +109,10 @@ run_tests() {
   local concurrency=${2:-"1"}
   echo "Integration tests are started"
   export PYTHONUNBUFFERED=1
-  local templates_path=$(dirname $scenario_config)
-  local scenario_credentials="$templates_path/credentials.yaml.mako"
-  local scenario_edp="$templates_path/edp.yaml.mako"
+  local scenario_credentials="$tests_etc/credentials.yaml.mako"
+  local scenario_edp="$tests_etc/edp.yaml.mako"
   if [ ! -f $scenario_edp ]; then
-    scenario_edp="$templates_path/edp.yaml"
+    scenario_edp="$tests_etc/edp.yaml"
   fi
   # Temporary use additional log file, due to wrong status code from tox scenario tests
   pushd $SAHARA_TESTS_PATH

slave-scripts/gate-sahara.sh

@@ -11,7 +11,8 @@ cluster_name="$HOST-$ZUUL_CHANGE-$CLUSTER_HASH"
 SAHARA_PATH=${1:-$WORKSPACE}
 SAHARA_TESTS_PATH=${2:-"/tmp/sahara-tests"}
 sahara_conf_file=$SAHARA_PATH/etc/sahara/sahara.conf
-sahara_templates_path=$SAHARA_TESTS_PATH/etc/scenario/sahara-ci
+sahara_templates_path=$SAHARA_TESTS_PATH/etc/scenario/defaults
+tests_etc=$sahara_templates_path
 
 # Clone Sahara Scenario tests
 if [ "$ZUUL_PROJECT" != "openstack/sahara-tests" ]; then
@@ -25,6 +26,15 @@ image_name=${plugin}_${os}
 mode="aio"
 sahara_plugin=$(echo $plugin | awk -F '_' '{ print $1 } ')
 
+case $ZUUL_BRANCH in
+    stable/liberty)
+       sahara_templates_path="$sahara_templates_path/liberty"
+       ;;
+    stable/kilo)
+       sahara_templates_path="$sahara_templates_path/kilo"
+       ;;
+esac
+
 case $plugin in
     hdp_2.0.6)
        mode=distribute