Skip to content

Commit

Permalink
Add support for tcib_extra_config for master branch only
Browse files Browse the repository at this point in the history
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
  • Loading branch information
bshewale committed Sep 20, 2022
1 parent 5d08033 commit 0492c16
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion roles/build-containers/templates/tripleo-build.sh.j2
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ openstack tripleo container image build \
--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 %}
{% if (tcib_extra_config is defined) and (release|default(branch) not in ["train"]) %}
{% if (tcib_extra_config is defined) and (release|default(branch) not in ["train", "wallaby"]) %}
--extra-config {{ workspace }}/extra_config.yaml \
{% endif %}
--debug

0 comments on commit 0492c16

Please sign in to comment.