Avoid staging conflicts
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:
parent
a622c6bb26
commit
717f78ffd7
|
@ -686,6 +686,7 @@ parts:
|
|||
- conntrack
|
||||
- coreutils
|
||||
- haproxy
|
||||
- libglib2.0-0
|
||||
- libmagic1
|
||||
- petname
|
||||
- libsystemd0
|
||||
|
@ -711,11 +712,9 @@ parts:
|
|||
- python-cinderclient
|
||||
- python-openstackclient
|
||||
- python-swiftclient
|
||||
# Workaround for https://bugs.launchpad.net/snapcraft/+bug/1860768
|
||||
# This is a package required for the launch script, per the bug
|
||||
# above. We include it here so that we don't try to rebuild dist
|
||||
# stuff:
|
||||
- petname
|
||||
# Pin pip and setuptools to align with other parts
|
||||
- pip==21.0.1
|
||||
- setuptools==54.1.1
|
||||
- systemd-python
|
||||
# Used by spice-html5 proxy.
|
||||
- websockify
|
||||
|
@ -1050,6 +1049,7 @@ parts:
|
|||
- libcaca0
|
||||
- libfdt1
|
||||
- libflac8
|
||||
- libglib2.0-0
|
||||
- libglu1-mesa
|
||||
- libiscsi7
|
||||
- libjpeg-turbo8
|
||||
|
@ -1424,7 +1424,9 @@ parts:
|
|||
plugin: python
|
||||
# python-version: python3
|
||||
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
|
||||
stage-packages:
|
||||
# note(dmitriis) in order to avoid conflicts about lib64/ld-linux-x86-64.so.2
|
||||
|
@ -1451,7 +1453,9 @@ parts:
|
|||
plugin: python
|
||||
# python-version: python3
|
||||
requirements:
|
||||
- requirements.txt
|
||||
- requirements.txt
|
||||
constraints:
|
||||
- ${SNAPCRAFT_STAGE}/patches/upper-constraints.txt
|
||||
source: tools/launch
|
||||
stage-packages:
|
||||
# note(dmitriis) in order to avoid conflicts about lib64/ld-linux-x86-64.so.2
|
||||
|
|
Loading…
Reference in New Issue