bifrost: Don't use env-setup

env-setup script removes epel-release and this
breaks our CI template overrides.
It is also more geared towards using in opendev
CI - let's just install proper Ansible version
instead.

Change-Id: I68f645bef05dd15eba41479e3ef6713100fb87d0
(cherry picked from commit fb94f3aff7)
This commit is contained in:
Michal Nasiadka 2023-11-28 11:11:51 +00:00
parent 380ece478c
commit 8f3b6be39e
2 changed files with 5 additions and 4 deletions

View File

@ -40,8 +40,11 @@ RUN apt-get --error-on=any update && \
{%- else %}
RUN echo " " && \
{%- endif %}
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 \
bash -c 'export VENV=/var/lib/kolla/venv && \
$VENV/bin/pip install "ansible>=6,<7" && \
$VENV/bin/ansible-galaxy collection install -r /bifrost/ansible-collections-requirements.yml && \
ansible-playbook -vvvv -i /bifrost/playbooks/inventory/target \
/bifrost/playbooks/install.yaml \
-e git_branch={{ openstack_branch_slashed }} \
-e ipa_upstream_release={{ openstack_branch }} \
-e @/tmp/build_arg.yml && \

View File

@ -25,7 +25,6 @@ UNBUILDABLE_IMAGES = {
# Issues for SHA1 keys:
# https://github.com/grafana/grafana/issues/41036
'centos': {
"bifrost-base", # EPEL-related breakage
"hacluster-pcs", # Missing crmsh package
"nova-spicehtml5proxy", # Missing spicehtml5 package
"ovsdpdk", # Not supported on CentOS
@ -42,7 +41,6 @@ UNBUILDABLE_IMAGES = {
},
'rocky': {
"bifrost-base", # EPEL-related breakage
"hacluster-pcs", # Missing crmsh package
"nova-spicehtml5proxy", # Missing spicehtml5 package
"ovsdpdk", # Not supported on CentOS