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 -c -p barbican PASS - build-pkgs -c -p keystone PASS - build-pkgs -c -p openstack-pkg-tools PASS - build-pkgs -c -p openstack-resource-agents PASS - build-pkgs -c -p python-aodhclient PASS - build-pkgs -c -p python-barbicanclient PASS - build-pkgs -c -p python-cinderclient PASS - build-pkgs -c -p python-glanceclient PASS - build-pkgs -c -p python-gnocchiclient PASS - build-pkgs -c -p python-heatclient PASS - build-pkgs -c -p horizon PASS - build-pkgs -c -p python-ironicclient PASS - build-pkgs -c -p python-keystoneclient PASS - build-pkgs -c -p python-neutronclient PASS - build-pkgs -c -p python-novaclient PASS - build-pkgs -c -p python-openstackclient PASS - build-pkgs -c -p python-openstacksdk PASS - build-pkgs -c -p python-osc-lib PASS - build-pkgs -c -p python-pankoclient PASS - build-pkgs -c -p python-wsme PASS - build-pkgs -c -p rabbitmq-server Story: 2010550 Task: 47489 Signed-off-by: Thales Elero Cervi <thaleselero.cervi@windriver.com> Change-Id: Ib09af4af71e636e082c5690fc8b24952544fd7e6
2023-02-23 13:02:45 -03:00 · 2023-02-23 13:02:45 -03:00 · 660c529bba
parent f4f87d58af
commit 660c529bba
22 changed files with 118 additions and 74 deletions
--- a/openstack/barbican/debian/meta_data.yaml
+++ b/openstack/barbican/debian/meta_data.yaml
@ -7,4 +7,6 @@ dl_path:
  md5sum: 44caa91c9df25e29f399a3bbdb22d375
 revision:
  dist: $STX_DIST
-  PKG_GITREVCOUNT: true
+  GITREVCOUNT:
+    BASE_SRCREV: e058817453d5e74b23daa1c3b59f4c534047105b
+    SRC_DIR: ${MY_REPO}/stx/upstream/openstack/barbican
--- a/openstack/keystone/debian/meta_data.yaml
+++ b/openstack/keystone/debian/meta_data.yaml
@ -2,9 +2,11 @@
 debname: keystone
 debver: 2:18.0.0-3
 dl_path:
-    name: keystone-debian-18.0.0-3.tar.gz
-    url: https://salsa.debian.org/openstack-team/services/keystone/-/archive/debian/18.0.0-3/keystone-debian-18.0.0-3.tar.gz
-    md5sum: fba7c47672b976cdcab5c33f49a5d2fd
+  name: keystone-debian-18.0.0-3.tar.gz
+  url: https://salsa.debian.org/openstack-team/services/keystone/-/archive/debian/18.0.0-3/keystone-debian-18.0.0-3.tar.gz
+  md5sum: fba7c47672b976cdcab5c33f49a5d2fd
 revision:
-    dist: $STX_DIST
-    PKG_GITREVCOUNT: true
+  dist: $STX_DIST
+  GITREVCOUNT:
+    BASE_SRCREV: e866623a4fe0cebc0d0f6a7b3384e5c412ed18d0
+    SRC_DIR: ${MY_REPO}/stx/upstream/openstack/keystone
--- a/openstack/openstack-pkg-tools/debian/meta_data.yaml
+++ b/openstack/openstack-pkg-tools/debian/meta_data.yaml
@ -7,4 +7,6 @@ dl_path:
  md5sum: 6c26ff316b869ca12e09e7f3e77c150e
 revision:
  dist: $STX_DIST
-  PKG_GITREVCOUNT: true
+  GITREVCOUNT:
+    BASE_SRCREV: 1940c35cce172a46821cc224afaa720db89bee98
+    SRC_DIR: ${MY_REPO}/stx/upstream/openstack/openstack-pkg-tools
--- a/openstack/openstack-ras/debian/meta_data.yaml
+++ b/openstack/openstack-ras/debian/meta_data.yaml
@ -6,4 +6,6 @@ dl_path:
  md5sum: 58b82fa1d64ea59bad345d01bafb71be
 revision:
  dist: $STX_DIST
-  PKG_GITREVCOUNT: true
+  GITREVCOUNT:
+    BASE_SRCREV: 0e4f52c207a69767a6f0f6fe1f1737ac024d4235
+    SRC_DIR: ${MY_REPO}/stx/upstream/openstack/openstack-ras
--- a/openstack/python-aodhclient/debian/meta_data.yaml
+++ b/openstack/python-aodhclient/debian/meta_data.yaml
@ -2,9 +2,11 @@
 debname: python-aodhclient
 debver: 2.1.1-1
 dl_path:
-    name: python-aodhclient-debian-2.1.1-1.tar.gz
-    url: https://salsa.debian.org/openstack-team/clients/python-aodhclient/-/archive/debian/2.1.1-1/python-aodhclient-debian-2.1.1-1.tar.gz
-    md5sum: 86ee75ba3dec6529b48c816c7ddd317e
+  name: python-aodhclient-debian-2.1.1-1.tar.gz
+  url: https://salsa.debian.org/openstack-team/clients/python-aodhclient/-/archive/debian/2.1.1-1/python-aodhclient-debian-2.1.1-1.tar.gz
+  md5sum: 86ee75ba3dec6529b48c816c7ddd317e
 revision:
-    dist: $STX_DIST
-    PKG_GITREVCOUNT: true
+  dist: $STX_DIST
+  GITREVCOUNT:
+    BASE_SRCREV: 6d7ca1d59ab9235d431afe7e19eab2a004c40365
+    SRC_DIR: ${MY_REPO}/stx/upstream/openstack/python-aodhclient
--- a/openstack/python-barbicanclient/debian/meta_data.yaml
+++ b/openstack/python-barbicanclient/debian/meta_data.yaml
@ -7,4 +7,6 @@ dl_path:
  md5sum: 80fe9db068b5ca8638f1ed63dbff7327
 revision:
  dist: $STX_DIST
-  PKG_GITREVCOUNT: true
+  GITREVCOUNT:
+    BASE_SRCREV: 155a78233f9c28eae9b452ef0a8fbcc855b8be73
+    SRC_DIR: ${MY_REPO}/stx/upstream/openstack/python-barbicanclient
--- a/openstack/python-cinderclient/debian/meta_data.yaml
+++ b/openstack/python-cinderclient/debian/meta_data.yaml
@ -2,9 +2,11 @@
 debname: python-cinderclient
 debver: 1:7.2.0-3
 dl_path:
-    name: python-cinderclient-debian-7.2.0-3.tar.gz
-    url: https://salsa.debian.org/openstack-team/clients/python-cinderclient/-/archive/debian/7.2.0-3/python-cinderclient-debian-7.2.0-3.tar.gz
-    md5sum: b2fae10096bc2cf30935afe409ed9b4c
+  name: python-cinderclient-debian-7.2.0-3.tar.gz
+  url: https://salsa.debian.org/openstack-team/clients/python-cinderclient/-/archive/debian/7.2.0-3/python-cinderclient-debian-7.2.0-3.tar.gz
+  md5sum: b2fae10096bc2cf30935afe409ed9b4c
 revision:
-    dist: $STX_DIST
-    PKG_GITREVCOUNT: true
+  dist: $STX_DIST
+  GITREVCOUNT:
+    BASE_SRCREV: 18ac7da113d98ac59af6e6577b3fbdffb8ade8a1
+    SRC_DIR: ${MY_REPO}/stx/upstream/openstack/python-cinderclient
--- a/openstack/python-glanceclient/debian/meta_data.yaml
+++ b/openstack/python-glanceclient/debian/meta_data.yaml
@ -2,9 +2,11 @@
 debname: python-glanceclient
 debver: 1:3.2.2-2
 dl_path:
-    name: python-glanceclient-debian-3.2.2-2.tar.gz
-    url: https://salsa.debian.org/openstack-team/clients/python-glanceclient/-/archive/debian/3.2.2-2/python-glanceclient-debian-3.2.2-2.tar.gz
-    md5sum: bc184e7b7d10732f1562fb7cab668711
+  name: python-glanceclient-debian-3.2.2-2.tar.gz
+  url: https://salsa.debian.org/openstack-team/clients/python-glanceclient/-/archive/debian/3.2.2-2/python-glanceclient-debian-3.2.2-2.tar.gz
+  md5sum: bc184e7b7d10732f1562fb7cab668711
 revision:
-    dist: $STX_DIST
-    PKG_GITREVCOUNT: true
+  dist: $STX_DIST
+  GITREVCOUNT:
+    BASE_SRCREV: 241a99f6816b6f1facbff67a9fb26f4a6a284c0d
+    SRC_DIR: ${MY_REPO}/stx/upstream/openstack/python-glanceclient
--- a/openstack/python-gnocchiclient/debian/meta_data.yaml
+++ b/openstack/python-gnocchiclient/debian/meta_data.yaml
@ -2,9 +2,11 @@
 debname: python-gnocchiclient
 debver: 7.0.6-1
 dl_path:
-    name: python-gnocchiclient-debian-7.0.6-1.tar.gz
-    url: https://salsa.debian.org/openstack-team/clients/python-gnocchiclient/-/archive/debian/7.0.6-1/python-gnocchiclient-debian-7.0.6-1.tar.gz
-    md5sum: 3ee6a1ee65fb1a4dbd86038257b33c04
+  name: python-gnocchiclient-debian-7.0.6-1.tar.gz
+  url: https://salsa.debian.org/openstack-team/clients/python-gnocchiclient/-/archive/debian/7.0.6-1/python-gnocchiclient-debian-7.0.6-1.tar.gz
+  md5sum: 3ee6a1ee65fb1a4dbd86038257b33c04
 revision:
-    dist: $STX_DIST
-    PKG_GITREVCOUNT: true
+  dist: $STX_DIST
+  GITREVCOUNT:
+    BASE_SRCREV: 7bda415fa4d29f60903a123c2b064a5fcbc9d44f
+    SRC_DIR: ${MY_REPO}/stx/upstream/openstack/python-gnocchiclient
--- a/openstack/python-heatclient/debian/meta_data.yaml
+++ b/openstack/python-heatclient/debian/meta_data.yaml
@ -2,9 +2,11 @@
 debname: python-heatclient
 debver: 2.2.1-2
 dl_path:
-    name: python-heatclient-debian-2.2.1-2.tar.gz
-    url: https://salsa.debian.org/openstack-team/clients/python-heatclient/-/archive/debian/2.2.1-2/python-heatclient-debian-2.2.1-2.tar.gz
-    md5sum: 56685ca6ab5c8b055410d8c871a8801d
+  name: python-heatclient-debian-2.2.1-2.tar.gz
+  url: https://salsa.debian.org/openstack-team/clients/python-heatclient/-/archive/debian/2.2.1-2/python-heatclient-debian-2.2.1-2.tar.gz
+  md5sum: 56685ca6ab5c8b055410d8c871a8801d
 revision:
-    dist: $STX_DIST
-    PKG_GITREVCOUNT: true
+  dist: $STX_DIST
+  GITREVCOUNT:
+    BASE_SRCREV: 7b0f5e9adece320b824a97864d4566287d430e9e
+    SRC_DIR: ${MY_REPO}/stx/upstream/openstack/python-heatclient
--- a/openstack/python-horizon/debian/meta_data.yaml
+++ b/openstack/python-horizon/debian/meta_data.yaml
@ -18,4 +18,6 @@ src_files:
  - centos/files/python-django-horizon-systemd.conf
 revision:
  dist: $STX_DIST
