Ensure stx-openstack tarball builds on Debian
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:
@@ -1 +1 @@
|
|||||||
plugins/k8sapp-openstack/*.whl
|
plugins/*.whl
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ override_dh_auto_install:
|
|||||||
python3 setup.py install --install-layout=deb --root $(ROOT)
|
python3 setup.py install --install-layout=deb --root $(ROOT)
|
||||||
python3 setup.py bdist_wheel \
|
python3 setup.py bdist_wheel \
|
||||||
--universal \
|
--universal \
|
||||||
-d $(ROOT)/plugins/$(APP_NAME)
|
-d $(ROOT)/plugins
|
||||||
|
|
||||||
override_dh_python3:
|
override_dh_python3:
|
||||||
dh_python3 --shebang=/usr/bin/python3
|
dh_python3 --shebang=/usr/bin/python3
|
||||||
|
|||||||
@@ -15,7 +15,10 @@ Homepage: https://www.starlingx.io
|
|||||||
Package: stx-openstack-helm-fluxcd
|
Package: stx-openstack-helm-fluxcd
|
||||||
Section: libs
|
Section: libs
|
||||||
Architecture: all
|
Architecture: all
|
||||||
Depends: ${misc:Depends}
|
Depends: ${misc:Depends},
|
||||||
|
openstack-helm-infra,
|
||||||
|
openstack-helm,
|
||||||
|
python3-k8sapp-openstack-wheels
|
||||||
Description: StarlingX Openstack FluxCD application
|
Description: StarlingX Openstack FluxCD application
|
||||||
This package contains the components needed for the Openstack FluxCD
|
This package contains the components needed for the Openstack FluxCD
|
||||||
application.
|
application.
|
||||||
|
|||||||
@@ -15,7 +15,10 @@ Homepage: https://www.starlingx.io
|
|||||||
Package: stx-openstack-helm
|
Package: stx-openstack-helm
|
||||||
Section: libs
|
Section: libs
|
||||||
Architecture: all
|
Architecture: all
|
||||||
Depends: ${misc:Depends}
|
Depends: ${misc:Depends},
|
||||||
|
openstack-helm-infra,
|
||||||
|
openstack-helm,
|
||||||
|
python3-k8sapp-openstack-wheels
|
||||||
Description: StarlingX Openstack Armada Helm Charts
|
Description: StarlingX Openstack Armada Helm Charts
|
||||||
This package contains Armada helm charts for the Openstack armada
|
This package contains Armada helm charts for the Openstack armada
|
||||||
application.
|
application.
|
||||||
|
|||||||
Reference in New Issue
Block a user