From b201026f69f2c2e374c2cfb0c15ea07b6b75e668 Mon Sep 17 00:00:00 2001 From: Thales Elero Cervi Date: Wed, 19 Oct 2022 13:54:33 -0300 Subject: [PATCH] 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 Change-Id: Ibbb231ce4bfe9956bc564002cd8b330c92f9d6c0 --- .../deb_folder/python3-k8sapp-openstack-wheels.install | 2 +- python-k8sapp-openstack/debian/deb_folder/rules | 2 +- stx-openstack-helm-fluxcd/debian/deb_folder/control | 5 ++++- stx-openstack-helm/debian/deb_folder/control | 5 ++++- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/python-k8sapp-openstack/debian/deb_folder/python3-k8sapp-openstack-wheels.install b/python-k8sapp-openstack/debian/deb_folder/python3-k8sapp-openstack-wheels.install index 9fd0fc93..19a9e4ca 100644 --- a/python-k8sapp-openstack/debian/deb_folder/python3-k8sapp-openstack-wheels.install +++ b/python-k8sapp-openstack/debian/deb_folder/python3-k8sapp-openstack-wheels.install @@ -1 +1 @@ -plugins/k8sapp-openstack/*.whl +plugins/*.whl diff --git a/python-k8sapp-openstack/debian/deb_folder/rules b/python-k8sapp-openstack/debian/deb_folder/rules index 71b8e8e9..8b48dca9 100755 --- a/python-k8sapp-openstack/debian/deb_folder/rules +++ b/python-k8sapp-openstack/debian/deb_folder/rules @@ -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 diff --git a/stx-openstack-helm-fluxcd/debian/deb_folder/control b/stx-openstack-helm-fluxcd/debian/deb_folder/control index 3fc13ec8..29979856 100644 --- a/stx-openstack-helm-fluxcd/debian/deb_folder/control +++ b/stx-openstack-helm-fluxcd/debian/deb_folder/control @@ -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. diff --git a/stx-openstack-helm/debian/deb_folder/control b/stx-openstack-helm/debian/deb_folder/control index ac7e484b..6096242b 100644 --- a/stx-openstack-helm/debian/deb_folder/control +++ b/stx-openstack-helm/debian/deb_folder/control @@ -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.