From fc0f9987bd9193139b08ad5da9b880f707aca82f Mon Sep 17 00:00:00 2001 From: Kyr Shatskyy Date: Mon, 1 Jul 2024 09:51:02 +0000 Subject: [PATCH 1/3] bootstrap: Tolerate a missing lsb_release Add missing keywords for openSUSE Leap and Tumbleweed Fixes: ce77b04aabe8e17e6bd70ad5812233b5772c50bc Signed-off-by: Kyr Shatskyy --- bootstrap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrap b/bootstrap index c9dd835ef..ecca5a23a 100755 --- a/bootstrap +++ b/bootstrap @@ -127,7 +127,7 @@ Linux) fi fi ;; - "openSUSE project"|"SUSE LINUX"|"openSUSE") + "openSUSE project"|"SUSE LINUX"|"openSUSE"|"openSUSELeap"|"openSUSETumbleweed") deps=(python3-pip python3-devel python3 libev-devel libvirt-devel libffi-devel) for package in ${deps[@]}; do if ! rpm -q --whatprovides $package; then From 81ed7cff769dbcdda8db980b8560e2ee1f387faf Mon Sep 17 00:00:00 2001 From: Kyr Shatskyy Date: Mon, 1 Jul 2024 10:52:59 +0000 Subject: [PATCH 2/3] bootstrap: use python3.12 now for SUSE based repo Signed-off-by: Kyr Shatskyy --- bootstrap | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bootstrap b/bootstrap index ecca5a23a..503643247 100755 --- a/bootstrap +++ b/bootstrap @@ -128,7 +128,8 @@ Linux) fi ;; "openSUSE project"|"SUSE LINUX"|"openSUSE"|"openSUSELeap"|"openSUSETumbleweed") - deps=(python3-pip python3-devel python3 libev-devel libvirt-devel libffi-devel) + PYTHON=python3.12 + deps=(python312-pip python312-devel python312 libev-devel libvirt-devel libffi-devel) for package in ${deps[@]}; do if ! rpm -q --whatprovides $package; then if [ "$(rpm -q --whatprovides $package)" == "no package provides $package" ]; then From 9fcf3c3d6b17f4e9f80a725d516acafb0563abcf Mon Sep 17 00:00:00 2001 From: Kyr Shatskyy Date: Mon, 1 Jul 2024 11:05:03 +0000 Subject: [PATCH 3/3] requirements.txt: pump lupa from 2.0 to 2.2 Fixes: https://tracker.ceph.com/issues/66768 Signed-off-by: Kyr Shatskyy --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 121de7c4e..e261028ad 100644 --- a/requirements.txt +++ b/requirements.txt @@ -83,7 +83,7 @@ jmespath==1.0.1 # via # boto3 # botocore -lupa==2.0 +lupa==2.2 # via teuthology (pyproject.toml) lxml==4.9.4 # via teuthology (pyproject.toml)