From 19932a2c3aca3a2161bdbb17dc30ac6d2796a4aa Mon Sep 17 00:00:00 2001
From: Igor Soares <Igor.PiresSoares@windriver.com>
Date: Thu, 28 Dec 2023 19:26:32 -0300
Subject: [PATCH] Application versioning based on build release

This change will automatically adjust versioning of the application
tarball and python plugins to reflect the same version reported by
SW_VERION in /etc/build.info.

Test plan:
PASS: build-pkgs -a & build-image
PASS: Confirm that the tarball version matches the platform version
PASS: Apply application

Story: 2010929
Task: 49341

Change-Id: Ieae6267c6426540244aa597f8d2339c05e1ae8b5
Signed-off-by: Igor Soares <Igor.PiresSoares@windriver.com>
---
 python3-k8sapp-harbor/debian/deb_folder/control | 3 ++-
 python3-k8sapp-harbor/debian/deb_folder/rules   | 2 +-
 stx-harbor-helm/debian/deb_folder/control       | 1 +
 stx-harbor-helm/debian/deb_folder/rules         | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/python3-k8sapp-harbor/debian/deb_folder/control b/python3-k8sapp-harbor/debian/deb_folder/control
index c16c5b4..dffe44a 100644
--- a/python3-k8sapp-harbor/debian/deb_folder/control
+++ b/python3-k8sapp-harbor/debian/deb_folder/control
@@ -7,7 +7,8 @@ Build-Depends: debhelper-compat (= 13),
  python3-all,
  python3-pbr,
  python3-setuptools,
- python3-wheel
+ python3-wheel,
+ build-info
 Standards-Version: 4.5.1
 Homepage: https://www.starlingx.io
 
diff --git a/python3-k8sapp-harbor/debian/deb_folder/rules b/python3-k8sapp-harbor/debian/deb_folder/rules
index c1631ba..ab4b1b9 100644
--- a/python3-k8sapp-harbor/debian/deb_folder/rules
+++ b/python3-k8sapp-harbor/debian/deb_folder/rules
@@ -5,7 +5,7 @@ export APP_NAME = harbor
 export PYBUILD_NAME = k8sapp_harbor
 
 export DEB_VERSION = $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
-export MAJOR = $(shell echo $(DEB_VERSION) | cut -f 1 -d '-')
+export MAJOR = $(shell cat /etc/build.info | grep SW_VERSION | cut -d'"' -f2)
 export MINOR_PATCH = $(shell echo $(DEB_VERSION) | cut -f 4 -d '.')
 export PBR_VERSION = $(MAJOR).$(MINOR_PATCH)
 
diff --git a/stx-harbor-helm/debian/deb_folder/control b/stx-harbor-helm/debian/deb_folder/control
index 805e42a..ec53a1a 100644
--- a/stx-harbor-helm/debian/deb_folder/control
+++ b/stx-harbor-helm/debian/deb_folder/control
@@ -8,6 +8,7 @@ Build-Depends: debhelper-compat (= 13),
  procps,
  python3-k8sapp-harbor,
  python3-k8sapp-harbor-wheels,
+ build-info
 Standards-Version: 4.5.1
 Homepage: https://www.starlingx.io
 
diff --git a/stx-harbor-helm/debian/deb_folder/rules b/stx-harbor-helm/debian/deb_folder/rules
index 46407c0..e17ac4b 100755
--- a/stx-harbor-helm/debian/deb_folder/rules
+++ b/stx-harbor-helm/debian/deb_folder/rules
@@ -5,7 +5,7 @@ export ROOT = debian/tmp
 export APP_FOLDER = $(ROOT)/usr/local/share/applications/helm
 
 export DEB_VERSION = $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
-export RELEASE = $(shell echo $(DEB_VERSION) | cut -f 1 -d '-')
+export RELEASE = $(shell cat /etc/build.info | grep SW_VERSION | cut -d'"' -f2)
 export REVISION = $(shell echo $(DEB_VERSION) | cut -f 4 -d '.')
 
 export HARBOR_PKG="helm-charts-harbor-v1.12.0.tar.gz"