From eb92e8be5b4ba9bb489ad1369c3bc7b9276b0323 Mon Sep 17 00:00:00 2001 From: vrochalo Date: Mon, 30 Dec 2024 14:55:49 -0300 Subject: [PATCH] Upversion python-novaclient package As part of the STX-Openstack upversion to CARACAL, some of the python packages are being upversioned to latest version supported on CARACAL [1]: python-novaclient 18.3.0-2 -> 18.6.0-3 commit afec1f5cf00f7344603f6acf27c862b8201021be (tag: debian/18.6.0-3, origin/debian/caracal) The patch was updated in order to make the package buildable in the new version. Story: 2011303 Task: 51510 Test Plan: PASS: build stx-openstack packages (build-pkgs -c -l openstack) PASS: build stx-openstack wheels PASS: build and upload stx-openstackclients image to a DX system PASS: override stx-openstackclients and apply stx-openstack app PASS: check novaclient version installed in the clients container PASS: use the openstack CLI to launch a VM instance [1] https://releases.openstack.org/caracal/index.html#service-client-projects [2] https://review.opendev.org/c/starlingx/openstack-armada-app/+/934920 [3] https://review.opendev.org/c/starlingx/openstack-armada-app/+/937450 [4] https://review.opendev.org/c/starlingx/openstack-armada-app/+/936839 [5] https://review.opendev.org/c/starlingx/virt/+/932652 Depends-On: https://review.opendev.org/c/starlingx/tools/+/937736 Change-Id: If94e6400e537fdbe3edd1d25a156524f34b2fc44 Signed-off-by: vrochalo --- .../deb_patches/0001-Add-wheel-support.patch | 18 ++++++++++-------- .../python-novaclient/debian/meta_data.yaml | 10 +++++----- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/upstream/openstack/python-novaclient/debian/deb_patches/0001-Add-wheel-support.patch b/upstream/openstack/python-novaclient/debian/deb_patches/0001-Add-wheel-support.patch index bb33b4a7..e830b2c0 100644 --- a/upstream/openstack/python-novaclient/debian/deb_patches/0001-Add-wheel-support.patch +++ b/upstream/openstack/python-novaclient/debian/deb_patches/0001-Add-wheel-support.patch @@ -1,21 +1,23 @@ -From eeb0bba5f0f516a45ee58993b01bbec99082c9db Mon Sep 17 00:00:00 2001 +From 20cc3794d0ccd4bd1c696bed7f7ec2dcdfb09fe0 Mon Sep 17 00:00:00 2001 From: Charles Short Date: Tue, 26 Oct 2021 16:59:10 +0000 -Subject: [PATCH 1/1] Add wheel support +Subject: [PATCH] Add wheel support Add python3-novaclient-wheel package. Signed-off-by: Charles Short +[Fix merge conflicts from Antelope to Caracal] +Signed-off-by: vrochalo --- debian/control | 18 ++++++++++++++++++ debian/rules | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/debian/control b/debian/control -index a5f1de8d..c8a42a08 100644 +index 6e05d934..9c18db96 100644 --- a/debian/control +++ b/debian/control -@@ -92,3 +92,21 @@ Description: client library for OpenStack Compute API - 3.x +@@ -91,3 +91,21 @@ Description: client library for OpenStack Compute API - 3.x Compute (Nova) through the OpenStack Compute API. . This package provides the Python 3.x module. @@ -38,18 +40,18 @@ index a5f1de8d..c8a42a08 100644 + . + This package contains the Python3 Wheel. diff --git a/debian/rules b/debian/rules -index 67bcf5b9..76eb7f51 100755 +index 364e3527..842222bc 100755 --- a/debian/rules +++ b/debian/rules -@@ -12,7 +12,7 @@ override_dh_auto_build: +@@ -14,7 +14,7 @@ override_dh_auto_build: echo "Do nothing..." override_dh_auto_install: - pkgos-dh_auto_install --no-py2 + pkgos-dh_auto_install --no-py2 --wheel - install -D -m 0644 tools/nova.bash_completion $(CURDIR)/debian/python3-novaclient-doc/usr/share/bash-completion/completions/nova + install -D -m 0644 tools/nova.bash_completion $(CURDIR)/debian/python3-novaclient/usr/share/bash-completion/completions/nova rm -rf $(CURDIR)/debian/python-novaclient/usr/novaclient -- -2.25.1 +2.34.1 diff --git a/upstream/openstack/python-novaclient/debian/meta_data.yaml b/upstream/openstack/python-novaclient/debian/meta_data.yaml index 3373af04..269a0137 100644 --- a/upstream/openstack/python-novaclient/debian/meta_data.yaml +++ b/upstream/openstack/python-novaclient/debian/meta_data.yaml @@ -1,11 +1,11 @@ --- debname: python-novaclient -debver: 18.3.0-2 +debver: 18.6.0-3 dl_path: - name: python-novaclient-debian-18.3.0-2.tar.gz - url: https://salsa.debian.org/openstack-team/clients/python-novaclient/-/archive/debian/18.3.0-2/python-novaclient-debian-18.3.0-2.tar.gz - md5sum: dd87296a6d95a6bb5b9bd9d00de46cb8 - sha256sum: 7041145071a244b5e1450585ffa0594e2b8cc437e422f70dd90aaecb8ead4abc + name: python-novaclient-debian-18.6.0-3.tar.gz + url: https://salsa.debian.org/openstack-team/clients/python-novaclient/-/archive/debian/18.6.0-3/python-novaclient-debian-18.6.0-3.tar.gz + md5sum: 75b67344ba1a5404ed90737aead07d41 + sha256sum: e189f8a62b4dd677ffceeb44f40fce4b54e067ced32631b066cd397c9167a335 revision: dist: $STX_DIST GITREVCOUNT: