x
/
microstack
Code Issues Proposed changes

Avoid staging conflicts 

Today 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, 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:
Corey Bryant 2021-03-05 16:30:00 -05:00
parent 84367961e3
commit 689c8e2cdb
1 changed files with 51 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
snapcraft.yaml
View File

@ -767,6 +767,20 @@ parts:
# see LP: #1882994
rm $SNAPCRAFT_PART_INSTALL/bin/python3
rm $SNAPCRAFT_PART_INSTALL/bin/python
filesets:
exclude-duplicate-files:
- -usr/lib/x86_64-linux-gnu/glib-2.0/gio-querymodules
- -usr/lib/x86_64-linux-gnu/glib-2.0/glib-compile-schemas
- -usr/lib/x86_64-linux-gnu/libgio-2.0.so.0.6400.6
- -usr/lib/x86_64-linux-gnu/libglib-2.0.so.0.6400.6
- -usr/lib/x86_64-linux-gnu/libgmodule-2.0.so.0.6400.6
- -usr/lib/x86_64-linux-gnu/libgobject-2.0.so.0.6400.6
- -usr/lib/x86_64-linux-gnu/libgthread-2.0.so.0.6400.6
- -usr/share/doc/libglib2.0-0/changelog.Debian.gz
stage:
- $exclude-duplicate-files
prime:
- $exclude-duplicate-files
keystone-config:
after: [openstack-projects]
@ -1445,6 +1459,15 @@ parts:
rm $SNAPCRAFT_PART_INSTALL/bin/python3
rm $SNAPCRAFT_PART_INSTALL/bin/python
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:
@ -1469,6 +1492,16 @@ parts:
rm $SNAPCRAFT_PART_INSTALL/bin/activate.fish
rm $SNAPCRAFT_PART_INSTALL/bin/python3
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:
plugin: python
@ -1488,6 +1521,15 @@ parts:
rm $SNAPCRAFT_PART_INSTALL/bin/activate.fish
rm $SNAPCRAFT_PART_INSTALL/bin/python3
rm $SNAPCRAFT_PART_INSTALL/bin/python
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
# Clustering client and server
cluster:
@ -1516,6 +1558,15 @@ parts:
rm $SNAPCRAFT_PART_INSTALL/bin/activate.fish
rm $SNAPCRAFT_PART_INSTALL/bin/python
rm $SNAPCRAFT_PART_INSTALL/bin/python3
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
setup-lvm-loopdev:
source-type: local