From 5c6b186a4e6dcbdddd7e8f4c3b1541fb9fe837d8 Mon Sep 17 00:00:00 2001 From: Al Bailey Date: Wed, 1 Mar 2023 15:36:37 +0000 Subject: [PATCH] Update integ debian package ver based on git For components that contain additional contents, the Debian packaging has been changed to reflect all the git commits under the directory, and not just the commits to the metadata folder. This ensures that any new code submissions under those directories will increment the versions. Some components were defining PKG_GITREVCOUNT but were missing the boolean value of 'true'. Note: Empty value or 'True' value are treated the same as 'true' for PKG_GITREVCOUNT calculation, but have been updated for consistency with the rest of StarlingX. Updated debian packages for: - centos-debian-compat (1.0.stx.4 -> 1.0.stx.17) - kpatch (0.9.5-1.stx.7 -> 0.9.5-1.stx.8) - libfdt (1.4.4-1.stx.3 -> 1.4.4-1.stx.4) - puppet-module-puppetlabs-postgresql (8.0.0-1.stx.1 -> 8.0.0-1.stx.2) - python-nss (1.0.1-1.stx.1 -> 1.0.1-1.stx.2) Test Plan: PASS: downloader && build-pkgs -c -p centos-debian-compat PASS: downloader && build-pkgs -c -p libftd PASS: downloader && build-pkgs -c -p kpatch PASS: downloader && \ build-pkgs -c -p puppet-module-puppetlabs-postgresql PASS: downloader && build-pkgs -c -p python-nss This review also references tasks for components that were initially tasked to be updated, however have now been verified to 'NOT' require changes. Tasks: 47421..47446 This verification included in some cases adding files under debian sub directories and observing the increment. Verification command to build these is downloader && build-pkgs -c -p Components verified to not require meta_data changes: - dh-python (4.20201102+nmu1.stx.2) - dnsmasq (2.85-1.stx.2) - facter (3.14.12-1.stx.2) - haproxy (2.2.9-2+deb11u3.stx.1) Note: 'files' directory exists but is unused - isc-dhcp (4.4.1-2.3.stx.5) - lsb (11.1.0.stx.1) - lvm2 (2.03.11-2.stx.2) - nsenter (0.2.stx.1) - puppet (5.5.22-1.stx.5) - puppet-boolean (2.0.2-0.stx.2) - puppet-dnsmasq (1.1.0-0.stx.2) - puppet-lvm (1.4.0-1.stx.5) - puppet-module-nanliu-staging (1.0.4-2.stx.2) - puppet-module-oslo (17.4.0-2.stx.3) - puppet-module-puppetlabs-firewall (1.12.0-1.stx.1) - puppet-module-puppetlabs-haproxy (2.1.0-3.stx.2) - puppet-module-puppetlabs-mysql (8.1.0-5.stx.1) - puppet-module-puppetlabs-rabbitmq (8.5.0-6.stx.6) - puppet-module-puppetlabs-stdlib (5.0.0-1.stx.2) - puppet-puppi (2.2.11-0.stx.2) Note: puppet_downloader.sh exists but is unused - setuptools (52.0.0-4.stx.1) Story: 2010550 Task: 47424 Task: 47427 Task: 47436 Task: 47442 Task: 47446 Signed-off-by: Al Bailey Change-Id: I7c5402d232d39d2bda053542a3cb48719e98a0e0 --- base/libfdt/debian/meta_data.yaml | 2 +- centos-debian-compat/debian/meta_data.yaml | 2 ++ .../puppetlabs-postgresql-8.0.0/debian/meta_data.yaml | 2 +- livepatch/kpatch/debian/meta_data.yaml | 2 +- python/python-nss/debian/meta_data.yaml | 2 +- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/base/libfdt/debian/meta_data.yaml b/base/libfdt/debian/meta_data.yaml index 3c67b0d39..d6166fbc8 100644 --- a/base/libfdt/debian/meta_data.yaml +++ b/base/libfdt/debian/meta_data.yaml @@ -7,4 +7,4 @@ dl_path: sha256sum: 84169ccda61569b2b0f9832b066706e0b58767e0a30fa4194e816aba44e019d9 revision: dist: $STX_DIST - PKG_GITREVCOUNT: + PKG_GITREVCOUNT: true diff --git a/centos-debian-compat/debian/meta_data.yaml b/centos-debian-compat/debian/meta_data.yaml index cf5921def..526b0a2fd 100644 --- a/centos-debian-compat/debian/meta_data.yaml +++ b/centos-debian-compat/debian/meta_data.yaml @@ -5,3 +5,5 @@ src_path: source revision: dist: $STX_DIST PKG_GITREVCOUNT: true + SRC_GITREVCOUNT: + SRC_BASE_SRCREV: c31114534179991f77356d8abe7a8ca754258c15 diff --git a/config/puppet-modules/puppetlabs-postgresql-8.0.0/debian/meta_data.yaml b/config/puppet-modules/puppetlabs-postgresql-8.0.0/debian/meta_data.yaml index 7e08f1821..3783ad91a 100644 --- a/config/puppet-modules/puppetlabs-postgresql-8.0.0/debian/meta_data.yaml +++ b/config/puppet-modules/puppetlabs-postgresql-8.0.0/debian/meta_data.yaml @@ -8,4 +8,4 @@ dl_path: sha256sum: e0abbc0e39d12abff49d0f72e7765c3114276c5b2a430692fdc049d268789fd9 revision: dist: $STX_DIST - PKG_GITREVCOUNT: True + PKG_GITREVCOUNT: true diff --git a/livepatch/kpatch/debian/meta_data.yaml b/livepatch/kpatch/debian/meta_data.yaml index 849f30d2d..6d351deae 100644 --- a/livepatch/kpatch/debian/meta_data.yaml +++ b/livepatch/kpatch/debian/meta_data.yaml @@ -6,4 +6,4 @@ dl_path: md5sum: 0b0bf29ef3962ab2e1ac31b2b0e05181 revision: dist: $STX_DIST - PKG_GITREVCOUNT: True + PKG_GITREVCOUNT: true diff --git a/python/python-nss/debian/meta_data.yaml b/python/python-nss/debian/meta_data.yaml index 3537c1186..680d23bb4 100644 --- a/python/python-nss/debian/meta_data.yaml +++ b/python/python-nss/debian/meta_data.yaml @@ -7,4 +7,4 @@ dl_path: sha256sum: b95d3f57f51e51412ff8abd3cd0bb7c8fa70bdafe6ff4c61eaad26b065d3c5ae revision: dist: $STX_DIST - PKG_GITREVCOUNT: + PKG_GITREVCOUNT: true