From 8710903975dc60ed4cad8e231937ab31da953760 Mon Sep 17 00:00:00 2001 From: Tobias Urdin Date: Thu, 3 Oct 2024 11:44:07 +0200 Subject: [PATCH] Install setuptools --- images/Dockerfile.ci | 2 ++ run-upgrade-tests.sh | 2 ++ tox.ini | 3 +++ 3 files changed, 7 insertions(+) diff --git a/images/Dockerfile.ci b/images/Dockerfile.ci index 433821dc6..d93aa7532 100644 --- a/images/Dockerfile.ci +++ b/images/Dockerfile.ci @@ -2,6 +2,8 @@ FROM ubuntu:22.04 ENV GNOCCHI_WORKSPACE /github/workspace ENV DEBIAN_FRONTEND noninteractive +RUN echo test + #NOTE(tobias-urdin): need gnupg for apt-key RUN apt-get update -y && apt-get install -qy gnupg software-properties-common RUN add-apt-repository -y ppa:deadsnakes/ppa diff --git a/run-upgrade-tests.sh b/run-upgrade-tests.sh index c9b7456a8..249609187 100755 --- a/run-upgrade-tests.sh +++ b/run-upgrade-tests.sh @@ -1,6 +1,8 @@ #!/bin/bash set -e +export GNOCCHI_TEST_DEBUG=1 + if [ "$1" == "postgresql-file" ]; then eval $(pifpaf --env-prefix INDEXER run postgresql) elif [ "$1" == "mysql-ceph" ]; then diff --git a/tox.ini b/tox.ini index e4b66d270..5c61bf204 100644 --- a/tox.ini +++ b/tox.ini @@ -10,6 +10,7 @@ passenv = GNOCCHI_TEST_* AWS_* setenv = + GNOCCHI_TEST_DEBUG=1 GNOCCHI_TEST_STORAGE_DRIVER=file GNOCCHI_TEST_INDEXER_DRIVER=postgresql GNOCCHI_TEST_STORAGE_DRIVERS=file swift ceph s3 redis @@ -71,6 +72,7 @@ setenv = GNOCCHI_VERSION_FROM=stable/4.4 GNOCCHI_VARIANT=test,postgresql,file deps = + setuptools gnocchiclient>=2.8.0,!=7.0.7 pifpaf xattr!=0.9.4 @@ -85,6 +87,7 @@ setenv = GNOCCHI_VERSION_FROM=stable/4.4 GNOCCHI_VARIANT=test,mysql,ceph,ceph_recommended_lib deps = + setuptools gnocchiclient>=2.8.0,!=7.0.7 pifpaf[ceph] xattr!=0.9.4