x/sahara-ci-config
Code Issues Proposed changes

Change path for liberty and kilo

Browse Source 
Files for kilo and liberty releases moved to separate dir
and dir with sahara-ci renamed

Depends-on: Iea65367bc3cffa2198117d245572c7d9a8260eeb
Change-Id: I80e0d0ade1131bc627b3c7f01b42f661e3ddfd60
This commit is contained in:
Evgeny Sikachev
2016-02-24 15:46:39 +03:00
parent 11c94448d8
commit ba5c853244
3 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
slave-scripts/dib.sh
View File

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

7
slave-scripts/functions-common.sh
View File

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

12
slave-scripts/gate-sahara.sh
View File

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