From 411f242860b7d3933096dd194b4b5392d3e8490d Mon Sep 17 00:00:00 2001
From: Thiago Brito <thiago.brito@windriver.com>
Date: Wed, 11 May 2022 19:28:39 -0300
Subject: [PATCH] Use fluxcd app by default for portieris

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
---
 centos_iso_image.inc                           |  2 +-
 .../centos/stx-portieris-helm.spec             | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/centos_iso_image.inc b/centos_iso_image.inc
index 5acdb51..f103408 100644
--- a/centos_iso_image.inc
+++ b/centos_iso_image.inc
@@ -1,2 +1,2 @@
 stx-portieris-helm
-stx-portieris-helm-fluxcd
+stx-portieris-helm-armada
diff --git a/stx-portieris-helm/centos/stx-portieris-helm.spec b/stx-portieris-helm/centos/stx-portieris-helm.spec
index 5a4d566..325f154 100644
--- a/stx-portieris-helm/centos/stx-portieris-helm.spec
+++ b/stx-portieris-helm/centos/stx-portieris-helm.spec
@@ -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}