x/sahara-ci-config
Code Issues Proposed changes

Merge "Use master of sahara-scenario for stable branches"

Browse Source
This commit is contained in:
Jenkins 2016-01-22 15:47:05 +00:00 committed by Gerrit Code Review
commit 9ab892eeb0
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
slave-scripts/dib.sh
View File

@ -24,10 +24,10 @@ mode="aio"
sahara_plugin=$(echo $plugin | awk -F '_' '{ print $1 } ')
# Clone Sahara
get_dependency "$SAHARA_PATH" "openstack/sahara"
get_dependency "$SAHARA_PATH" "openstack/sahara" "$ZUUL_BRANCH"
# Clone Sahara Scenario tests
get_dependency "$SAHARA_TESTS_PATH" "openstack/sahara-scenario"
get_dependency "$SAHARA_TESTS_PATH" "openstack/sahara-scenario" "master"
# make verbose the scripts execution of disk-image-create
export DIB_DEBUG_TRACE=1

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

@ -43,7 +43,7 @@ failure() {
get_dependency() {
local project_dir=$1
local project_name=$2
local branch=${ZUUL_BRANCH:-$3}
local branch=$3
if check_dependency_patch "$project_name"
then
# when patch depends on patch to some project

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

@ -14,7 +14,7 @@ sahara_conf_file=$SAHARA_PATH/etc/sahara/sahara.conf
sahara_templates_path=$SAHARA_TESTS_PATH/etc/scenario/sahara-ci
# Clone Sahara Scenario tests
get_dependency "$SAHARA_TESTS_PATH" "openstack/sahara-scenario"
get_dependency "$SAHARA_TESTS_PATH" "openstack/sahara-scenario" "master"
engine_type=$(echo $JOB_NAME | awk -F '-' '{ print $4 }')
plugin=$(echo $JOB_NAME | awk -F '-' '{ print $5 }')

2
slave-scripts/gate-saharaclient.sh
View File

@ -3,7 +3,7 @@
. $FUNCTION_PATH/functions-common.sh
sahara_path="/tmp/sahara"
get_dependency "$sahara_path" "openstack/sahara"
get_dependency "$sahara_path" "openstack/sahara" "$ZUUL_BRANCH"
cd "$sahara_path"
tox -e scenario --notest