Removes EXTRA_TAGS from toci_gate_test&quickstart.sh.j2

This moves EXTRA_TAGS from toci.*.sh.j2 to the zuul.d job
definitions as extra_tags. Part of sprint 19 [1] ongoing work
to remove legacy bash from zuul v3 jobs.

We must merge [2] rdo-jobs first before we merge this so we don't
break those jobs.

Also moves the standalone-upgrade to extra_tags from tags.

[1] https://trello.com/c/6xqcXtM7/859-translate-oooqcommonfunctionsshj2-piece-by-piece-to-ansible-tasks
[2]  https://review.rdoproject.org/r/#/c/17962/

Change-Id: Id8bf4e824514935ce54e80d895e571998e359f1f
This commit is contained in:
Marios Andreou 2018-09-24 15:21:34 +03:00
parent 6e42d58688
commit 7ea074ddb9
5 changed files with 10 additions and 8 deletions

View File

@ -100,7 +100,6 @@ case {{ environment_type | default('standalone') }} in
;;
esac
EXTRA_TAGS=""
MIXED_UPGRADE_TYPE=''
# Order matters. ffu featureset has both mixed version and ffu_overcloud_upgrade.
@ -108,10 +107,7 @@ if is_featureset ffu_overcloud_upgrade "{{ job_featureset_file }}"; then
MIXED_UPGRADE_TYPE='ffu_upgrade'
elif is_featureset mixed_upgrade "{{ job_featureset_file }}"; then
MIXED_UPGRADE_TYPE='mixed_upgrade'
elif is_featureset overcloud_update "{{ job_featureset_file }}"; then
EXTRA_TAGS=",overcloud-update"
elif is_featureset undercloud_upgrade "{{ job_featureset_file }}"; then
EXTRA_TAGS=",undercloud-upgrade"
export UPGRADE_RELEASE=$QUICKSTART_RELEASE
export QUICKSTART_RELEASE=$(previous_release_mixed_upgrade_case "${UPGRADE_RELEASE}")
fi
@ -119,11 +115,8 @@ fi
if [ -n "${MIXED_UPGRADE_TYPE}" ]; then
export UPGRADE_RELEASE=$(previous_release_from "${STABLE_RELEASE}" "${MIXED_UPGRADE_TYPE}")
QUICKSTART_RELEASE="$QUICKSTART_RELEASE-undercloud-$UPGRADE_RELEASE-overcloud"
EXTRA_TAGS=",overcloud-upgrade"
fi
export EXTRA_TAGS
{% if periodic|bool %}
PERIODIC=1
QUICKSTART_RELEASE="promotion-testing-hash-${QUICKSTART_RELEASE}"

View File

@ -40,7 +40,7 @@ QUICKSTART_VENV_CMD="
#REMOVE build from --skip-tags ASAP
QUICKSTART_INSTALL_CMD="
$LOCAL_WORKING_DIR/bin/ansible-playbook
--tags {{ ','.join(tags) }}$EXTRA_TAGS
--tags {{ ','.join(tags + (extra_tags|default([]))) }}
"
export QUICKSTART_DEFAULT_RELEASE_ARG="--extra-vars @$LOCAL_WORKING_DIR/config/release/tripleo-ci/{{ ansible_distribution }}-{{ ansible_distribution_major_version }}/$QUICKSTART_RELEASE.yml"

View File

@ -226,6 +226,8 @@
# Note (dmsimard): This enforces a minimum TTL for DNS records, see
# https://review.openstack.org/#/c/523178/ for context
unbound_cache_min_ttl: 900
extra_tags:
- overcloud-update
- job:
name: tripleo-ci-centos-7-scenario011-multinode-oooq-container
@ -250,3 +252,5 @@
vars:
nodes: 1ctlr
featureset: '051'
extra_tags:
- overcloud-upgrade

View File

@ -59,6 +59,7 @@
- multinode-standalone-upgrade.yml
tags:
- standalone
extra_tags:
- standalone-upgrade
irrelevant-files:
- ^.*\.md$

View File

@ -40,6 +40,8 @@
branches: ^(stable/(pike|queens|rocky)).*$
vars:
featureset: '047'
extra_tags:
- undercloud-upgrade
- job:
name: tripleo-ci-centos-7-containerized-undercloud-upgrades
@ -52,3 +54,5 @@
voting: false
vars:
featureset: '050'
extra_tags:
- undercloud-upgrade