From c89f11529e1e53a6f3b2d7967974f469a2110841 Mon Sep 17 00:00:00 2001 From: Luis Sampaio Date: Thu, 9 Feb 2023 10:19:36 -0800 Subject: [PATCH] Update debian package versions to use git commits 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. Test Plan: PASS: build-pkgs -p config-gate PASS: build-pkgs -p controllerconfig PASS: build-pkgs -p storageconfig PASS: build-pkgs -p cert-alarm PASS: build-pkgs -p cert-mon PASS: build-pkgs -p cgts-client PASS: build-pkgs -p sysinv-agent PASS: build-pkgs -p sysinv PASS: build-pkgs -p tsconfig PASS: build-pkgs -p workerconfig Story: 2010550 Task: 47305 Signed-off-by: Luis Sampaio Change-Id: I50ac37d06740cc096711c136ad815dcdf54528bf --- config-gate/debian/meta_data.yaml | 2 ++ controllerconfig/debian/meta_data.yaml | 2 ++ storageconfig/debian/meta_data.yaml | 4 +++- sysinv/cert-alarm/debian/meta_data.yaml | 2 ++ sysinv/cert-mon/debian/meta_data.yaml | 2 ++ sysinv/cgts-client/debian/meta_data.yaml | 2 ++ sysinv/sysinv-agent/debian/meta_data.yaml | 4 +++- sysinv/sysinv/debian/meta_data.yaml | 2 ++ tsconfig/debian/meta_data.yaml | 2 ++ workerconfig/debian/meta_data.yaml | 2 ++ 10 files changed, 22 insertions(+), 2 deletions(-) diff --git a/config-gate/debian/meta_data.yaml b/config-gate/debian/meta_data.yaml index 2910a2e8d3..3f712559ee 100644 --- a/config-gate/debian/meta_data.yaml +++ b/config-gate/debian/meta_data.yaml @@ -5,3 +5,5 @@ src_path: files revision: dist: $STX_DIST PKG_GITREVCOUNT: true + SRC_GITREVCOUNT: + SRC_BASE_SRCREV: 4d2ba548dcd3916557a73760d58841be3ec6cabd diff --git a/controllerconfig/debian/meta_data.yaml b/controllerconfig/debian/meta_data.yaml index abce750ee9..1649b34e57 100644 --- a/controllerconfig/debian/meta_data.yaml +++ b/controllerconfig/debian/meta_data.yaml @@ -5,3 +5,5 @@ src_path: controllerconfig revision: dist: $STX_DIST PKG_GITREVCOUNT: true + SRC_GITREVCOUNT: + SRC_BASE_SRCREV: 10c4a075f6d21f0561fbe58c468650791db8fc2d diff --git a/storageconfig/debian/meta_data.yaml b/storageconfig/debian/meta_data.yaml index 74ddbceaa1..3f79df4e99 100644 --- a/storageconfig/debian/meta_data.yaml +++ b/storageconfig/debian/meta_data.yaml @@ -4,4 +4,6 @@ debname: storageconfig src_path: storageconfig revision: dist: $STX_DIST - PKG_GITREVCOUNT: + PKG_GITREVCOUNT: true + SRC_GITREVCOUNT: + SRC_BASE_SRCREV: 9b6349246864e367bff0941c30c5fa55e6a9dd34 diff --git a/sysinv/cert-alarm/debian/meta_data.yaml b/sysinv/cert-alarm/debian/meta_data.yaml index d13029583a..c13ec66e26 100644 --- a/sysinv/cert-alarm/debian/meta_data.yaml +++ b/sysinv/cert-alarm/debian/meta_data.yaml @@ -5,3 +5,5 @@ src_path: files revision: dist: $STX_DIST PKG_GITREVCOUNT: true + SRC_GITREVCOUNT: + SRC_BASE_SRCREV: ac8b4e94d799dc1831c7c8dde471a8e3d031898a diff --git a/sysinv/cert-mon/debian/meta_data.yaml b/sysinv/cert-mon/debian/meta_data.yaml index a94500241b..a8eec65211 100644 --- a/sysinv/cert-mon/debian/meta_data.yaml +++ b/sysinv/cert-mon/debian/meta_data.yaml @@ -5,3 +5,5 @@ src_path: files revision: dist: $STX_DIST PKG_GITREVCOUNT: true + SRC_GITREVCOUNT: + SRC_BASE_SRCREV: 63c249b9a154cbcc475368101788a19cd7f312d2 diff --git a/sysinv/cgts-client/debian/meta_data.yaml b/sysinv/cgts-client/debian/meta_data.yaml index 06cbecb927..2c0b02a2ab 100644 --- a/sysinv/cgts-client/debian/meta_data.yaml +++ b/sysinv/cgts-client/debian/meta_data.yaml @@ -5,3 +5,5 @@ src_path: cgts-client revision: dist: $STX_DIST PKG_GITREVCOUNT: true + SRC_GITREVCOUNT: + SRC_BASE_SRCREV: c06abcda5761d9fa4af23671b93b5fa59136d47a diff --git a/sysinv/sysinv-agent/debian/meta_data.yaml b/sysinv/sysinv-agent/debian/meta_data.yaml index 7f1fbb1bd4..09d3717d5e 100644 --- a/sysinv/sysinv-agent/debian/meta_data.yaml +++ b/sysinv/sysinv-agent/debian/meta_data.yaml @@ -9,4 +9,6 @@ src_files: - sysinv-agent.service revision: dist: $STX_DIST - PKG_GITREVCOUNT: true + GITREVCOUNT: + BASE_SRCREV: e9842965cc316b0ea12eb69b3b1cc68d0082c451 + SRC_DIR: ${MY_REPO}/stx/config/sysinv/sysinv-agent diff --git a/sysinv/sysinv/debian/meta_data.yaml b/sysinv/sysinv/debian/meta_data.yaml index e1b42ea189..3123a30327 100644 --- a/sysinv/sysinv/debian/meta_data.yaml +++ b/sysinv/sysinv/debian/meta_data.yaml @@ -5,3 +5,5 @@ src_path: sysinv revision: dist: $STX_DIST PKG_GITREVCOUNT: true + SRC_GITREVCOUNT: + SRC_BASE_SRCREV: f7a90a938191739490aa178d0432babaed1ae0f6 diff --git a/tsconfig/debian/meta_data.yaml b/tsconfig/debian/meta_data.yaml index 9785701d4f..02fe52deba 100644 --- a/tsconfig/debian/meta_data.yaml +++ b/tsconfig/debian/meta_data.yaml @@ -5,3 +5,5 @@ src_path: tsconfig revision: dist: $STX_DIST PKG_GITREVCOUNT: true + SRC_GITREVCOUNT: + SRC_BASE_SRCREV: 73eb89d8634e1d06ab1dbcf34621fcb1c8b0d344 diff --git a/workerconfig/debian/meta_data.yaml b/workerconfig/debian/meta_data.yaml index aad3fe995d..1bb01d4b73 100644 --- a/workerconfig/debian/meta_data.yaml +++ b/workerconfig/debian/meta_data.yaml @@ -5,3 +5,5 @@ src_path: workerconfig revision: dist: $STX_DIST PKG_GITREVCOUNT: true + SRC_GITREVCOUNT: + SRC_BASE_SRCREV: 2b9f8c28c7e3608b2a557909f4ccee529c90fe8a