Fix requirements build for master

The requirements.sh script fails on master due to this
https://review.opendev.org/c/openstack/requirements/+/921656

Also Ansible docker_container module is not compatible
with the recent docker daemon.

Change-Id: Ib9440cbf2a5196c31a7669edd73472d685a754a5
This commit is contained in:
Vladimir Kozhukalov 2024-06-20 04:01:45 -05:00
parent 0842d310b3
commit 73d2ed2657
2 changed files with 9 additions and 15 deletions

View File

@ -12,16 +12,8 @@
block: block:
- include_role: - include_role:
name: ensure-docker name: ensure-docker
- pip: - shell: |
name: docker run -d --name registry --restart always -p 172.17.0.1:5000:5000 docker.io/registry:2
- docker
- docker_container:
name: registry
image: registry:2
state: started
restart_policy: "always"
published_ports:
- 172.17.0.1:5000:5000
become: True become: True
- name: Setup http server for git repos - name: Setup http server for git repos
@ -49,4 +41,5 @@
name: name:
- apache2 - apache2
- gitweb - gitweb
- python3-requests
become: True become: True

View File

@ -33,12 +33,13 @@ if [[ "$(uname -p)" == "aarch64" ]]; then
fi fi
# Remove any pylxd before 2.2.7 as the old versions cannot be built in CI. # Remove any pylxd before 2.2.7 as the old versions cannot be built in CI.
lxd_constraint=$(grep pylxd /upper-constraints.txt) if lxd_constraint=$(grep pylxd /upper-constraints.txt); then
# This removes (##) everything (*) from the lxd_constraint until the last =, # This removes (##) everything (*) from the lxd_constraint until the last =,
# and removes all '.' to look like a number. # and removes all '.' to look like a number.
if (( $(echo ${lxd_constraint##*=} | sed 's#\.##g') < 227 )); then if (( $(echo ${lxd_constraint##*=} | sed 's#\.##g') < 227 )); then
sed -i '/pylxd/d' /upper-constraints.txt sed -i '/pylxd/d' /upper-constraints.txt
fi fi
fi
mkdir /source-wheels mkdir /source-wheels
# Pre-build wheels for unnamed constraints # Pre-build wheels for unnamed constraints