openstack
/
tripleo-ci
Code Issues Proposed changes

Run overcloud-upgrade role only in upgrades jobs. 

Defined tags are the same for all multinode
jobs, independently on if they perform an
upgrade or not. Each featureset env file then
defines if an upgrade is to be performed or not,
being skipped all the tasks of the overcloud-upgrade
role if it's not an upgrades job.

This task skipping takes around 3 seconds,
what's not a big deal, but it makes the logs
more difficult to read and understand.

This patch appends the overcloud-upgrade role
into the tags only if the job to be run performs
an upgrade.

Change-Id: Ia037dd74470499d302cb098136fbe71608b7824a
This commit is contained in:
Jose Luis Franco Arza 2017-11-07 17:08:24 +01:00 committed by John Trowbridge
parent ef0dd1b1b1
commit a5db97e451
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
toci_gate_test-oooq.sh
View File

@ -137,6 +137,8 @@ for JOB_TYPE_PART in $(sed 's/-/ /g' <<< "${TOCI_JOBTYPE:-}") ; do
if is_featureset_mixed_upgrade "$TRIPLEO_ROOT/tripleo-quickstart/config/general_config/$JOB_TYPE_PART.yml"; then
export UPGRADE_RELEASE=$(previous_release_from "$STABLE_RELEASE")
QUICKSTART_RELEASE="$QUICKSTART_RELEASE-undercloud-$UPGRADE_RELEASE-overcloud"
# Run overcloud-upgrade tag only in upgrades jobs
TAGS="$TAGS,overcloud-upgrade"
fi
;;
ovb)
@ -161,7 +163,7 @@ for JOB_TYPE_PART in $(sed 's/-/ /g' <<< "${TOCI_JOBTYPE:-}") ; do
ENV_VARS="$ENV_VARS --extra-vars @$TRIPLEO_ROOT/tripleo-ci/toci-quickstart/config/testenv/multinode.yml"
fi
UNDERCLOUD="127.0.0.2"
TAGS="build,undercloud-setup,undercloud-scripts,undercloud-install,undercloud-post-install,tripleo-validations,overcloud-scripts,overcloud-prep-config,overcloud-prep-containers,overcloud-deploy,overcloud-upgrade,overcloud-validate"
TAGS="build,undercloud-setup,undercloud-scripts,undercloud-install,undercloud-post-install,tripleo-validations,overcloud-scripts,overcloud-prep-config,overcloud-prep-containers,overcloud-deploy,overcloud-validate"
CONTROLLER_HOSTS=$(sed -n 1,1p /etc/nodepool/sub_nodes_private)
OVERCLOUD_HOSTS=$(cat /etc/nodepool/sub_nodes_private)
;;