From 56e1c575886eec835f3da514a777680208e66f85 Mon Sep 17 00:00:00 2001 From: Joao Fracarolli Date: Thu, 12 Dec 2024 14:10:30 -0300 Subject: [PATCH] Upversion python-cinderclient to v9.5.0-1 As part of the STX-Openstack upversion to CARACAL, the python- cinderclient is being upversioned to version 9.5.0-1 [1], which is the latest supported on CARACAL [2]. The commit hash of the used repo is: 3b2e2c028bd6b650dce64976f8b48409e2fa85b2 All patches were updated in order to make the package buildable in the new version. [1] https://salsa.debian.org/openstack-team/clients/python-cinderclient/-/tree/debian/9.5.0-1?ref_type=tags [2] https://releases.openstack.org/caracal/index.html#caracal-python-cinderclient Story: 2011303 Task: 51470 Test Plan: PASS: Build the python-cinderclient package PASS: Build the stx-openstackclients image PASS: Tested custom image in a running stx-openstack Change-Id: Ifec8b4714a7d45c1cf8dab332d1e76778b276db1 Signed-off-by: Joao Fracarolli --- .../debian/deb_patches/0001-Add-package-wheel.patch | 8 ++++---- .../python-cinderclient/debian/meta_data.yaml | 10 +++++----- ...location-parameter-for-volume-backup-creation.patch | 5 ++--- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/upstream/openstack/python-cinderclient/debian/deb_patches/0001-Add-package-wheel.patch b/upstream/openstack/python-cinderclient/debian/deb_patches/0001-Add-package-wheel.patch index e05021446..d53538a42 100644 --- a/upstream/openstack/python-cinderclient/debian/deb_patches/0001-Add-package-wheel.patch +++ b/upstream/openstack/python-cinderclient/debian/deb_patches/0001-Add-package-wheel.patch @@ -1,4 +1,4 @@ -From 64b639e6c81a11ecf8c52ae8f331f462cce009aa Mon Sep 17 00:00:00 2001 +From ec902592084577f04075359c811f012864f631cb Mon Sep 17 00:00:00 2001 From: Charles Short Date: Wed, 27 Oct 2021 17:28:06 +0000 Subject: [PATCH] Add package wheel @@ -11,10 +11,10 @@ Signed-off-by: Charles Short 1 file changed, 3 insertions(+) diff --git a/debian/rules b/debian/rules -index 8acee49..0d8778c 100755 +index a0eead7..9186ad3 100755 --- a/debian/rules +++ b/debian/rules -@@ -15,6 +15,9 @@ override_dh_auto_install: +@@ -17,6 +17,9 @@ override_dh_auto_install: for i in $(PYTHON3S) ; do \ python3 setup.py install -f --install-layout=deb --root=$(CURDIR)/debian/tmp ; \ done @@ -25,5 +25,5 @@ index 8acee49..0d8778c 100755 PYTHONPATH=$(CURDIR)/debian/tmp/usr/lib/python3/dist-packages pkgos-dh_auto_test --no-py2 endif -- -2.25.1 +2.34.1 diff --git a/upstream/openstack/python-cinderclient/debian/meta_data.yaml b/upstream/openstack/python-cinderclient/debian/meta_data.yaml index ae6d79d89..e00aa7b67 100644 --- a/upstream/openstack/python-cinderclient/debian/meta_data.yaml +++ b/upstream/openstack/python-cinderclient/debian/meta_data.yaml @@ -1,11 +1,11 @@ --- debname: python-cinderclient -debver: 1:9.3.0-1 +debver: 1:9.5.0-1 dl_path: - name: python-cinderclient-debian-9.3.0-1.tar.gz - url: https://salsa.debian.org/openstack-team/clients/python-cinderclient/-/archive/debian/9.3.0-1/python-cinderclient-debian-9.3.0-1.tar.gz - md5sum: 1f23aab079e908bbf8745da2d9adf137 - sha256: 962ba2fe525092fbe46bc33524f455c52627974de0023c939df3bb076b93dde2 + name: python-cinderclient-debian-9.5.0-1.tar.gz + url: https://salsa.debian.org/openstack-team/clients/python-cinderclient/-/archive/debian/9.5.0-1/python-cinderclient-debian-9.5.0-1.tar.gz + md5sum: 8e093a8b2c212b1e818cd6f81dc3af35 + sha256: 78a17256fab1475722fb9556879d27d03c7f75a25823024cbe7035932fae6c8c revision: dist: $STX_DIST GITREVCOUNT: diff --git a/upstream/openstack/python-cinderclient/debian/patches/0001-Add-location-parameter-for-volume-backup-creation.patch b/upstream/openstack/python-cinderclient/debian/patches/0001-Add-location-parameter-for-volume-backup-creation.patch index 88e51bb91..d88fd4739 100644 --- a/upstream/openstack/python-cinderclient/debian/patches/0001-Add-location-parameter-for-volume-backup-creation.patch +++ b/upstream/openstack/python-cinderclient/debian/patches/0001-Add-location-parameter-for-volume-backup-creation.patch @@ -1,5 +1,4 @@ - -From 80ca3caf55c34900ab1d555f57151a01764e9d32 Mon Sep 17 00:00:00 2001 +From 1bc2ecf87f45a0c2737cd05a5681a1f1b1e1f015 Mon Sep 17 00:00:00 2001 From: Luan Nunes Utimura Date: Mon, 6 Mar 2023 09:25:12 -0300 Subject: [PATCH] Add location parameter for volume backup creation @@ -192,5 +191,5 @@ index 61069c8..a72caa3 100644 body['backup']['metadata'] = metadata if availability_zone: -- -2.25.1 +2.34.1