Avoid staging conflicts
Today builds started failing due staging failures where openstack-projects, init, and launch are attempting to stage the same files with different contents for pip, pkg_resources, and setuptools python packages. bin/petname is also conflicting between openstack-projects and launch. Avoid the conflicts by not pulling the files in for the init and launch parts. Change-Id: I759391edfff8fd1010eccba0c38814e3be49cc84
This commit is contained in:
parent
0ae9adef3e
commit
b333a2ffe9
|
@ -1445,6 +1445,15 @@ parts:
|
||||||
rm $SNAPCRAFT_PART_INSTALL/bin/python3
|
rm $SNAPCRAFT_PART_INSTALL/bin/python3
|
||||||
rm $SNAPCRAFT_PART_INSTALL/bin/python
|
rm $SNAPCRAFT_PART_INSTALL/bin/python
|
||||||
rm $SNAPCRAFT_PART_INSTALL/lib/python3.8/site-packages/netifaces.cpython-38-x86_64-linux-gnu.so
|
rm $SNAPCRAFT_PART_INSTALL/lib/python3.8/site-packages/netifaces.cpython-38-x86_64-linux-gnu.so
|
||||||
|
filesets:
|
||||||
|
exclude-duplicate-files:
|
||||||
|
- -lib/python3.8/site-packages/pip/*
|
||||||
|
- -lib/python3.8/site-packages/pkg_resources/*
|
||||||
|
- -lib/python3.8/site-packages/setuptools/*
|
||||||
|
stage:
|
||||||
|
- $exclude-duplicate-files
|
||||||
|
prime:
|
||||||
|
- $exclude-duplicate-files
|
||||||
|
|
||||||
# Launch script
|
# Launch script
|
||||||
launch:
|
launch:
|
||||||
|
@ -1469,6 +1478,16 @@ parts:
|
||||||
rm $SNAPCRAFT_PART_INSTALL/bin/activate.fish
|
rm $SNAPCRAFT_PART_INSTALL/bin/activate.fish
|
||||||
rm $SNAPCRAFT_PART_INSTALL/bin/python3
|
rm $SNAPCRAFT_PART_INSTALL/bin/python3
|
||||||
rm $SNAPCRAFT_PART_INSTALL/bin/python
|
rm $SNAPCRAFT_PART_INSTALL/bin/python
|
||||||
|
filesets:
|
||||||
|
exclude-duplicate-files:
|
||||||
|
- -bin/petname
|
||||||
|
- -lib/python3.8/site-packages/pip/*
|
||||||
|
- -lib/python3.8/site-packages/pkg_resources/*
|
||||||
|
- -lib/python3.8/site-packages/setuptools/*
|
||||||
|
stage:
|
||||||
|
- $exclude-duplicate-files
|
||||||
|
prime:
|
||||||
|
- $exclude-duplicate-files
|
||||||
|
|
||||||
microstack:
|
microstack:
|
||||||
plugin: python
|
plugin: python
|
||||||
|
|
Loading…
Reference in New Issue