From 6917a3f5b2adde9feb2fd4facfd3d291307d89d6 Mon Sep 17 00:00:00 2001 From: Igor Soares Date: Fri, 29 Dec 2023 12:29:19 -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: 49351 Change-Id: I62934c3392b36101f99da6ca6be5e6d036b315bb Signed-off-by: Igor Soares --- python3-k8sapp-snmp/debian/deb_folder/control | 3 ++- python3-k8sapp-snmp/debian/deb_folder/rules | 2 +- stx-snmp-helm/debian/deb_folder/control | 3 ++- stx-snmp-helm/debian/deb_folder/rules | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/python3-k8sapp-snmp/debian/deb_folder/control b/python3-k8sapp-snmp/debian/deb_folder/control index 0c8ad82..32f17b0 100644 --- a/python3-k8sapp-snmp/debian/deb_folder/control +++ b/python3-k8sapp-snmp/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-snmp/debian/deb_folder/rules b/python3-k8sapp-snmp/debian/deb_folder/rules index 94f799e..9a30cca 100755 --- a/python3-k8sapp-snmp/debian/deb_folder/rules +++ b/python3-k8sapp-snmp/debian/deb_folder/rules @@ -5,7 +5,7 @@ export APP_NAME = snmp export PYBUILD_NAME = k8sapp-snmp 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-snmp-helm/debian/deb_folder/control b/stx-snmp-helm/debian/deb_folder/control index 3553d08..bd4f7c6 100644 --- a/stx-snmp-helm/debian/deb_folder/control +++ b/stx-snmp-helm/debian/deb_folder/control @@ -5,7 +5,8 @@ Maintainer: StarlingX Developers Build-Depends: debhelper-compat (= 13), helm, python3-k8sapp-snmp, - python3-k8sapp-snmp-wheels + python3-k8sapp-snmp-wheels, + build-info Standards-Version: 4.5.1 Homepage: https://www.starlingx.io diff --git a/stx-snmp-helm/debian/deb_folder/rules b/stx-snmp-helm/debian/deb_folder/rules index 155c94e..ff61084 100755 --- a/stx-snmp-helm/debian/deb_folder/rules +++ b/stx-snmp-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 = snmp