starlingx/SDO-rv-service
Code Issues Proposed changes

Remove SDO helm-toolkit build dependency

Browse Source 
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 <rafael.vieirafalcao@windriver.com>
Signed-off-by: Thales Elero Cervi <thaleselero.cervi@windriver.com>
This commit is contained in:
Rafael Falcao 2023-06-22 08:20:19 -03:00 committed by Thales Elero Cervi
parent f0f4880e1d
commit 80224a58e1
8 changed files with 1 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
centos_build_layer.cfg
View File

@ -1 +0,0 @@
flock

0
centos_iso_image.inc
View File

1
centos_pkg_dirs
View File

@ -1 +0,0 @@
stx-sdo-helm

3
stx-sdo-helm/centos/build_srpm.data
View File

@ -1,3 +0,0 @@
SRC_DIR="stx-sdo-helm"
TIS_PATCH_VER=PKG_GITREVCOUNT

60
stx-sdo-helm/centos/stx-sdo-helm.spec
View File

@ -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}/*

3
stx-sdo-helm/debian/deb_folder/control
View File

@ -5,8 +5,7 @@ Maintainer: StarlingX Developers <starlingx-discuss@lists.starlingx.io>
Build-Depends: debhelper-compat (= 13), Build-Depends: debhelper-compat (= 13),
chartmuseum, chartmuseum,
helm, helm,
openstack-helm-infra, procps,
procps
Standards-Version: 4.1.2 Standards-Version: 4.1.2
Homepage: https://www.starlingx.io Homepage: https://www.starlingx.io

11
stx-sdo-helm/debian/deb_folder/rules
View File

@ -4,37 +4,26 @@
export ROOT = debian/tmp export ROOT = debian/tmp
export APP_FOLDER = $(ROOT)/usr/lib/application export APP_FOLDER = $(ROOT)/usr/lib/application
export ARMADA_FOLDER = $(ROOT)/usr/lib/armada
export HELM_FOLDER = $(ROOT)/usr/lib/helm export HELM_FOLDER = $(ROOT)/usr/lib/helm
export TOOLKIT_VERSION = 0.2.19
%: %:
dh $@ dh $@
override_dh_auto_build: 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 # Host a server for the charts
chartmuseum --debug --port=8879 --context-path='/charts' --storage="local" --storage-local-rootdir="./helm-charts" & chartmuseum --debug --port=8879 --context-path='/charts' --storage="local" --storage-local-rootdir="./helm-charts" &
sleep 2 sleep 2
helm repo add local http://localhost:8879/charts helm repo add local http://localhost:8879/charts
# Create the TGZ file. # Create the TGZ file.
cd helm-charts && make cd helm-charts && make
# Terminate the helm chart server. # Terminate the helm chart server.
pkill chartmuseum pkill chartmuseum
override_dh_auto_install: override_dh_auto_install:
# helm_folder is created by openstack-helm-infra # helm_folder is created by openstack-helm-infra
install -d -m 755 $(APP_FOLDER) install -d -m 755 $(APP_FOLDER)
install -p -D -m 755 files/metadata.yaml $(APP_FOLDER) install -p -D -m 755 files/metadata.yaml $(APP_FOLDER)
install -d -m 755 $(HELM_FOLDER) install -d -m 755 $(HELM_FOLDER)
install -p -D -m 755 helm-charts/*.tgz $(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)

1
stx-sdo-helm/debian/deb_folder/stx-sdo-helm.install
View File

@ -1,3 +1,2 @@
usr/lib/helm/* /usr/lib/helm usr/lib/helm/* /usr/lib/helm
usr/lib/armada/* /usr/lib/armada
usr/lib/application/* /usr/lib/application usr/lib/application/* /usr/lib/application