From 67826ec8167ea63054cb88334735a92e2036b5d2 Mon Sep 17 00:00:00 2001 From: Sagi Shnaidman Date: Mon, 25 Jun 2018 15:14:59 +0300 Subject: [PATCH] Move get_extra_vars_from_release to functions Move get_extra_vars_from_release bash functions to file where all functions are located. Change-Id: Ie2befd0903d2550ff4035ee9ecc745138592c9a6 --- scripts/oooq_common_functions.sh | 8 ++++++++ toci_quickstart.sh | 8 -------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/scripts/oooq_common_functions.sh b/scripts/oooq_common_functions.sh index 4d85ee757..a90d05935 100644 --- a/scripts/oooq_common_functions.sh +++ b/scripts/oooq_common_functions.sh @@ -156,3 +156,11 @@ EOF fi } + +get_extra_vars_from_release() +{ + local release_name=$1 + local release_hash=$2 + local release_file=$LOCAL_WORKING_DIR/config/release/tripleo-ci/$release_name.yml + echo "--extra-vars @$release_file -e dlrn_hash=$release_hash -e get_build_command=$release_hash" +} diff --git a/toci_quickstart.sh b/toci_quickstart.sh index bb46d4bd4..63e0734e0 100755 --- a/toci_quickstart.sh +++ b/toci_quickstart.sh @@ -62,14 +62,6 @@ export QUICKSTART_DEFAULT_RELEASE_ARG="--extra-vars @$LOCAL_WORKING_DIR/config/r declare -A RELEASE_ARGS=() -get_extra_vars_from_release() -{ - local release_name=$1 - local release_hash=$2 - local release_file=$LOCAL_WORKING_DIR/config/release/tripleo-ci/$release_name.yml - echo "--extra-vars @$release_file -e dlrn_hash=$release_hash -e get_build_command=$release_hash" -} - if [[ -f "$RELEASES_FILE_OUTPUT" ]]; then source $RELEASES_FILE_OUTPUT