diff options
| author | Radosław Piliszek <radoslaw.piliszek@gmail.com> | 2022-05-21 17:45:37 +0200 |
|---|---|---|
| committer | Radosław Piliszek <radoslaw.piliszek@gmail.com> | 2022-05-21 19:38:23 +0200 |
| commit | 633c89b423c6d83609120faa87d4b4d63e59ccfa (patch) | |
| tree | 1a79f681f709e8940989e3ba2f4696e525d6c7b6 | |
| parent | b888f68daf6cb3ed9782fe85045858b6a04d4911 (diff) | |
| download | kolla-633c89b423c6d83609120faa87d4b4d63e59ccfa.tar.gz kolla-633c89b423c6d83609120faa87d4b4d63e59ccfa.zip | |
[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
| -rw-r--r-- | docker/bifrost/bifrost-base/Dockerfile.j2 | 2 |
1 files changed, 1 insertions, 1 deletions
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 }} \ |