starlingx/portieris-armada-app
Code Issues Proposed changes

Use fluxcd app by default for portieris

Browse Source 
This commit switches portieris 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/bmdUjzPBcSE32jx1Tfjr/

Story: 2009138
Task: 45348

Signed-off-by: Thiago Brito <thiago.brito@windriver.com>
Change-Id: If26df1a928c1fb047cf04098e5ee8384a924eb84
This commit is contained in:
Thiago Brito 2022-05-11 19:28:39 -03:00
parent 1195828b58
commit 411f242860
2 changed files with 10 additions and 10 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-portieris-helm
stx-portieris-helm-fluxcd
stx-portieris-helm-armada

18
stx-portieris-helm/centos/stx-portieris-helm.spec
View File

@ -8,7 +8,7 @@
%global helmchart_version 0.1.0
Summary: StarlingX Portieris Armada Helm Charts
Summary: StarlingX Portieris FluxCD Helm Charts
Name: stx-portieris-helm
Version: 1.0
Release: %{tis_patch_ver}%{?_tis_dist}
@ -34,13 +34,13 @@ BuildRequires: python-k8sapp-portieris-wheels
%description
StarlingX Portieris Armada Helm Charts
%package fluxcd
Summary: StarlingX Portieris Application FluxCD Helm Charts
%package armada
Summary: StarlingX Portieris Application Armada Helm Charts
Group: base
License: Apache-2.0
%description fluxcd
StarlingX Portieris Application FluxCD Helm Charts
%description armada
StarlingX Portieris Application Armada Helm Charts
%prep
%setup
@ -68,8 +68,8 @@ kill %1
# Create a chart tarball compliant with sysinv kube-app.py
%define app_staging %{_builddir}/staging
%define app_tarball_armada %{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}
@ -122,10 +122,10 @@ install -d -m 755 %{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
%files armada
%defattr(-,root,root,-)
%{app_folder}/%{app_tarball_armada}
%files fluxcd
%files
%defattr(-,root,root,-)
%{app_folder}/%{app_tarball_fluxcd}