starlingx/snmp-armada-app
Code Issues Proposed changes

Use fluxcd app by default for snmp

Browse Source 
This commit switches snmp to use the fluxcd app by default and also
preserves the armada app on the build for future tests.

TEST PLAN
PASS Build iso and verify apps
PASS Upload
PASS Apply
PASS Verify resources
PASS Remove
PASS Delete

Logs: https://paste.opendev.org/show/bZMwEQnmZqLTAomad46g/

Story: 2009138
Task: 45347

Signed-off-by: Thiago Brito <thiago.brito@windriver.com>
Change-Id: Ib25ce72bbb7f5aabf6f77bfa5737dc1d4f0f7a61
This commit is contained in:
Thiago Brito 2022-05-11 19:29:36 -03:00
parent a52305a17f
commit 2e9b48c693
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
centos_iso_image.inc
View File

@ -1,2 +1,2 @@
stx-snmp-helm
stx-snmp-helm-fluxcd
stx-snmp-helm-armada

26
stx-snmp-helm/centos/stx-snmp-helm.spec
View File

@ -11,7 +11,7 @@
%global helm_folder /usr/lib/helm
%global toolkit_version 0.1.0
Summary: StarlingX SNMP Armada Helm Charts
Summary: StarlingX SNMP FluxCD Helm Charts
Name: stx-snmp-helm
Version: 1.0
Release: %{tis_patch_ver}%{?_tis_dist}
@ -31,13 +31,13 @@ BuildRequires: python-k8sapp-snmp-wheels
%description
StarlingX SNMP Helm Charts
%package fluxcd
Summary: StarlingX SNMP FluxCD Helm Charts
%package armada
Summary: StarlingX SNMP Armada Helm Charts
Group: base
License: Apache-2.0
%description fluxcd
StarlingX SNMP FluxCD Helm Charts
%description armada
StarlingX SNMP Armada Helm Charts
%prep
%setup -n helm-charts-snmp-0-1-0-1.0.0
@ -52,8 +52,8 @@ cd -
# Create a chart tarball compliant with sysinv kube-app.py
%define app_staging %{_builddir}/staging
%define app_tarball %{app_name}-%{version}-%{tis_patch_ver}.tgz
%define app_tarball_fluxcd %{app_name}-fluxcd-%{version}-%{tis_patch_ver}.tgz
%define app_tarball_armada %{app_name}-armada-%{version}-%{tis_patch_ver}.tgz
%define app_tarball_fluxcd %{app_name}-%{version}-%{tis_patch_ver}.tgz
# Setup staging
mkdir -p %{app_staging}
@ -75,7 +75,7 @@ cp /plugins/%{app_name}/*.whl %{app_staging}/plugins
# calculate checksum of all files in app_staging
find . -type f ! -name '*.md5' -print0 | xargs -0 md5sum > checksum.md5
# package it up
tar -zcf %{_builddir}/%{app_tarball} -C %{app_staging}/ .
tar -zcf %{_builddir}/%{app_tarball_armada} -C %{app_staging}/ .
# switch back to source root
cd -
@ -99,13 +99,13 @@ rm -fr %{app_staging}
%install
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_armada} %{buildroot}/%{app_folder}
install -p -D -m 755 %{_builddir}/%{app_tarball_fluxcd} %{buildroot}/%{app_folder}
%files armada
%defattr(-,root,root,-)
%{app_folder}/%{app_tarball_armada}
%files
%defattr(-,root,root,-)
%{app_folder}/%{app_tarball}
%files fluxcd
%defattr(-,root,root,-)
%{app_folder}/%{app_tarball_fluxcd}