From ff94bf649975eec80e7f18426d9daa13394ffdbc Mon Sep 17 00:00:00 2001 From: Saba Touheed Mujawar Date: Tue, 21 Feb 2023 07:22:08 -0500 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: Added a dummy commit to subdirectories of kubernetes-1.25.3 and crictl. Built respective packages and verified in builder.log, both packages were incremented. Pass: build-pkgs -p puppet-module-cristifalcas-etcd Pass: build-pkgs -p python-docker Pass: build-pkgs -p armada old version: 4 new version: 5 Pass: build-pkgs -p armada-helm-toolkit old version: 6 new version: 8 Pass: build-pkgs -p chartmuseum Pass: build-pkgs -p containerd old version: 10 new version: 14 Pass: build-pkgs -p crictl old version: 3 new version: 4 Pass: build-pkgs -p docker-registry Pass: build-pkgs -p etcd Pass: build-pkgs -p helm old version: 6 new version: 9 Pass: build-pkgs -p kubernetes-1.21.8 Pass: build-pkgs -p kubernetes-1.22.5 Pass: build-pkgs -p kubernetes-1.23.1 Pass: build-pkgs -p kubernetes-1.24.4 Pass: build-pkgs -p kubernetes-1.25.3 old version: 3 new version: 4 Pass: build-pkgs -p kubernetes-unversioned old version: 13 new version: 17 Pass: build-pkgs -p isolcpus-device-plugin old version: 4 new version: 5 Pass: build-pkgs -p kubectl-cert-manager Pass: build-pkgs -p runc Note: Added old and new version of the packages that have incremented after addition to meta_data.yaml. Story: 2010550 Task: 47459 Signed-off-by: Saba Touheed Mujawar Change-Id: I44571feb8534bb04a76e6d6cf1b6d42bab5670a5 --- .../puppet-modules/puppet-etcd-1.12.3/debian/meta_data.yaml | 4 +++- docker/python-docker/debian/meta_data.yaml | 4 +++- kubernetes/armada-helm-toolkit/debian/meta_data.yaml | 4 +++- kubernetes/armada/debian/meta_data.yaml | 4 +++- kubernetes/chartmuseum/debian/meta_data.yaml | 4 +++- kubernetes/containerd/debian/meta_data.yaml | 4 +++- kubernetes/crictl/debian/meta_data.yaml | 4 +++- kubernetes/docker-distribution/debian/meta_data.yaml | 4 +++- kubernetes/etcd/debian/meta_data.yaml | 4 +++- kubernetes/helm/debian/meta_data.yaml | 4 +++- kubernetes/kubernetes-1.21.8/debian/meta_data.yaml | 4 +++- kubernetes/kubernetes-1.22.5/debian/meta_data.yaml | 4 +++- kubernetes/kubernetes-1.23.1/debian/meta_data.yaml | 4 +++- kubernetes/kubernetes-1.24.4/debian/meta_data.yaml | 4 +++- kubernetes/kubernetes-1.25.3/debian/meta_data.yaml | 4 +++- kubernetes/kubernetes-unversioned/debian/meta_data.yaml | 4 +++- .../plugins/isolcpus-device-plugin/debian/meta_data.yaml | 2 ++ kubernetes/plugins/kubectl-cert-manager/debian/meta_data.yaml | 4 +++- kubernetes/runc/debian/meta_data.yaml | 4 +++- 19 files changed, 56 insertions(+), 18 deletions(-) diff --git a/config/puppet-modules/puppet-etcd-1.12.3/debian/meta_data.yaml b/config/puppet-modules/puppet-etcd-1.12.3/debian/meta_data.yaml index 3e7837c45..1fd240b78 100644 --- a/config/puppet-modules/puppet-etcd-1.12.3/debian/meta_data.yaml +++ b/config/puppet-modules/puppet-etcd-1.12.3/debian/meta_data.yaml @@ -8,4 +8,6 @@ dl_path: sha256sum: ce3d08c990c390b3927e9f62a8eb1beff4d49b60da7e997f3a886fc49cf3d911 revision: dist: $STX_DIST - PKG_GITREVCOUNT: true + GITREVCOUNT: + BASE_SRCREV: 7a094af9d56e05d5ef15bbc41978d376818b8150 + SRC_DIR: ${MY_REPO}/stx/integ/config/puppet-modules/puppet-etcd-1.12.3 diff --git a/docker/python-docker/debian/meta_data.yaml b/docker/python-docker/debian/meta_data.yaml index 91ccd08ed..76f20ff2b 100644 --- a/docker/python-docker/debian/meta_data.yaml +++ b/docker/python-docker/debian/meta_data.yaml @@ -7,4 +7,6 @@ dl_path: sha256sum: 339b7d5cbec3c053701940dd3f384bfc1c19a1ef7a2a528adb4b3a4fce7eb0dc revision: dist: $STX_DIST - PKG_GITREVCOUNT: true + GITREVCOUNT: + BASE_SRCREV: 999fcb6e5979b5d749b8cba7fb840616389ffa69 + SRC_DIR: ${MY_REPO}/stx/integ/docker/python-docker diff --git a/kubernetes/armada-helm-toolkit/debian/meta_data.yaml b/kubernetes/armada-helm-toolkit/debian/meta_data.yaml index 522febeee..4c33b62fe 100644 --- a/kubernetes/armada-helm-toolkit/debian/meta_data.yaml +++ b/kubernetes/armada-helm-toolkit/debian/meta_data.yaml @@ -8,4 +8,6 @@ dl_path: sha256sum: e3c9899489b17305dd324ad1fe78df4752eb0fe5c622abba31e67f50bdca378c revision: dist: $STX_DIST - PKG_GITREVCOUNT: true + GITREVCOUNT: + BASE_SRCREV: db16f48a952e3c5da8b2efea7acc723107b2c0a2 + SRC_DIR: ${MY_REPO}/stx/integ/kubernetes/armada-helm-toolkit diff --git a/kubernetes/armada/debian/meta_data.yaml b/kubernetes/armada/debian/meta_data.yaml index b9c513770..71c775c65 100644 --- a/kubernetes/armada/debian/meta_data.yaml +++ b/kubernetes/armada/debian/meta_data.yaml @@ -8,4 +8,6 @@ dl_path: sha256sum: 4f4db518837f7e89e3d65e024353f49ea341c530533cb986ff50d0781f39bee6 revision: dist: $STX_DIST - PKG_GITREVCOUNT: true + GITREVCOUNT: + BASE_SRCREV: db16f48a952e3c5da8b2efea7acc723107b2c0a2 + SRC_DIR: ${MY_REPO}/stx/integ/kubernetes/armada diff --git a/kubernetes/chartmuseum/debian/meta_data.yaml b/kubernetes/chartmuseum/debian/meta_data.yaml index 24e5f0b81..13e2209e0 100644 --- a/kubernetes/chartmuseum/debian/meta_data.yaml +++ b/kubernetes/chartmuseum/debian/meta_data.yaml @@ -14,4 +14,6 @@ dl_files: sha256sum: 53402edf5ac9f736cb6da8f270f6bbf356dcbbe5592d8a09ee6f91a2dc30e4f6 revision: dist: $STX_DIST - PKG_GITREVCOUNT: true + GITREVCOUNT: + BASE_SRCREV: f98b1a5b40c01f54e407d1aaa1a5945c6beeb6c5 + SRC_DIR: ${MY_REPO}/stx/integ/kubernetes/chartmuseum diff --git a/kubernetes/containerd/debian/meta_data.yaml b/kubernetes/containerd/debian/meta_data.yaml index c28a26bab..e8ea8fd3b 100644 --- a/kubernetes/containerd/debian/meta_data.yaml +++ b/kubernetes/containerd/debian/meta_data.yaml @@ -8,4 +8,6 @@ dl_path: sha256sum: 00199134fed422a3a8041d7a9f8dd782811e7792ee2e7c298351f026c04b99db revision: dist: $STX_DIST - PKG_GITREVCOUNT: true + GITREVCOUNT: + BASE_SRCREV: 5993c6715c645f39eb0258b62ec38a9e6eeb57bb + SRC_DIR: ${MY_REPO}/stx/integ/kubernetes/containerd diff --git a/kubernetes/crictl/debian/meta_data.yaml b/kubernetes/crictl/debian/meta_data.yaml index 1cd5fd04d..a61540681 100644 --- a/kubernetes/crictl/debian/meta_data.yaml +++ b/kubernetes/crictl/debian/meta_data.yaml @@ -8,4 +8,6 @@ dl_path: sha256sum: 85c78a35584971625bf1c3bcd46e5404a90396f979d7586f18b11119cb623e24 revision: dist: $STX_DIST - PKG_GITREVCOUNT: true + GITREVCOUNT: + BASE_SRCREV: f7309453d401f387f86ead7918bcba2aa7d81f68 + SRC_DIR: ${MY_REPO}/stx/integ/kubernetes/crictl diff --git a/kubernetes/docker-distribution/debian/meta_data.yaml b/kubernetes/docker-distribution/debian/meta_data.yaml index 6e2828f49..52107db2a 100644 --- a/kubernetes/docker-distribution/debian/meta_data.yaml +++ b/kubernetes/docker-distribution/debian/meta_data.yaml @@ -4,4 +4,6 @@ debver: 2.7.1+ds2-7 archive: https://snapshot.debian.org/archive/debian/20210529T084123Z/pool/main/d/docker-registry revision: dist: $STX_DIST - PKG_GITREVCOUNT: true + GITREVCOUNT: + BASE_SRCREV: b9d28e3c568a843f4707dd8ca58e388f7b7dea04 + SRC_DIR: ${MY_REPO}/stx/integ/kubernetes/docker-distribution diff --git a/kubernetes/etcd/debian/meta_data.yaml b/kubernetes/etcd/debian/meta_data.yaml index 9ec71f703..df9dcafd6 100644 --- a/kubernetes/etcd/debian/meta_data.yaml +++ b/kubernetes/etcd/debian/meta_data.yaml @@ -8,4 +8,6 @@ dl_path: sha256sum: c1303c274a3bb83fca94fa862454c7110ed131323d54e5614f401b62f3665e3f revision: dist: $STX_DIST - PKG_GITREVCOUNT: true + GITREVCOUNT: + BASE_SRCREV: 4493a3146c752e2d3cd11ea8fa964a9399dd8b52 + SRC_DIR: ${MY_REPO}/stx/integ/kubernetes/etcd diff --git a/kubernetes/helm/debian/meta_data.yaml b/kubernetes/helm/debian/meta_data.yaml index db18b9000..e94ef5934 100644 --- a/kubernetes/helm/debian/meta_data.yaml +++ b/kubernetes/helm/debian/meta_data.yaml @@ -21,4 +21,6 @@ dl_files: revision: dist: $STX_DIST - PKG_GITREVCOUNT: true + GITREVCOUNT: + BASE_SRCREV: f98b1a5b40c01f54e407d1aaa1a5945c6beeb6c5 + SRC_DIR: ${MY_REPO}/stx/integ/kubernetes/helm diff --git a/kubernetes/kubernetes-1.21.8/debian/meta_data.yaml b/kubernetes/kubernetes-1.21.8/debian/meta_data.yaml index 785c1830e..6f8686c39 100644 --- a/kubernetes/kubernetes-1.21.8/debian/meta_data.yaml +++ b/kubernetes/kubernetes-1.21.8/debian/meta_data.yaml @@ -6,4 +6,6 @@ dl_path: sha256sum: b585d37fb145de9b91cc934669e64ffd0743f40298a2de970509ac182c70a67a revision: dist: $STX_DIST - PKG_GITREVCOUNT: true + GITREVCOUNT: + BASE_SRCREV: 506d721e42b5263fddf30c628c868b0c854dd72a + SRC_DIR: ${MY_REPO}/stx/integ/kubernetes/kubernetes-1.21.8 diff --git a/kubernetes/kubernetes-1.22.5/debian/meta_data.yaml b/kubernetes/kubernetes-1.22.5/debian/meta_data.yaml index c30de0f9b..425481f89 100644 --- a/kubernetes/kubernetes-1.22.5/debian/meta_data.yaml +++ b/kubernetes/kubernetes-1.22.5/debian/meta_data.yaml @@ -6,4 +6,6 @@ dl_path: sha256sum: 9ea0605901282e280b500f22a10f5428ef9c874ad55ad6c2aa1eb7bd71686606 revision: dist: $STX_DIST - PKG_GITREVCOUNT: true + GITREVCOUNT: + BASE_SRCREV: a2e4e02ae4f1b7c3d51e3b2217f2274c012c0515 + SRC_DIR: ${MY_REPO}/stx/integ/kubernetes/kubernetes-1.22.5 diff --git a/kubernetes/kubernetes-1.23.1/debian/meta_data.yaml b/kubernetes/kubernetes-1.23.1/debian/meta_data.yaml index 9580c64fa..0ff83f6ea 100644 --- a/kubernetes/kubernetes-1.23.1/debian/meta_data.yaml +++ b/kubernetes/kubernetes-1.23.1/debian/meta_data.yaml @@ -6,4 +6,6 @@ dl_path: sha256sum: 9529d76a623f133fd609765b040382d593c97803220f5166451f0dbca5c807d5 revision: dist: $STX_DIST - PKG_GITREVCOUNT: true + GITREVCOUNT: + BASE_SRCREV: c47f0964d9c9d43cb7292c38fd2d10f655b643e6 + SRC_DIR: ${MY_REPO}/stx/integ/kubernetes/kubernetes-1.23.1 diff --git a/kubernetes/kubernetes-1.24.4/debian/meta_data.yaml b/kubernetes/kubernetes-1.24.4/debian/meta_data.yaml index 3c4696f9f..e79537a88 100644 --- a/kubernetes/kubernetes-1.24.4/debian/meta_data.yaml +++ b/kubernetes/kubernetes-1.24.4/debian/meta_data.yaml @@ -6,4 +6,6 @@ dl_path: sha256sum: 16e7112d8efa46c0a36976b001efe335eea4b9e1dd721824c9c2c064ae7f6bbe revision: dist: $STX_DIST - PKG_GITREVCOUNT: true + GITREVCOUNT: + BASE_SRCREV: 6d85d048d08bcc17bb37e9af154bfbb5115ab7f7 + SRC_DIR: ${MY_REPO}/stx/integ/kubernetes/kubernetes-1.24.4 diff --git a/kubernetes/kubernetes-1.25.3/debian/meta_data.yaml b/kubernetes/kubernetes-1.25.3/debian/meta_data.yaml index 36f6fd456..fed0a550a 100644 --- a/kubernetes/kubernetes-1.25.3/debian/meta_data.yaml +++ b/kubernetes/kubernetes-1.25.3/debian/meta_data.yaml @@ -6,4 +6,6 @@ dl_path: sha256sum: 957428759c846ed6a71453ce39b9bd7a91501209c222dcae5d73348b90d68ced revision: dist: $STX_DIST - PKG_GITREVCOUNT: true + GITREVCOUNT: + BASE_SRCREV: aacf601fd5983a950a1fe205cac2490b9cb0a5ad + SRC_DIR: ${MY_REPO}/stx/integ/kubernetes/kubernetes-1.25.3 diff --git a/kubernetes/kubernetes-unversioned/debian/meta_data.yaml b/kubernetes/kubernetes-unversioned/debian/meta_data.yaml index 065a729f6..5ae068bc9 100644 --- a/kubernetes/kubernetes-unversioned/debian/meta_data.yaml +++ b/kubernetes/kubernetes-unversioned/debian/meta_data.yaml @@ -7,4 +7,6 @@ dl_path: sha256sum: 97206b6c1ea8dc7cb6201f909c2d14fc68cf40faa4e2641cdefb8411e9403274 revision: dist: $STX_DIST - PKG_GITREVCOUNT: true + GITREVCOUNT: + BASE_SRCREV: e73a8b35d5c8942e7b60258bf48cefc6b41121ea + SRC_DIR: ${MY_REPO}/stx/integ/kubernetes/kubernetes-unversioned diff --git a/kubernetes/plugins/isolcpus-device-plugin/debian/meta_data.yaml b/kubernetes/plugins/isolcpus-device-plugin/debian/meta_data.yaml index 2192fad41..30fe336f4 100644 --- a/kubernetes/plugins/isolcpus-device-plugin/debian/meta_data.yaml +++ b/kubernetes/plugins/isolcpus-device-plugin/debian/meta_data.yaml @@ -5,3 +5,5 @@ src_path: files revision: dist: $STX_DIST PKG_GITREVCOUNT: true + SRC_GITREVCOUNT: + SRC_BASE_SRCREV: d37fe03fed76399ee07a81c52d56e89d825d66f4 diff --git a/kubernetes/plugins/kubectl-cert-manager/debian/meta_data.yaml b/kubernetes/plugins/kubectl-cert-manager/debian/meta_data.yaml index 02252fbff..d66447af5 100644 --- a/kubernetes/plugins/kubectl-cert-manager/debian/meta_data.yaml +++ b/kubernetes/plugins/kubectl-cert-manager/debian/meta_data.yaml @@ -10,4 +10,6 @@ dl_files: sha256sum: f5a2741db8f5f5db4ab7ad041561b4c541a1ae35923053deadb0afb0e8c16cef revision: dist: $STX_DIST - PKG_GITREVCOUNT: true + GITREVCOUNT: + BASE_SRCREV: fd88bc4684bebbdb5ed9593e6e05749ccb8109fc + SRC_DIR: ${MY_REPO}/stx/integ/kubernetes/plugins/kubectl-cert-manager diff --git a/kubernetes/runc/debian/meta_data.yaml b/kubernetes/runc/debian/meta_data.yaml index 564fcb270..5e80b3dc2 100644 --- a/kubernetes/runc/debian/meta_data.yaml +++ b/kubernetes/runc/debian/meta_data.yaml @@ -8,4 +8,6 @@ dl_path: sha256sum: 7d4d68f2e9f15881fd55de723ee507fbefc396a184ebbeda0cbc560983fd1689 revision: dist: $STX_DIST - PKG_GITREVCOUNT: true + GITREVCOUNT: + BASE_SRCREV: fe5768d72e8ad2f1d780cfaab11294998d5ed377 + SRC_DIR: ${MY_REPO}/stx/integ/kubernetes/runc