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>
This commit is contained in:
parent
df64855ab9
commit
b2b0b0d7e8
@ -1,8 +1,7 @@
|
|||||||
SRC_DIR="stx-platform-helm"
|
SRC_DIR="stx-platform-helm"
|
||||||
|
|
||||||
COPY_LIST_TO_TAR="\
|
COPY_LIST_TO_TAR="\
|
||||||
$PKG_BASE/../../../helm-charts/node-feature-discovery \
|
$STX_BASE/helm-charts/node-feature-discovery/node-feature-discovery/helm-charts \
|
||||||
$PKG_BASE/../../../helm-charts/rbd-provisioner \
|
"
|
||||||
$PKG_BASE/../../../helm-charts/ceph-pools-audit"
|
|
||||||
|
|
||||||
TIS_PATCH_VER=7
|
TIS_PATCH_VER=7
|
||||||
|
@ -52,7 +52,7 @@ cp files/repositories.yaml %{helm_home}/repository/repositories.yaml
|
|||||||
cp files/index.yaml %{helm_home}/repository/local/index.yaml
|
cp files/index.yaml %{helm_home}/repository/local/index.yaml
|
||||||
|
|
||||||
# Stage helm-toolkit in the local repo
|
# 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
|
# Host a server for the charts
|
||||||
helm serve --repo-path . &
|
helm serve --repo-path . &
|
||||||
@ -60,9 +60,11 @@ helm repo rm local
|
|||||||
helm repo add local http://localhost:8879/charts
|
helm repo add local http://localhost:8879/charts
|
||||||
|
|
||||||
# Make the charts. These produce a tgz file
|
# Make the charts. These produce a tgz file
|
||||||
|
cd helm-charts
|
||||||
make rbd-provisioner
|
make rbd-provisioner
|
||||||
make ceph-pools-audit
|
make ceph-pools-audit
|
||||||
make node-feature-discovery
|
make node-feature-discovery
|
||||||
|
cd -
|
||||||
|
|
||||||
# Terminate helm server (the last backgrounded task)
|
# Terminate helm server (the last backgrounded task)
|
||||||
kill %1
|
kill %1
|
||||||
@ -76,7 +78,7 @@ mkdir -p %{app_staging}
|
|||||||
cp files/metadata.yaml %{app_staging}
|
cp files/metadata.yaml %{app_staging}
|
||||||
cp manifests/manifest.yaml %{app_staging}
|
cp manifests/manifest.yaml %{app_staging}
|
||||||
mkdir -p %{app_staging}/charts
|
mkdir -p %{app_staging}/charts
|
||||||
cp *.tgz %{app_staging}/charts
|
cp helm-charts/*.tgz %{app_staging}/charts
|
||||||
cd %{app_staging}
|
cd %{app_staging}
|
||||||
|
|
||||||
# Populate metadata
|
# Populate metadata
|
||||||
@ -95,7 +97,7 @@ rm -fr %{app_staging}
|
|||||||
install -d -m 755 %{buildroot}/%{app_folder}
|
install -d -m 755 %{buildroot}/%{app_folder}
|
||||||
install -p -D -m 755 %{_builddir}/%{app_tarball} %{buildroot}/%{app_folder}
|
install -p -D -m 755 %{_builddir}/%{app_tarball} %{buildroot}/%{app_folder}
|
||||||
install -d -m 755 ${RPM_BUILD_ROOT}/opt/extracharts
|
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
|
%files
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user