starlingx/ptp-notification-armada-app
Code Issues Proposed changes

Use fluxcd app by default for ptp-notification

Browse Source 
This commit switches ptp-notification 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 [1] pod stuck at ContainerCreating due to ptp
     misconfiguration on StarlingX, unrelated to the app or FluxCD)
PASS Remove
PASS Delete

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

[1] On the 1st attempt to verify the resources created, we got the
ptp-ptp-notification pod stuck on ContainerCreating due to ptp
misconfiguration on StarlingX (unrelated to the app or FluxCD). After
troubleshooting the configuration, the pod got running OK and we used
the ptp-notification-demo-app to verify the protocol was acting as
expected.

2nd verification log: https://paste.opendev.org/show/bGDjZu6jrxw6lCdYQZNo/

Story: 2009138
Task: 45371

Signed-off-by: Thiago Brito <thiago.brito@windriver.com>
Change-Id: Ib4812f2def774a83c5838700006ee686b8d28198
This commit is contained in:
Thiago Brito
2022-05-13 15:25:11 -03:00
committed by Thiago Paiva Brito
parent 7a6f140705
commit a045e88335
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
centos_iso_image.inc
View File

@@ -1,2 +1,2 @@
stx-ptp-notification-helm
stx-ptp-notification-helm-fluxcd
stx-ptp-notification-helm-armada

18
stx-ptp-notification-helm/centos/stx-ptp-notification-helm.spec
View File

@@ -15,7 +15,7 @@
# Build variables
%global helm_folder /usr/lib/helm
Summary: StarlingX PTP Notification Armada Helm Charts
Summary: StarlingX PTP Notification FluxCD Helm Charts
Name: stx-ptp-notification-helm
Version: 1.0
Release: %{tis_patch_ver}%{?_tis_dist}
@@ -36,13 +36,13 @@ BuildRequires: python-k8sapp-ptp-notification-wheels
%description
StarlingX PTP Notification Helm Charts
%package fluxcd
Summary: StarlingX PTP Notification Application FluxCD Helm Charts
%package armada
Summary: StarlingX PTP Notification Application Armada Helm Charts
Group: base
License: Apache-2.0
%description fluxcd
StarlingX PTP Notification Application FluxCD Helm Charts
%description armada
StarlingX PTP Notification Application Armada Helm Charts
%prep
%setup -n %{name}-%{version}
@@ -63,8 +63,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
%define armada_app_path %{_builddir}/%{app_tarball_armada}
%define fluxcd_app_path %{_builddir}/%{app_tarball_fluxcd}
@@ -111,10 +111,10 @@ install -d -m 755 %{buildroot}/%{app_folder}
install -p -D -m 755 %armada_app_path %{buildroot}/%{app_folder}
install -p -D -m 755 %fluxcd_app_path %{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}