From 7287bd23c94ac7854329ebb63bb24abd856cd5ad Mon Sep 17 00:00:00 2001 From: Igor Soares Date: Fri, 29 Dec 2023 11:56:25 -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: 49346 Change-Id: Ib4c9657bf63f3c229b20c72d2afe1ffb8681f660 Signed-off-by: Igor Soares --- .../debian/deb_folder/control | 3 ++- python3-k8sapp-node-feature-discovery/debian/deb_folder/rules | 2 +- stx-node-feature-discovery-helm/debian/deb_folder/control | 3 ++- stx-node-feature-discovery-helm/debian/deb_folder/rules | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/python3-k8sapp-node-feature-discovery/debian/deb_folder/control b/python3-k8sapp-node-feature-discovery/debian/deb_folder/control index 5a924c3..3fdf94e 100644 --- a/python3-k8sapp-node-feature-discovery/debian/deb_folder/control +++ b/python3-k8sapp-node-feature-discovery/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-node-feature-discovery/debian/deb_folder/rules b/python3-k8sapp-node-feature-discovery/debian/deb_folder/rules index 9080d7a..d8b74bc 100755 --- a/python3-k8sapp-node-feature-discovery/debian/deb_folder/rules +++ b/python3-k8sapp-node-feature-discovery/debian/deb_folder/rules @@ -5,7 +5,7 @@ export APP_NAME = node-feature-discovery export PYBUILD_NAME = k8sapp-node-feature-discovery 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-node-feature-discovery-helm/debian/deb_folder/control b/stx-node-feature-discovery-helm/debian/deb_folder/control index 927f842..c4dfe0e 100644 --- a/stx-node-feature-discovery-helm/debian/deb_folder/control +++ b/stx-node-feature-discovery-helm/debian/deb_folder/control @@ -6,7 +6,8 @@ Build-Depends: debhelper-compat (= 13), helm, procps, python3-k8sapp-node-feature-discovery, - python3-k8sapp-node-feature-discovery-wheels + python3-k8sapp-node-feature-discovery-wheels, + build-info Standards-Version: 4.5.1 Homepage: https://www.starlingx.io diff --git a/stx-node-feature-discovery-helm/debian/deb_folder/rules b/stx-node-feature-discovery-helm/debian/deb_folder/rules index c5e3986..29a87f4 100755 --- a/stx-node-feature-discovery-helm/debian/deb_folder/rules +++ b/stx-node-feature-discovery-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 = node-feature-discovery