From e4504dd0e18292cdf05501c8b45e7628e6db96ad Mon Sep 17 00:00:00 2001
From: Igor Soares <Igor.PiresSoares@windriver.com>
Date: Fri, 29 Dec 2023 12:44:26 -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: 49354

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

diff --git a/python3-k8sapp-vault/debian/deb_folder/control b/python3-k8sapp-vault/debian/deb_folder/control
index 33ee3c8..ef4caee 100644
--- a/python3-k8sapp-vault/debian/deb_folder/control
+++ b/python3-k8sapp-vault/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-vault/debian/deb_folder/rules b/python3-k8sapp-vault/debian/deb_folder/rules
index e3c856e..d9134f4 100755
--- a/python3-k8sapp-vault/debian/deb_folder/rules
+++ b/python3-k8sapp-vault/debian/deb_folder/rules
@@ -5,7 +5,7 @@ export APP_NAME = vault
 export PYBUILD_NAME = k8sapp-vault
 
 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-vault-helm/debian/deb_folder/control b/stx-vault-helm/debian/deb_folder/control
index b1c2790..ad5997a 100644
--- a/stx-vault-helm/debian/deb_folder/control
+++ b/stx-vault-helm/debian/deb_folder/control
@@ -8,7 +8,8 @@ Build-Depends: debhelper-compat (= 13),
  helm,
  procps,
  python3-k8sapp-vault,
- python3-k8sapp-vault-wheels
+ python3-k8sapp-vault-wheels,
+ build-info
 Standards-Version: 4.5.1
 Homepage: https://www.starlingx.io
 
diff --git a/stx-vault-helm/debian/deb_folder/rules b/stx-vault-helm/debian/deb_folder/rules
index 75d5868..b2ade1f 100755
--- a/stx-vault-helm/debian/deb_folder/rules
+++ b/stx-vault-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 APP_NAME = vault