From 633c89b423c6d83609120faa87d4b4d63e59ccfa Mon Sep 17 00:00:00 2001 From: Radosław Piliszek Date: Sat, 21 May 2022 17:45:37 +0200 Subject: [bifrost] Force Bifrost to use the correct u-c Following up on [1], Bifrost also needs to use correct u-c and, surprise-surprise, this is set via a third variable, this time environment one for the bash script. Oh well. Let's do it. This has the added benefit of not requiring additional download of u-c as it reuses the already existing one. [1] https://review.opendev.org/c/openstack/kolla/+/842276 Change-Id: I2cc79c476d089977b57006dd4ce2e9a8c6206aa1 --- docker/bifrost/bifrost-base/Dockerfile.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docker') diff --git a/docker/bifrost/bifrost-base/Dockerfile.j2 b/docker/bifrost/bifrost-base/Dockerfile.j2 index 1dfa0db8c..9592798b2 100644 --- a/docker/bifrost/bifrost-base/Dockerfile.j2 +++ b/docker/bifrost/bifrost-base/Dockerfile.j2 @@ -34,7 +34,7 @@ RUN apt-get update && \ {%- else %} RUN echo " " && \ {%- endif %} - bash -c './scripts/env-setup.sh && \ + bash -c 'TOX_CONSTRAINTS_FILE=/requirements/upper-constraints.txt ./scripts/env-setup.sh && \ ansible-playbook -vvvv -i /bifrost/playbooks/inventory/target /bifrost/playbooks/install.yaml \ -e git_branch={{ openstack_branch_slashed }} \ -e ipa_upstream_release={{ openstack_branch }} \ -- cgit v1.2.3