Skip to content

Commit 0492c16

Browse files
committed
Add support for tcib_extra_config for master branch only
OSBS tool used in downstream to build wallaby container doesnot support taking ARGS from FROM label in Dockerfile[1]. It is blocking the container build job[2]. So enabling tcib_extra_config for master only unblocks the line. Links: [1]. containerbuildsystem/dockerfile-parse#118 [2]. https://bugzilla.redhat.com/show_bug.cgi?id=2128230 Change-Id: I4b68432080e6c87d60e281acd8dae994e85e2e01
1 parent 5d08033 commit 0492c16

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

roles/build-containers/templates/tripleo-build.sh.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ openstack tripleo container image build \
9292
--tcib-extra tcib_release={{ ansible_distribution_major_version }} \
9393
--tcib-extra tcib_python_version={{ (ansible_distribution_major_version is version('9', '<')) | ternary ('3.6', '3.9') }} \
9494
{% endif %}
95-
{% if (tcib_extra_config is defined) and (release|default(branch) not in ["train"]) %}
95+
{% if (tcib_extra_config is defined) and (release|default(branch) not in ["train", "wallaby"]) %}
9696
--extra-config {{ workspace }}/extra_config.yaml \
9797
{% endif %}
9898
--debug

0 commit comments

Comments
 (0)