Skip to content

Commit 132c2e5

Browse files
committed
CI: Fix container image build workflow
1 parent 40881b2 commit 132c2e5

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

.github/workflows/stackhpc-container-image-build.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,13 @@ jobs:
163163
# Normally installed during host configure.
164164
- name: Install Docker Python SDK
165165
run: |
166-
sudo pip install docker 'requests<2.32.0'
167-
166+
. /etc/os-release
167+
if [[ $VERSION_ID == 22.04 ]]; then
168+
sudo pip install docker 'requests<2.32.0'
169+
else
170+
sudo pip install docker 'requests<2.32.0' --break-system-packages
171+
fi
172+
168173
- name: Get Kolla tag
169174
id: write-kolla-tag
170175
run: echo "kolla-tag=${{ needs.generate-tag.outputs.openstack_release }}-${{ matrix.distro }}-${{ matrix.distro == 'rocky' && '9' || 'jammy' }}-${{ needs.generate-tag.outputs.datetime_tag }}" >> $GITHUB_OUTPUT

etc/kayobe/kolla/kolla-build.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ build_args = {{ kolla_build_args.items() | map('join', ':') | join(',') }}
1313
[openstack-base]
1414
type = git
1515
location = https://github.com/stackhpc/requirements
16-
reference = stackhpc/{{ openstack_release }}
16+
reference = bump-pyyaml

etc/kayobe/pip.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Upper constraints file for installation of python packages.
44
# Default value is
55
# "https://releases.openstack.org/constraints/upper/{{ openstack_release }}"
6-
pip_upper_constraints_file: "https://raw.githubusercontent.com/stackhpc/requirements/refs/heads/stackhpc/{{ openstack_release }}/upper-constraints.txt"
6+
pip_upper_constraints_file: "https://raw.githubusercontent.com/stackhpc/requirements/refs/heads/bump-pyyaml/upper-constraints.txt"
77

88
# Use a local PyPi mirror for installing Pip packages
99
#pip_local_mirror: false

0 commit comments

Comments
 (0)