starlingx/openstack-armada-app
Code Issues Proposed changes

Ensure stx-openstack tarball builds on Debian

Browse Source 
When testing the tarball build (build-helm-charts.sh script) it was
found that the dependency list was not correct and therefore the
generated app was missing python plugins and osh/osh-i charts.
This changes fixes the deb packages dependency lists for both
stx-openstack helm armada and fluxcd.

Also, during the tarball tests it was noticed that the python plugins
package on Debian was wrongly placing the built wheels in a
sub-directory with the app name. That directory is not needed and can
break the correct plugin loading, so it was removed.

TEST PLAN:
PASS - Build stx-openstack-helm on Debian
PASS - Build stx-openstack-helm-fluxcd on Debian
PASS - Build stx-openstack app tarball (armada)
PASS - Upload armada app
PASS - Apply armada app
PASS - Build stx-openstack app tarball (fluxcd)
PASS - Upload fluxcd app
PASS - Apply fluxcd app

Story: 2010317
Task: 46610

Signed-off-by: Thales Elero Cervi <thaleselero.cervi@windriver.com>
Change-Id: Ibbb231ce4bfe9956bc564002cd8b330c92f9d6c0
This commit is contained in:
Thales Elero Cervi 2022-10-19 13:54:33 -03:00
parent ad0c1dc0e6
commit b201026f69
4 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
python-k8sapp-openstack/debian/deb_folder/python3-k8sapp-openstack-wheels.install
View File

@ -1 +1 @@
plugins/k8sapp-openstack/*.whl
plugins/*.whl

2
python-k8sapp-openstack/debian/deb_folder/rules
View File

@ -14,7 +14,7 @@ override_dh_auto_install:
python3 setup.py install --install-layout=deb --root $(ROOT)
python3 setup.py bdist_wheel \
--universal \
-d $(ROOT)/plugins/$(APP_NAME)
-d $(ROOT)/plugins
override_dh_python3:
dh_python3 --shebang=/usr/bin/python3

5
stx-openstack-helm-fluxcd/debian/deb_folder/control
View File

@ -15,7 +15,10 @@ Homepage: https://www.starlingx.io
Package: stx-openstack-helm-fluxcd
Section: libs
Architecture: all
Depends: ${misc:Depends}
Depends: ${misc:Depends},
openstack-helm-infra,
openstack-helm,
python3-k8sapp-openstack-wheels
Description: StarlingX Openstack FluxCD application
This package contains the components needed for the Openstack FluxCD
application.

5
stx-openstack-helm/debian/deb_folder/control
View File

@ -15,7 +15,10 @@ Homepage: https://www.starlingx.io
Package: stx-openstack-helm
Section: libs
Architecture: all
Depends: ${misc:Depends}
Depends: ${misc:Depends},
openstack-helm-infra,
openstack-helm,
python3-k8sapp-openstack-wheels
Description: StarlingX Openstack Armada Helm Charts
This package contains Armada helm charts for the Openstack armada
application.