Skip to content

Commit 6a6fce5

Browse files
committed
[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 (cherry picked from commit 633c89b)
1 parent 0009ffb commit 6a6fce5

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

docker/bifrost/bifrost-base/Dockerfile.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ RUN apt-get update && \
4040
{%- else %}
4141
RUN echo " " && \
4242
{%- endif %}
43-
bash -c './scripts/env-setup.sh && \
43+
bash -c 'TOX_CONSTRAINTS_FILE=/requirements/upper-constraints.txt ./scripts/env-setup.sh && \
4444
ansible-playbook -vvvv -i /bifrost/playbooks/inventory/target /bifrost/playbooks/install.yaml \
4545
-e @/tmp/build_arg.yml && \
4646
{%- if base_package_type == 'deb' %}

0 commit comments

Comments
 (0)