From bafd57c92d85a6c8b2c3fd3dbe30aa3a09f8f620 Mon Sep 17 00:00:00 2001 From: Matthew Watkins Date: Thu, 22 Feb 2024 12:31:33 +0000 Subject: [PATCH] Fix: Remove stale opensdk version pinning Issue: RELENG-5176 Change-Id: Id6dd1fdac68e3105f938a225c67ca0bed6813f89 Signed-off-by: Matthew Watkins --- .gitignore | 3 +++ releasenotes/notes/lftools-update-3a7aa65b76b0cfc0.yaml | 6 ++++++ shell/openstack-cleanup-old-images.sh | 3 --- shell/python-tools-install.sh | 1 - 4 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 releasenotes/notes/lftools-update-3a7aa65b76b0cfc0.yaml diff --git a/.gitignore b/.gitignore index 9e1c6fd1..aba32e31 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ +# Ignore nodejs dir created by linting tools +node_modules/ + # Ignore Vim temporary files .*.sw? diff --git a/releasenotes/notes/lftools-update-3a7aa65b76b0cfc0.yaml b/releasenotes/notes/lftools-update-3a7aa65b76b0cfc0.yaml new file mode 100644 index 00000000..03395c8b --- /dev/null +++ b/releasenotes/notes/lftools-update-3a7aa65b76b0cfc0.yaml @@ -0,0 +1,6 @@ +--- +fixes: + - | + Remove Openstack SDK version pinning from shell scripts. + This will now be handled by the other modules as a declared + dependency. The previous version pin was extremely old. diff --git a/shell/openstack-cleanup-old-images.sh b/shell/openstack-cleanup-old-images.sh index 79eee278..2ca39170 100644 --- a/shell/openstack-cleanup-old-images.sh +++ b/shell/openstack-cleanup-old-images.sh @@ -14,12 +14,9 @@ echo "---> Cleanup old images" # shellcheck disable=SC1090 source ~/lf-env.sh -# TODO: "openstacksdk<0.99" AttributeError: 'Image' object has no -# attribute 'protected' lf-activate-venv --python python3 "lftools[openstack]" \ kubernetes \ niet \ - "openstacksdk<0.99" \ python-heatclient \ python-openstackclient \ python-magnumclient \ diff --git a/shell/python-tools-install.sh b/shell/python-tools-install.sh index 2ca350de..a2c6da3e 100644 --- a/shell/python-tools-install.sh +++ b/shell/python-tools-install.sh @@ -43,7 +43,6 @@ if [[ ! -f /tmp/pre-build-complete ]]; then echo "Generating Requirements File" cat << 'EOF' > "$requirements_file" -openstacksdk<0.99 python-heatclient python-openstackclient python-magnumclient -- 2.16.6