Browse Source

Repair build process for package stx-platform-helm.

Relocation of helm charts required some modifications to
the spec, and relocation of the makefile.

Story: 2006166
Task: 35687
Depends-On: I24b16f31820ff44b4c38fe49e84fac000fd0d155
Change-Id: I3bfc1895dcbf84cbc67e8a0b13545d16f727ad51
Signed-off-by: Scott Little <scott.little@windriver.com>
changes/33/681033/1
Scott Little 2 years ago
parent
commit
b2b0b0d7e8
3 changed files with 7 additions and 6 deletions
  1. +2
    -3
      stx-platform-helm/centos/build_srpm.data
  2. +5
    -3
      stx-platform-helm/centos/stx-platform-helm.spec
  3. +0
    -0
      stx-platform-helm/stx-platform-helm/helm-charts/Makefile

+ 2
- 3
stx-platform-helm/centos/build_srpm.data View File

@ -1,8 +1,7 @@
SRC_DIR="stx-platform-helm"
COPY_LIST_TO_TAR="\
$PKG_BASE/../../../helm-charts/node-feature-discovery \
$PKG_BASE/../../../helm-charts/rbd-provisioner \
$PKG_BASE/../../../helm-charts/ceph-pools-audit"
$STX_BASE/helm-charts/node-feature-discovery/node-feature-discovery/helm-charts \
"
TIS_PATCH_VER=7

+ 5
- 3
stx-platform-helm/centos/stx-platform-helm.spec View File

@ -52,7 +52,7 @@ cp files/repositories.yaml %{helm_home}/repository/repositories.yaml
cp files/index.yaml %{helm_home}/repository/local/index.yaml
# Stage helm-toolkit in the local repo
cp %{helm_folder}/helm-toolkit-%{toolkit_version}.tgz .
cp %{helm_folder}/helm-toolkit-%{toolkit_version}.tgz helm-charts/
# Host a server for the charts
helm serve --repo-path . &
@ -60,9 +60,11 @@ helm repo rm local
helm repo add local http://localhost:8879/charts
# Make the charts. These produce a tgz file
cd helm-charts
make rbd-provisioner
make ceph-pools-audit
make node-feature-discovery
cd -
# Terminate helm server (the last backgrounded task)
kill %1
@ -76,7 +78,7 @@ mkdir -p %{app_staging}
cp files/metadata.yaml %{app_staging}
cp manifests/manifest.yaml %{app_staging}
mkdir -p %{app_staging}/charts
cp *.tgz %{app_staging}/charts
cp helm-charts/*.tgz %{app_staging}/charts
cd %{app_staging}
# Populate metadata
@ -95,7 +97,7 @@ rm -fr %{app_staging}
install -d -m 755 %{buildroot}/%{app_folder}
install -p -D -m 755 %{_builddir}/%{app_tarball} %{buildroot}/%{app_folder}
install -d -m 755 ${RPM_BUILD_ROOT}/opt/extracharts
install -p -D -m 755 node-feature-discovery-*.tgz ${RPM_BUILD_ROOT}/opt/extracharts
install -p -D -m 755 helm-charts/node-feature-discovery-*.tgz ${RPM_BUILD_ROOT}/opt/extracharts
%files
%defattr(-,root,root,-)


stx-platform-helm/stx-platform-helm/Makefile → stx-platform-helm/stx-platform-helm/helm-charts/Makefile View File


Loading…
Cancel
Save