openstack
/
tripleo-ci
Code Issues Proposed changes

Merge "Use update-promotion-* file and add new override_docker_image_tag var"

This commit is contained in:
Zuul 2023-10-19 07:53:55 +00:00 committed by Gerrit Code Review
parent f7381ebd2b 5cf9d418c0
commit a45099a746
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
roles/run-test/templates/toci_gate_test.sh.j2
View File

@ -130,8 +130,15 @@ fi
PERIODIC=1
QUICKSTART_RELEASE="promotion-testing-hash-${QUICKSTART_RELEASE}"
EMIT_RELEASES_EXTRA_ARGS="$EMIT_RELEASES_EXTRA_ARGS --is-periodic"
{% if osp_release is defined %}
if is_featureset minor_update "{{ job_featureset_file }}"; then
# In downstream minor update job we use special, seperate promotion file
QUICKSTART_RELEASE="update-promotion-testing-hash-${STABLE_RELEASE:-master}"
fi
{% endif %}
{% endif %}
{% if osp_release is not defined %}
if [[ -f "$RELEASES_SCRIPT" ]] && [[ {{ featureset }} =~ 037|047|050|056|065|067|068 ]]; then
if [[ -f "$RELEASES_FILE_OUTPUT" ]]; then
@ -147,6 +154,7 @@ if [[ -f "$RELEASES_SCRIPT" ]] && [[ {{ featureset }} =~ 037|047|050|056|065|067
$EMIT_RELEASES_EXTRA_ARGS
fi
fi
{% endif %}
# Import gated tripleo-upgrade in oooq for upgrades/updates jobs
if [[ -d $TRIPLEO_ROOT/tripleo-upgrade ]]; then

10
roles/run-test/templates/toci_quickstart.sh.j2
View File

@ -115,14 +115,22 @@ declare -A PLAYBOOKS_ARGS=(
)
# minor_update variable is set to true only in featureset068
# We need to override container_registry_release to get ip of docker registry and dlrn hash from content provider which provides containers with 'current' tag
# In downstream we do not use content provider and we pull already created images, so we only need to override container images tag with newer one(override_docker_image_tag)
# In upstream we need to override container_registry_release to get ip of docker registry and dlrn hash from content provider which provides containers with 'current' tag
# Containers are required to be pulled both to undercloud and overcloud to run minor update on the same branch
# Also to trigger update of undercloud and overcloud from correct playbook, overcloud_update and undercloud_update extra-vars are set to false respectively
if is_featureset minor_update "{{ job_featureset_file }}"; then
{% if osp_release is defined %}
PLAYBOOKS_ARGS=(
["multinode-undercloud-upgrade.yml"]="--extra-vars overcloud_update='false' --extra-vars override_docker_image_tag='true' "
["multinode-overcloud-update.yml"]="--extra-vars undercloud_update='false' --extra-vars override_docker_image_tag='true'"
)
{% else %}
PLAYBOOKS_ARGS=(
["multinode-undercloud-upgrade.yml"]=" --extra-vars container_registry_release='${QUICKSTART_RELEASE}-current' --extra-vars promote_source='current' --extra-vars overcloud_update='false' "
["multinode-overcloud-update.yml"]=" --extra-vars container_registry_release='${QUICKSTART_RELEASE}-current' --extra-vars promote_source='current' --extra-vars undercloud_update='false' "
)
{% endif %}
fi
mkdir -p $LOCAL_WORKING_DIR