openstack
/
tripleo-ci
Code Issues Proposed changes

Try to use 'release' for container image build - fallback to branch 

In [1] the container build template was updated to use 'release'
rather than 'branch' var. However this is not defined for the
build-containers-ubi-8 job resulting in related-bug. Instead we
can try to use 'release' and fall back to 'branch' if release
is not defined.

Change-Id: Ifee7bf97ef30056ffac0ac381e4ea36f5c491a2c
Related-Bug: 1947572
This commit is contained in:
Marios Andreou 2021-10-18 13:17:29 +03:00
parent a42c1455ee
commit ed8fdff6ff
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
roles/build-containers/templates/tripleo-build.sh.j2
View File

@ -88,7 +88,7 @@ openstack tripleo container image build \
--volume {{ item }} \
{% endfor %}
{% endif %}
{% if release not in ["train", "ussuri", "victoria", "wallaby"] %}
{% if release|default(branch) not in ["train", "ussuri", "victoria", "wallaby"] %}
--tcib-extra tcib_release={{ ansible_distribution_major_version }} \
--tcib-extra tcib_python_version={{ (ansible_distribution_major_version is version('9', '<')) | ternary ('3.6', '3.9') }} \
{% endif %}