From c8f05c5a35ca78e7b4d4f2d98d813a86534bb75a Mon Sep 17 00:00:00 2001 From: Sagi Shnaidman Date: Wed, 21 Feb 2018 08:24:22 +0200 Subject: [PATCH] Allow custom sequence of playbooks In reproducing jobs sometimes there is need to specify which exactly playbook to run, this patch allows customization of playbooks sequence to run. PLAYBOOKS variable can be exported in reproducer script. Change-Id: Iefb4f6c62969efd4179544b453dd1e119d6073d8 --- toci_gate_test-oooq.sh | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/toci_gate_test-oooq.sh b/toci_gate_test-oooq.sh index bb91f49e3..910890bf3 100755 --- a/toci_gate_test-oooq.sh +++ b/toci_gate_test-oooq.sh @@ -99,8 +99,6 @@ export FEATURESET_FILE="" export FEATURESET_CONF="" # Define file with nodes topology export NODES_FILE="" -# Indentifies which playbooks to run -export PLAYBOOKS="" # Set the number of overcloud nodes export NODECOUNT=0 # Sets the undercloud hostname @@ -145,9 +143,9 @@ for JOB_TYPE_PART in $(sed 's/-/ /g' <<< "${TOCI_JOBTYPE:-}") ; do ENVIRONMENT="ovb" UCINSTANCEID=$(http_proxy= curl http://169.254.169.254/openstack/2015-10-15/meta_data.json | python -c 'import json, sys; print json.load(sys.stdin)["uuid"]') if [[ " $QUICKSTART_SH_JOBS " =~ " $TOCI_JOBTYPE " ]]; then - PLAYBOOKS="baremetal-full-deploy.yml" + export PLAYBOOKS=${PLAYBOOKS:-"baremetal-full-deploy.yml"} else - PLAYBOOKS="ovb-setup.yml baremetal-full-undercloud.yml baremetal-full-overcloud-prep.yml baremetal-full-overcloud.yml baremetal-full-overcloud-validate.yml" + export PLAYBOOKS=${PLAYBOOKS:-"ovb-setup.yml baremetal-full-undercloud.yml baremetal-full-overcloud-prep.yml baremetal-full-overcloud.yml baremetal-full-overcloud-validate.yml"} fi ENV_VARS="$ENV_VARS --extra-vars @$TRIPLEO_ROOT/tripleo-ci/toci-quickstart/config/testenv/ovb.yml" if [[ -f "$TRIPLEO_ROOT/tripleo-ci/toci-quickstart/config/testenv/ovb-$RHCLOUD.yml" ]]; then @@ -159,9 +157,9 @@ for JOB_TYPE_PART in $(sed 's/-/ /g' <<< "${TOCI_JOBTYPE:-}") ; do SUBNODES_SSH_KEY=/etc/nodepool/id_rsa ENVIRONMENT="osinfra" if [[ " $QUICKSTART_SH_JOBS " =~ " $TOCI_JOBTYPE " ]]; then - PLAYBOOKS="multinode.yml" + export PLAYBOOKS=${PLAYBOOKS:-"multinode.yml"} else - PLAYBOOKS="quickstart.yml multinode-undercloud.yml multinode-overcloud-prep.yml multinode-overcloud.yml multinode-overcloud-upgrade.yml multinode-validate.yml" + export PLAYBOOKS=${PLAYBOOKS:-"quickstart.yml multinode-undercloud.yml multinode-overcloud-prep.yml multinode-overcloud.yml multinode-overcloud-upgrade.yml multinode-validate.yml"} fi FEATURESET_CONF=" --extra-vars @$LWD/config/general_config/featureset-multinode-common.yml $FEATURESET_CONF" if [[ $NODEPOOL_PROVIDER == "rdo-cloud-tripleo" ]]; then @@ -178,9 +176,9 @@ for JOB_TYPE_PART in $(sed 's/-/ /g' <<< "${TOCI_JOBTYPE:-}") ; do ENVIRONMENT="osinfra" UNDERCLOUD="127.0.0.2" if [[ " $QUICKSTART_SH_JOBS " =~ " $TOCI_JOBTYPE " ]]; then - PLAYBOOKS="multinode.yml" + export PLAYBOOKS=${PLAYBOOKS:-"multinode.yml"} else - PLAYBOOKS="quickstart.yml multinode-undercloud.yml multinode-overcloud-prep.yml multinode-overcloud.yml multinode-overcloud-upgrade.yml multinode-validate.yml" + export PLAYBOOKS=${PLAYBOOKS:-"quickstart.yml multinode-undercloud.yml multinode-overcloud-prep.yml multinode-overcloud.yml multinode-overcloud-upgrade.yml multinode-validate.yml"} fi FEATURESET_CONF=" --extra-vars @$LWD/config/general_config/featureset-multinode-common.yml $FEATURESET_CONF" if [[ $NODEPOOL_PROVIDER == "rdo-cloud-tripleo" ]]; then