-  PKG_GITREVCOUNT: true
+  GITREVCOUNT:
+    BASE_SRCREV: 664f9f927b1410c3749455295cb6105fd6e1440b
+    SRC_DIR: ${MY_REPO}/stx/upstream/openstack/python-horizon
--- a/openstack/python-ironicclient/debian/meta_data.yaml
+++ b/openstack/python-ironicclient/debian/meta_data.yaml
@ -2,9 +2,11 @@
 debname: python-ironicclient
 debver: 4.4.0-1
 dl_path:
-    name: python-ironicclient-debian-4.4.0-1.tar.gz
-    url: https://salsa.debian.org/openstack-team/clients/python-ironicclient/-/archive/debian/4.4.0-1/python-ironicclient-debian-4.4.0-1.tar.gz
-    md5sum: aad755aa1e4e5942d6fc70b1370cda65
+  name: python-ironicclient-debian-4.4.0-1.tar.gz
+  url: https://salsa.debian.org/openstack-team/clients/python-ironicclient/-/archive/debian/4.4.0-1/python-ironicclient-debian-4.4.0-1.tar.gz
+  md5sum: aad755aa1e4e5942d6fc70b1370cda65
 revision:
-    dist: $STX_DIST
-    PKG_GITREVCOUNT: true
+  dist: $STX_DIST
+  GITREVCOUNT:
+    BASE_SRCREV: 0b413bf7bc9c143111d751f4b050c9f04d4fbf59
+    SRC_DIR: ${MY_REPO}/stx/upstream/openstack/python-ironicclient
--- a/openstack/python-keystoneclient/debian/meta_data.yaml
+++ b/openstack/python-keystoneclient/debian/meta_data.yaml
@ -2,9 +2,11 @@
 debname: python-keystoneclient
 debver: 1:4.1.1-2
 dl_path:
-    name: python-keystoneclient-debian-4.1.1-2.tar.gz
-    url: https://salsa.debian.org/openstack-team/clients/python-keystoneclient/-/archive/debian/4.1.1-2/python-keystoneclient-debian-4.1.1-2.tar.gz
-    md5sum: 856c51c82e694145279d06e36b8225f4
+  name: python-keystoneclient-debian-4.1.1-2.tar.gz
+  url: https://salsa.debian.org/openstack-team/clients/python-keystoneclient/-/archive/debian/4.1.1-2/python-keystoneclient-debian-4.1.1-2.tar.gz
+  md5sum: 856c51c82e694145279d06e36b8225f4
 revision:
-    dist: $STX_DIST
-    PKG_GITREVCOUNT: true
+  dist: $STX_DIST
+  GITREVCOUNT:
+    BASE_SRCREV: 1f7dd5553484f950b352c4a1112719474be681d6
+    SRC_DIR: ${MY_REPO}/stx/upstream/openstack/python-keystoneclient
--- a/openstack/python-neutronclient/debian/meta_data.yaml
+++ b/openstack/python-neutronclient/debian/meta_data.yaml
@ -2,9 +2,11 @@
 debname: python-neutronclient
 debver: 1:7.2.1-2
 dl_path:
-    name: python-neutronclient-debian-7.2.1-2.tar.gz
-    url: https://salsa.debian.org/openstack-team/clients/python-neutronclient/-/archive/debian/7.2.1-2/python-neutronclient-debian-7.2.1-2.tar.gz
-    md5sum: b48160cf9342e7123195d9748736cf99
+  name: python-neutronclient-debian-7.2.1-2.tar.gz
+  url: https://salsa.debian.org/openstack-team/clients/python-neutronclient/-/archive/debian/7.2.1-2/python-neutronclient-debian-7.2.1-2.tar.gz
+  md5sum: b48160cf9342e7123195d9748736cf99
 revision:
