From 80224a58e1f084407d5d11b99e33457f5fa92e45 Mon Sep 17 00:00:00 2001 From: Rafael Falcao Date: Thu, 22 Jun 2023 08:20:19 -0300 Subject: [PATCH] Remove SDO helm-toolkit build dependency This change removes the unnecessary helm-toolkit build dependency for sdo-helm application build, taking this build cleanup opportunity to also remove old CentOS and Armada related build instructions. Test Plan: PASS: build-pkgs -c -p stx-sdo-helm Closes-Bug: 1980772 Change-Id: I4d3cbd0417d77258861369145a3f0cc44d5d845e Signed-off-by: Rafael Falcao Signed-off-by: Thales Elero Cervi --- centos_build_layer.cfg | 1 - centos_iso_image.inc | 0 centos_pkg_dirs | 1 - stx-sdo-helm/centos/build_srpm.data | 3 - stx-sdo-helm/centos/stx-sdo-helm.spec | 60 ------------------- stx-sdo-helm/debian/deb_folder/control | 3 +- stx-sdo-helm/debian/deb_folder/rules | 11 ---- .../debian/deb_folder/stx-sdo-helm.install | 1 - 8 files changed, 1 insertion(+), 79 deletions(-) delete mode 100644 centos_build_layer.cfg delete mode 100644 centos_iso_image.inc delete mode 100644 centos_pkg_dirs delete mode 100644 stx-sdo-helm/centos/build_srpm.data delete mode 100644 stx-sdo-helm/centos/stx-sdo-helm.spec diff --git a/centos_build_layer.cfg b/centos_build_layer.cfg deleted file mode 100644 index c581999..0000000 --- a/centos_build_layer.cfg +++ /dev/null @@ -1 +0,0 @@ -flock diff --git a/centos_iso_image.inc b/centos_iso_image.inc deleted file mode 100644 index e69de29..0000000 diff --git a/centos_pkg_dirs b/centos_pkg_dirs deleted file mode 100644 index 70e2240..0000000 --- a/centos_pkg_dirs +++ /dev/null @@ -1 +0,0 @@ -stx-sdo-helm diff --git a/stx-sdo-helm/centos/build_srpm.data b/stx-sdo-helm/centos/build_srpm.data deleted file mode 100644 index 157a923..0000000 --- a/stx-sdo-helm/centos/build_srpm.data +++ /dev/null @@ -1,3 +0,0 @@ -SRC_DIR="stx-sdo-helm" - -TIS_PATCH_VER=PKG_GITREVCOUNT diff --git a/stx-sdo-helm/centos/stx-sdo-helm.spec b/stx-sdo-helm/centos/stx-sdo-helm.spec deleted file mode 100644 index 95c37b1..0000000 --- a/stx-sdo-helm/centos/stx-sdo-helm.spec +++ /dev/null @@ -1,60 +0,0 @@ -%global helm_folder /usr/lib/helm -%global armada_folder /usr/lib/armada -%global app_folder /usr/lib/application -%global toolkit_version 0.2.19 -%global helmchart_version 0.1.0 - -Summary: StarlingX SDO Application Helm charts -Name: stx-sdo-helm -Version: 1.0 -Release: %{tis_patch_ver}%{?_tis_dist} -License: Apache-2.0 -Group: base -Packager: Intel -URL: unknown - -Source0: %{name}-%{version}.tar.gz - -BuildArch: noarch - -BuildRequires: helm -BuildRequires: chartmuseum -BuildRequires: openstack-helm-infra - -%description -StarlingX SDO Application Helm charts - -%prep -%setup - -%build -# Stage helm-toolkit in the local repo -cp %{helm_folder}/helm-toolkit-%{toolkit_version}.tgz helm-charts/ - -# Host a server for the charts -chartmuseum --debug --port=8879 --context-path='/charts' --storage="local" --storage-local-rootdir="./helm-charts" & -sleep 2 -helm repo add local http://localhost:8879/charts - -# Make the charts. These produce a tgz file -cd helm-charts -make sdo -cd - - -# terminate helm server (the last backgrounded task) -kill %1 - -%install -# helm_folder is created by openstack-helm-infra -install -d -m 755 ${RPM_BUILD_ROOT}%{app_folder} -install -p -D -m 755 files/metadata.yaml ${RPM_BUILD_ROOT}%{app_folder} -install -d -m 755 ${RPM_BUILD_ROOT}%{helm_folder} -install -p -D -m 755 helm-charts/*.tgz ${RPM_BUILD_ROOT}%{helm_folder} -install -d -m 755 ${RPM_BUILD_ROOT}%{armada_folder} -install -p -D -m 755 manifests/*.yaml ${RPM_BUILD_ROOT}%{armada_folder} - -%files -%defattr(-,root,root,-) -%{helm_folder}/* -%{armada_folder}/* -%{app_folder}/* diff --git a/stx-sdo-helm/debian/deb_folder/control b/stx-sdo-helm/debian/deb_folder/control index d6e608f..ae0e090 100644 --- a/stx-sdo-helm/debian/deb_folder/control +++ b/stx-sdo-helm/debian/deb_folder/control @@ -5,8 +5,7 @@ Maintainer: StarlingX Developers Build-Depends: debhelper-compat (= 13), chartmuseum, helm, - openstack-helm-infra, - procps + procps, Standards-Version: 4.1.2 Homepage: https://www.starlingx.io diff --git a/stx-sdo-helm/debian/deb_folder/rules b/stx-sdo-helm/debian/deb_folder/rules index 0a074af..47348da 100755 --- a/stx-sdo-helm/debian/deb_folder/rules +++ b/stx-sdo-helm/debian/deb_folder/rules @@ -4,37 +4,26 @@ export ROOT = debian/tmp export APP_FOLDER = $(ROOT)/usr/lib/application -export ARMADA_FOLDER = $(ROOT)/usr/lib/armada export HELM_FOLDER = $(ROOT)/usr/lib/helm -export TOOLKIT_VERSION = 0.2.19 %: dh $@ override_dh_auto_build: - - # Stage helm-toolkit in the local repo - cp /usr/lib/helm/helm-toolkit-$(TOOLKIT_VERSION).tgz helm-charts/ - # Host a server for the charts chartmuseum --debug --port=8879 --context-path='/charts' --storage="local" --storage-local-rootdir="./helm-charts" & sleep 2 helm repo add local http://localhost:8879/charts - # Create the TGZ file. cd helm-charts && make - # Terminate the helm chart server. pkill chartmuseum override_dh_auto_install: - # helm_folder is created by openstack-helm-infra install -d -m 755 $(APP_FOLDER) install -p -D -m 755 files/metadata.yaml $(APP_FOLDER) install -d -m 755 $(HELM_FOLDER) install -p -D -m 755 helm-charts/*.tgz $(HELM_FOLDER) - install -d -m 755 $(ARMADA_FOLDER) - install -p -D -m 755 manifests/*.yaml $(ARMADA_FOLDER) diff --git a/stx-sdo-helm/debian/deb_folder/stx-sdo-helm.install b/stx-sdo-helm/debian/deb_folder/stx-sdo-helm.install index 937608f..facedda 100644 --- a/stx-sdo-helm/debian/deb_folder/stx-sdo-helm.install +++ b/stx-sdo-helm/debian/deb_folder/stx-sdo-helm.install @@ -1,3 +1,2 @@ usr/lib/helm/* /usr/lib/helm -usr/lib/armada/* /usr/lib/armada usr/lib/application/* /usr/lib/application