From a8526d225e0df687163581713d456325e44e23db Mon Sep 17 00:00:00 2001 From: Igor Soares Date: Thu, 28 Dec 2023 19:03:20 -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: AIO-SX install Apply application Story: 2010929 Task: 49340 Change-Id: Ic779fd12324eb73b5b57307f5f093b1e5ad13550 Signed-off-by: Igor Soares --- python3-k8sapp-auditd/debian/deb_folder/control | 3 ++- python3-k8sapp-auditd/debian/deb_folder/rules | 2 +- stx-audit-helm/debian/deb_folder/control | 3 ++- stx-audit-helm/debian/deb_folder/rules | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/python3-k8sapp-auditd/debian/deb_folder/control b/python3-k8sapp-auditd/debian/deb_folder/control index fb27976..f0f46f1 100644 --- a/python3-k8sapp-auditd/debian/deb_folder/control +++ b/python3-k8sapp-auditd/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-auditd/debian/deb_folder/rules b/python3-k8sapp-auditd/debian/deb_folder/rules index 6129fd7..d4f222b 100755 --- a/python3-k8sapp-auditd/debian/deb_folder/rules +++ b/python3-k8sapp-auditd/debian/deb_folder/rules @@ -5,7 +5,7 @@ export APP_NAME = auditd export PYBUILD_NAME = k8sapp-auditd 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-audit-helm/debian/deb_folder/control b/stx-audit-helm/debian/deb_folder/control index d577fe4..2991045 100644 --- a/stx-audit-helm/debian/deb_folder/control +++ b/stx-audit-helm/debian/deb_folder/control @@ -5,7 +5,8 @@ Maintainer: StarlingX Developers Build-Depends: debhelper-compat (= 13), helm, python3-k8sapp-auditd, - python3-k8sapp-auditd-wheels + python3-k8sapp-auditd-wheels, + build-info Standards-Version: 4.5.1 Homepage: https://www.starlingx.io diff --git a/stx-audit-helm/debian/deb_folder/rules b/stx-audit-helm/debian/deb_folder/rules index 3ac9c7c..54087a2 100755 --- a/stx-audit-helm/debian/deb_folder/rules +++ b/stx-audit-helm/debian/deb_folder/rules @@ -6,7 +6,7 @@ export APP_FOLDER = $(ROOT)/usr/local/share/applications/helm export LOGROTATE_FOLDER = $(ROOT)/etc/logrotate.d 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 = auditd