x/microstack
Code Issues Proposed changes

Avoid staging conflicts

Browse Source 
Builds started failing due to staging failures where init,
openstack-projects, launch, cluster, qemu, and microstack parts
are attempting to stage the same files with different contents for
pip, pkg_resources, setuptools, and libglib2.0-0 libraries.

Change-Id: I759391edfff8fd1010eccba0c38814e3be49cc84
This commit is contained in:
Corey Bryant 2021-03-05 16:30:00 -05:00
parent a622c6bb26
commit 4bc0bc057c
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
snapcraft.yaml
View File

@ -686,6 +686,7 @@ parts:
- conntrack - conntrack
- coreutils - coreutils
- haproxy - haproxy
- libglib2.0-0
- libmagic1 - libmagic1
- petname - petname
- libsystemd0 - libsystemd0
@ -711,11 +712,9 @@ parts:
- python-cinderclient - python-cinderclient
- python-openstackclient - python-openstackclient
- python-swiftclient - python-swiftclient
# Workaround for https://bugs.launchpad.net/snapcraft/+bug/1860768 # Pin pip and setuptools to align with init part
# This is a package required for the launch script, per the bug - pip==20.0.2
# above. We include it here so that we don't try to rebuild dist - setuptools==44.0.0
# stuff:
- petname
- systemd-python - systemd-python
# Used by spice-html5 proxy. # Used by spice-html5 proxy.
- websockify - websockify
@ -1050,6 +1049,7 @@ parts:
- libcaca0 - libcaca0
- libfdt1 - libfdt1
- libflac8 - libflac8
- libglib2.0-0
- libglu1-mesa - libglu1-mesa
- libiscsi7 - libiscsi7
- libjpeg-turbo8 - libjpeg-turbo8
@ -1424,13 +1424,19 @@ parts:
plugin: python plugin: python
# python-version: python3 # python-version: python3
requirements: requirements:
- requirements.txt # Relative to source path, so tools/init/req...txt - requirements.txt # Relative to source path, so tools/init/req...txt
constraints:
- ${SNAPCRAFT_STAGE}/patches/upper-constraints.txt
source: tools/init source: tools/init
stage-packages: stage-packages:
# note(dmitriis) in order to avoid conflicts about lib64/ld-linux-x86-64.so.2 # note(dmitriis) in order to avoid conflicts about lib64/ld-linux-x86-64.so.2
# with other parts. # with other parts.
- libc6 - libc6
- rsync - rsync
python-packages:
# Pin pip and setuptools to align with init part
- pip==20.0.2
- setuptools==44.0.0
build-environment: *python-build-environment build-environment: *python-build-environment
after: [openstack-projects] after: [openstack-projects]
override-build: | override-build: |
@ -1451,7 +1457,9 @@ parts:
plugin: python plugin: python
# python-version: python3 # python-version: python3
requirements: requirements:
- requirements.txt - requirements.txt
constraints:
- ${SNAPCRAFT_STAGE}/patches/upper-constraints.txt
source: tools/launch source: tools/launch
stage-packages: stage-packages:
# note(dmitriis) in order to avoid conflicts about lib64/ld-linux-x86-64.so.2 # note(dmitriis) in order to avoid conflicts about lib64/ld-linux-x86-64.so.2