-    dist: $STX_DIST
-    PKG_GITREVCOUNT: true
+  dist: $STX_DIST
+  GITREVCOUNT:
+    BASE_SRCREV: 0881611bb106729f27ab4beb7b68b26fa7c658dc
+    SRC_DIR: ${MY_REPO}/stx/upstream/openstack/python-neutronclient
--- a/openstack/python-novaclient/debian/meta_data.yaml
+++ b/openstack/python-novaclient/debian/meta_data.yaml
@ -2,9 +2,11 @@
 debname: python-novaclient
 debver: 2:17.2.1-3
 dl_path:
-    name: python-novaclient-debian-17.2.1-3.tar.gz
-    url: https://salsa.debian.org/openstack-team/clients/python-novaclient/-/archive/debian/17.2.1-3/python-novaclient-debian-17.2.1-3.tar.gz
-    md5sum: 14a3b8f4856737f1d36242c4c17b5c5f
+  name: python-novaclient-debian-17.2.1-3.tar.gz
+  url: https://salsa.debian.org/openstack-team/clients/python-novaclient/-/archive/debian/17.2.1-3/python-novaclient-debian-17.2.1-3.tar.gz
+  md5sum: 14a3b8f4856737f1d36242c4c17b5c5f
 revision:
-    dist: $STX_DIST
-    PKG_GITREVCOUNT: true
+  dist: $STX_DIST
+  GITREVCOUNT:
+    BASE_SRCREV: a9863400da506e5d70b78f378865c7e169e685e1
+    SRC_DIR: ${MY_REPO}/stx/upstream/openstack/python-novaclient
--- a/openstack/python-openstackclient/debian/meta_data.yaml
+++ b/openstack/python-openstackclient/debian/meta_data.yaml
@ -2,9 +2,11 @@
 debname: python-openstackclient
 debver: 5.4.0-4
 dl_path:
-    name: python-openstackclient-debian-5.4.0-4.tar.gz
-    url: https://salsa.debian.org/openstack-team/clients/python-openstackclient/-/archive/debian/5.4.0-4/python-openstackclient-debian-5.4.0-4.tar.gz
-    md5sum: 499b5a71ab02769a5706832aa53276a7
+  name: python-openstackclient-debian-5.4.0-4.tar.gz
+  url: https://salsa.debian.org/openstack-team/clients/python-openstackclient/-/archive/debian/5.4.0-4/python-openstackclient-debian-5.4.0-4.tar.gz
+  md5sum: 499b5a71ab02769a5706832aa53276a7
 revision:
-    dist: $STX_DIST
-    PKG_GITREVCOUNT: true
+  dist: $STX_DIST
+  GITREVCOUNT:
+    BASE_SRCREV: ca8ba3e5b9e32d831b557d17c51207705f95e240
+    SRC_DIR: ${MY_REPO}/stx/upstream/openstack/python-openstackclient
--- a/openstack/python-openstacksdk/debian/meta_data.yaml
+++ b/openstack/python-openstacksdk/debian/meta_data.yaml
@ -2,9 +2,11 @@
 debver: 0.50.0-6
 debname: python-openstacksdk
 dl_path:
-    name: python-openstacksdk-debian-0.50.0-6.tar.gz
-    url: https://salsa.debian.org/openstack-team/libs/python-openstacksdk/-/archive/debian/0.50.0-6/python-openstacksdk-debian-0.50.0-6.tar.gz
-    md5sum: 66c50e3a9ab9b6d5174ed66dd889e4ed
+  name: python-openstacksdk-debian-0.50.0-6.tar.gz
+  url: https://salsa.debian.org/openstack-team/libs/python-openstacksdk/-/archive/debian/0.50.0-6/python-openstacksdk-debian-0.50.0-6.tar.gz
+  md5sum: 66c50e3a9ab9b6d5174ed66dd889e4ed
 revision:
-    dist: $STX_DIST
-    PKG_GITREVCOUNT: true
+  dist: $STX_DIST
+  GITREVCOUNT:
+    BASE_SRCREV: 69d1068e824e9efdbc8aa1c36e7ec5fc6bc194f2
+    SRC_DIR: ${MY_REPO}/stx/upstream/openstack/python-openstacksdk
--- a/openstack/python-osc-lib/debian/meta_data.yaml
+++ b/openstack/python-osc-lib/debian/meta_data.yaml
@ -7,4 +7,6 @@ dl_path:
  md5sum: b72d416dd21b369d89c1dc3f8de42705
 revision:
  dist: $STX_DIST
-  PKG_GITREVCOUNT: true
+  GITREVCOUNT:
+    BASE_SRCREV: 5d546e3ceedbd0f5df7f1434427ff2244b3cdf6d
+    SRC_DIR: ${MY_REPO}/stx/upstream/openstack/python-osc-lib
--- a/openstack/python-oslo-messaging/debian/meta_data.yaml
+++ b/openstack/python-oslo-messaging/debian/meta_data.yaml
@ -7,4 +7,6 @@ dl_path:
  md5sum: 7e2835c989b5d148288fc713d8c8735d
 revision:
  dist: $STX_DIST
-  PKG_GITREVCOUNT: true
+  GITREVCOUNT:
+    BASE_SRCREV: ed7ef5eb53e598fb9280cf10c4c5a46b5369606b
+    SRC_DIR: ${MY_REPO}/stx/upstream/openstack/python-oslo-messaging
--- a/openstack/python-pankoclient/debian/meta_data.yaml
+++ b/openstack/python-pankoclient/debian/meta_data.yaml
@ -2,9 +2,11 @@
 debname: python-pankoclient
 debver: 1.1.0-2
 dl_path:
-    name: python-pankoclient-debian-1.1.0-2.tar.gz
-    url: https://salsa.debian.org/openstack-team/clients/python-pankoclient/-/archive/debian/1.1.0-2/python-pankoclient-debian-1.1.0-2.tar.gz
-    md5sum: 4b623a6b3ad649b29e05fc83f6f03762
+  name: python-pankoclient-debian-1.1.0-2.tar.gz
+  url: https://salsa.debian.org/openstack-team/clients/python-pankoclient/-/archive/debian/1.1.0-2/python-pankoclient-debian-1.1.0-2.tar.gz
+  md5sum: 4b623a6b3ad649b29e05fc83f6f03762
 revision:
-    dist: $STX_DIST
-    PKG_GITREVCOUNT: true
+  dist: $STX_DIST
+  GITREVCOUNT:
+    BASE_SRCREV: ff835e2707e5317148a2f3733060c5f1024d59a6
+    SRC_DIR: ${MY_REPO}/stx/upstream/openstack/python-pankoclient
--- a/openstack/python-wsme/debian/meta_data.yaml
+++ b/openstack/python-wsme/debian/meta_data.yaml
@ -7,4 +7,6 @@ dl_path:
  md5sum: 3c859550514ccde770f371a02f8fdf22
 revision:
  dist: $STX_DIST
-  PKG_GITREVCOUNT: true
+  GITREVCOUNT:
+    BASE_SRCREV: dc537bbe4f66f859716285357374b35902e2df17
+    SRC_DIR: ${MY_REPO}/stx/upstream/openstack/python-wsme
--- a/openstack/rabbitmq-server/debian/meta_data.yaml
+++ b/openstack/rabbitmq-server/debian/meta_data.yaml
@ -7,4 +7,6 @@ dl_path:
  md5sum: 1c4dea34094984e01c7b87b63e83ba2f
 revision:
  dist: $STX_DIST
-  PKG_GITREVCOUNT: true
+  GITREVCOUNT:
+    BASE_SRCREV: b2e2f6cbd545e247e6ad15d5e0da7d3e14c1b8c2
+    SRC_DIR: ${MY_REPO}/stx/upstream/openstack/rabbitmq-server