From 0e7811e2038f9625c15f25973a13cc9bd98021dd Mon Sep 17 00:00:00 2001 From: "Chandan Kumar (raukadah)" Date: Thu, 15 Sep 2022 13:03:39 +0530 Subject: [PATCH] Disable tcib_extra_config for train temporarily tcib_extra_config features does not work in RHOS-16.2 and the fix[1] needs to be promoted to downstream to fix it. In order to unblock the container-build job downstream, we are disabling this feature for train. Note: We have not added code comment in the template change as it breaks the CLI. [1]. https://review.opendev.org/c/openstack/tripleo-ansible/+/857777 Signed-off-by: Chandan Kumar (raukadah) Change-Id: I0cde6daed826f08d8cc4b51f2b3350bd303ffdb6 --- roles/build-containers/templates/tripleo-build.sh.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/build-containers/templates/tripleo-build.sh.j2 b/roles/build-containers/templates/tripleo-build.sh.j2 index c73b95042..6352fe440 100644 --- a/roles/build-containers/templates/tripleo-build.sh.j2 +++ b/roles/build-containers/templates/tripleo-build.sh.j2 @@ -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 %} +{% if (tcib_extra_config is defined) and (release|default(branch) not in ["train"]) %} --extra-config {{ workspace }}/extra_config.yaml \ {% endif %} --debug