From e6904c6f379e86fa2f9c5051e49287a4f16e8613 Mon Sep 17 00:00:00 2001 From: Marcos Paulo Oliveira Silva Date: Wed, 14 Jun 2023 15:40:47 -0300 Subject: [PATCH] Remove Node Feature Discovery helm charts from platform packaging Test Plan: PASSED: The platform-integ-apps debian package was built succesfully Story: 2010769 Task: 48235 Depends-On: https://review.opendev.org/c/starlingx/app-node-feature-discovery/+/885097 Change-Id: I14b739127ac1da9c794a7eb253a52690cf3da93f Signed-off-by: Marcos Paulo Oliveira Silva --- stx-platform-helm/debian/deb_folder/rules | 4 ---- stx-platform-helm/debian/deb_folder/stx-platform-helm.install | 1 - stx-platform-helm/debian/meta_data.yaml | 2 -- 3 files changed, 7 deletions(-) diff --git a/stx-platform-helm/debian/deb_folder/rules b/stx-platform-helm/debian/deb_folder/rules index db229e7..38f2eb3 100755 --- a/stx-platform-helm/debian/deb_folder/rules +++ b/stx-platform-helm/debian/deb_folder/rules @@ -3,7 +3,6 @@ export ROOT = debian/tmp export APP_FOLDER = $(ROOT)/usr/local/share/applications/helm -export EXTRA_CHARTS = $(ROOT)/opt/extracharts export DEB_VERSION = $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ') export RELEASE = $(shell echo $(DEB_VERSION) | cut -f 1 -d '-') @@ -22,7 +21,6 @@ export STAGING_FLUXCD = staging-fluxcd override_dh_auto_build: # Create the TGZ file. cd helm-charts && make ceph-pools-audit - cd helm-charts && make node-feature-discovery # Setup the staging directory. mkdir -p $(STAGING_FLUXCD) @@ -52,8 +50,6 @@ override_dh_auto_install: # Install the app tar file. install -d -m 755 $(APP_FOLDER) install -p -D -m 755 $(APP_TARBALL_FLUXCD) $(APP_FOLDER) - install -d -m 755 $(EXTRA_CHARTS) - install -p -D -m 755 helm-charts/node-feature-discovery-*.tgz $(EXTRA_CHARTS) override_dh_auto_test: diff --git a/stx-platform-helm/debian/deb_folder/stx-platform-helm.install b/stx-platform-helm/debian/deb_folder/stx-platform-helm.install index d0be6f3..1b47c6e 100644 --- a/stx-platform-helm/debian/deb_folder/stx-platform-helm.install +++ b/stx-platform-helm/debian/deb_folder/stx-platform-helm.install @@ -1,2 +1 @@ -opt/extracharts/* usr/local/share/applications/helm/* diff --git a/stx-platform-helm/debian/meta_data.yaml b/stx-platform-helm/debian/meta_data.yaml index 300091c..20f14aa 100644 --- a/stx-platform-helm/debian/meta_data.yaml +++ b/stx-platform-helm/debian/meta_data.yaml @@ -2,8 +2,6 @@ debname: stx-platform-helm debver: 1.1-0 src_path: stx-platform-helm -src_files: - - ${MY_REPO}/stx/helm-charts/node-feature-discovery/node-feature-discovery/helm-charts revision: dist: $STX_DIST GITREVCOUNT: