From 1163f000503dd425e9e5be953e9b23306a361481 Mon Sep 17 00:00:00 2001
From: Al Bailey <al.bailey@windriver.com>
Date: Wed, 22 Feb 2023 21:40:45 +0000
Subject: [PATCH] Update puppet debian package ver based on git

Update debian package versions to use git commits for:
 - puppet-dcdbsync  (1.0.0-1.stx.1 -> 1.0.0-1.stx.2)
 - puppet-dcmanager (1.0.0-1.stx.1 -> 1.0.0-1.stx.4)
 - puppet-dcorch    (1.0.0-1.stx.1 -> 1.0.0-1.stx.5)
 - puppet-fm        (1.0.0-1.stx.1 -> 1.0.0-1.stx.5)
 - puppet-manifests (1.0.0-1.stx.5 -> 1.0.0-1.stx.477)
 - puppet-mtce      (1.0.0-1.stx.1 -> 1.0.0-1.stx.2)
 - puppet-nfv       (1.0.0-1.stx.1 -> 1.0.0-1.stx.2)
 - puppet-patching  (1.0.0-1.stx.0 -> 1.0.0-1.stx.2)
 - puppet-smapi     (1.0.0-1.stx.1 -> 1.0.0-1.stx.2)
 - puppet-sshd      (1.0.0-1.stx.1 -> 1.0.0-1.stx.2)
 - puppet-sysinv    (1.0.0-1.stx.1 -> 1.0.0-1.stx.17)

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 puppet-dcdbsync
  PASS: build-pkgs -p puppet-dcmanager
  PASS: build-pkgs -p puppet-dcorch
  PASS: build-pkgs -p puppet-fm
  PASS: build-pkgs -p puppet-manifests
  PASS: build-pkgs -p puppet-mtce
  PASS: build-pkgs -p puppet-nfv
  PASS: build-pkgs -p puppet-patching
  PASS: build-pkgs -p puppet-smapi
  PASS: build-pkgs -p puppet-sshd
  PASS: build-pkgs -p puppet-sysinv

Story: 2010550
Task: 47411
Task: 47412
Task: 47413
Task: 47414
Task: 47415
Task: 47416
Task: 47417
Task: 47418
Task: 47419

Signed-off-by: Al Bailey <al.bailey@windriver.com>
Change-Id: Ie1606578e127cb39cc06506e11c5ba2d6a4c452c
---
 modules/puppet-dcdbsync/debian/meta_data.yaml  | 2 ++
 modules/puppet-dcmanager/debian/meta_data.yaml | 2 ++
 modules/puppet-dcorch/debian/meta_data.yaml    | 2 ++
 modules/puppet-fm/debian/meta_data.yaml        | 2 ++
 modules/puppet-mtce/debian/meta_data.yaml      | 2 ++
 modules/puppet-nfv/debian/meta_data.yaml       | 2 ++
 modules/puppet-patching/debian/meta_data.yaml  | 4 +++-
 modules/puppet-smapi/debian/meta_data.yaml     | 2 ++
 modules/puppet-sshd/debian/meta_data.yaml      | 2 ++
 modules/puppet-sysinv/debian/meta_data.yaml    | 2 ++
 puppet-manifests/debian/meta_data.yaml         | 2 ++
 11 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/modules/puppet-dcdbsync/debian/meta_data.yaml b/modules/puppet-dcdbsync/debian/meta_data.yaml
index 33609a741..e939227dc 100644
--- a/modules/puppet-dcdbsync/debian/meta_data.yaml
+++ b/modules/puppet-dcdbsync/debian/meta_data.yaml
@@ -5,3 +5,5 @@ src_path: src
 revision:
     dist: $STX_DIST
     PKG_GITREVCOUNT: true
+    SRC_GITREVCOUNT:
+        SRC_BASE_SRCREV: 727ad5d6d22a63924d97391697ef337a8ca3f2b2
diff --git a/modules/puppet-dcmanager/debian/meta_data.yaml b/modules/puppet-dcmanager/debian/meta_data.yaml
index 0d9b96467..5fcc9f021 100644
--- a/modules/puppet-dcmanager/debian/meta_data.yaml
+++ b/modules/puppet-dcmanager/debian/meta_data.yaml
@@ -5,3 +5,5 @@ src_path: src
 revision:
     dist: $STX_DIST
     PKG_GITREVCOUNT: true
+    SRC_GITREVCOUNT:
+        SRC_BASE_SRCREV: 727ad5d6d22a63924d97391697ef337a8ca3f2b2
diff --git a/modules/puppet-dcorch/debian/meta_data.yaml b/modules/puppet-dcorch/debian/meta_data.yaml
index be4bb5ffa..ea976b7eb 100644
--- a/modules/puppet-dcorch/debian/meta_data.yaml
+++ b/modules/puppet-dcorch/debian/meta_data.yaml
@@ -5,3 +5,5 @@ src_path: src
 revision:
     dist: $STX_DIST
     PKG_GITREVCOUNT: true
+    SRC_GITREVCOUNT:
+        SRC_BASE_SRCREV: 727ad5d6d22a63924d97391697ef337a8ca3f2b2
diff --git a/modules/puppet-fm/debian/meta_data.yaml b/modules/puppet-fm/debian/meta_data.yaml
index 9124fbac4..08921c4e8 100644
--- a/modules/puppet-fm/debian/meta_data.yaml
+++ b/modules/puppet-fm/debian/meta_data.yaml
@@ -5,3 +5,5 @@ src_path: src
 revision:
     dist: $STX_DIST
     PKG_GITREVCOUNT: true
+    SRC_GITREVCOUNT:
+        SRC_BASE_SRCREV: f997e46e15e5cac4fc7881d18204a765ae18c4a2
diff --git a/modules/puppet-mtce/debian/meta_data.yaml b/modules/puppet-mtce/debian/meta_data.yaml
index 430989795..1b58c77e5 100644
--- a/modules/puppet-mtce/debian/meta_data.yaml
+++ b/modules/puppet-mtce/debian/meta_data.yaml
@@ -5,3 +5,5 @@ src_path: src
 revision:
     dist: $STX_DIST
     PKG_GITREVCOUNT: true
+    SRC_GITREVCOUNT:
+        SRC_BASE_SRCREV: e35326d6920f82f873fcdfb5aaff7b14b1a5ab86
diff --git a/modules/puppet-nfv/debian/meta_data.yaml b/modules/puppet-nfv/debian/meta_data.yaml
index 70e0e096a..58bb1b606 100644
--- a/modules/puppet-nfv/debian/meta_data.yaml
+++ b/modules/puppet-nfv/debian/meta_data.yaml
@@ -5,3 +5,5 @@ src_path: src
 revision:
     dist: $STX_DIST
     PKG_GITREVCOUNT: true
+    SRC_GITREVCOUNT:
+        SRC_BASE_SRCREV: 7d217dfc108a7f62e68973a8cb782da3209d62d4
diff --git a/modules/puppet-patching/debian/meta_data.yaml b/modules/puppet-patching/debian/meta_data.yaml
index 1145501e5..e1733cfd5 100644
--- a/modules/puppet-patching/debian/meta_data.yaml
+++ b/modules/puppet-patching/debian/meta_data.yaml
@@ -4,4 +4,6 @@ debver: 1.0.0-1
 src_path: src
 revision:
     dist: $STX_DIST
-    PKG_GETREVCOUNT: true
+    PKG_GITREVCOUNT: true
+    SRC_GITREVCOUNT:
+        SRC_BASE_SRCREV: 595c007ac24c646547ff389c4f102b4647f05820
diff --git a/modules/puppet-smapi/debian/meta_data.yaml b/modules/puppet-smapi/debian/meta_data.yaml
index 5da2f2335..191a769c4 100644
--- a/modules/puppet-smapi/debian/meta_data.yaml
+++ b/modules/puppet-smapi/debian/meta_data.yaml
@@ -5,3 +5,5 @@ src_path: src
 revision:
     dist: $STX_DIST
     PKG_GITREVCOUNT: true
+    SRC_GITREVCOUNT:
+        SRC_BASE_SRCREV: 15f6ec02c32c41bdbffa021258bddeca73b2fef3
diff --git a/modules/puppet-sshd/debian/meta_data.yaml b/modules/puppet-sshd/debian/meta_data.yaml
index bec4b7c6e..f43e7f0ce 100644
--- a/modules/puppet-sshd/debian/meta_data.yaml
+++ b/modules/puppet-sshd/debian/meta_data.yaml
@@ -5,3 +5,5 @@ src_path: src
 revision:
     dist: $STX_DIST
     PKG_GITREVCOUNT: true
+    SRC_GITREVCOUNT:
+        SRC_BASE_SRCREV: 15f6ec02c32c41bdbffa021258bddeca73b2fef3
diff --git a/modules/puppet-sysinv/debian/meta_data.yaml b/modules/puppet-sysinv/debian/meta_data.yaml
index 4b9542db0..e516c8f6b 100644
--- a/modules/puppet-sysinv/debian/meta_data.yaml
+++ b/modules/puppet-sysinv/debian/meta_data.yaml
@@ -5,3 +5,5 @@ src_path: src
 revision:
     dist: $STX_DIST
     PKG_GITREVCOUNT: true
+    SRC_GITREVCOUNT:
+        SRC_BASE_SRCREV: 727ad5d6d22a63924d97391697ef337a8ca3f2b2
diff --git a/puppet-manifests/debian/meta_data.yaml b/puppet-manifests/debian/meta_data.yaml
index 98bd45797..9dd59b3d9 100644
--- a/puppet-manifests/debian/meta_data.yaml
+++ b/puppet-manifests/debian/meta_data.yaml
@@ -5,3 +5,5 @@ src_path: src
 revision:
     dist: $STX_DIST
     PKG_GITREVCOUNT: true
+    SRC_GITREVCOUNT:
+        SRC_BASE_SRCREV: 27a4a715af58c48bd8429634c56dc9c3386e2170