diff --git a/slave-scripts/dib.sh b/slave-scripts/dib.sh index 528a08b4..4c9bc00a 100755 --- a/slave-scripts/dib.sh +++ b/slave-scripts/dib.sh @@ -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 diff --git a/slave-scripts/functions-common.sh b/slave-scripts/functions-common.sh index d0869ed0..08459720 100755 --- a/slave-scripts/functions-common.sh +++ b/slave-scripts/functions-common.sh @@ -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 diff --git a/slave-scripts/gate-sahara.sh b/slave-scripts/gate-sahara.sh index 53c8cb8b..90356a90 100755 --- a/slave-scripts/gate-sahara.sh +++ b/slave-scripts/gate-sahara.sh @@ -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 }') diff --git a/slave-scripts/gate-saharaclient.sh b/slave-scripts/gate-saharaclient.sh index 14292811..12bedbed 100755 --- a/slave-scripts/gate-saharaclient.sh +++ b/slave-scripts/gate-saharaclient.sh @@ -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