From 09e0a122e184cd5c93a06e4b0b3c847f497982ae Mon Sep 17 00:00:00 2001 From: "Petr \"Stone\" Hracek" Date: Fri, 19 Jul 2024 12:32:48 +0200 Subject: [PATCH] Use VERSION instead of SINGLE_VERSION like we do in whole org Signed-off-by: Petr "Stone" Hracek --- test/run-openshift-pytest | 2 +- test/test_mysql_imagestream.py | 4 ++-- test/test_mysql_imagestream_template.py | 4 ++-- test/test_mysql_latest_imagestreams.py | 2 +- test/test_mysql_template.py | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/test/run-openshift-pytest b/test/run-openshift-pytest index 0414661..5629bb5 100755 --- a/test/run-openshift-pytest +++ b/test/run-openshift-pytest @@ -10,4 +10,4 @@ THISDIR=$(dirname ${BASH_SOURCE[0]}) git show -s -cd "${THISDIR}" && python3 -m pytest -s -rxfapP --showlocals -vv test_mysql_*.py +cd "${THISDIR}" && python3.12 -m pytest -s -rA --showlocals -vv test_mysql_*.py diff --git a/test/test_mysql_imagestream.py b/test/test_mysql_imagestream.py index b77b740..d41d873 100644 --- a/test/test_mysql_imagestream.py +++ b/test/test_mysql_imagestream.py @@ -7,11 +7,11 @@ from container_ci_suite.utils import check_variables if not check_variables(): - print("At least one variable from IMAGE_NAME, OS, SINGLE_VERSION is missing.") + print("At least one variable from IMAGE_NAME, OS, VERSION is missing.") sys.exit(1) -VERSION = os.getenv("SINGLE_VERSION") +VERSION = os.getenv("VERSION") IMAGE_NAME = os.getenv("IMAGE_NAME") OS = os.getenv("TARGET") TAGS = { diff --git a/test/test_mysql_imagestream_template.py b/test/test_mysql_imagestream_template.py index c95d408..4cd3e5b 100644 --- a/test/test_mysql_imagestream_template.py +++ b/test/test_mysql_imagestream_template.py @@ -7,11 +7,11 @@ from container_ci_suite.utils import check_variables if not check_variables(): - print("At least one variable from IMAGE_NAME, OS, SINGLE_VERSION is missing.") + print("At least one variable from IMAGE_NAME, OS, VERSION is missing.") sys.exit(1) -VERSION = os.getenv("SINGLE_VERSION") +VERSION = os.getenv("VERSION") IMAGE_NAME = os.getenv("IMAGE_NAME") OS = os.getenv("TARGET") TAGS = { diff --git a/test/test_mysql_latest_imagestreams.py b/test/test_mysql_latest_imagestreams.py index 919c73c..b30c384 100644 --- a/test/test_mysql_latest_imagestreams.py +++ b/test/test_mysql_latest_imagestreams.py @@ -10,7 +10,7 @@ TEST_DIR = Path(os.path.abspath(os.path.dirname(__file__))) if not check_variables(): - print("At least one variable from IMAGE_NAME, OS, SINGLE_VERSION is missing.") + print("At least one variable from IMAGE_NAME, OS, VERSION is missing.") sys.exit(1) diff --git a/test/test_mysql_template.py b/test/test_mysql_template.py index 7a13ac9..30ee77b 100644 --- a/test/test_mysql_template.py +++ b/test/test_mysql_template.py @@ -7,11 +7,11 @@ from container_ci_suite.utils import check_variables if not check_variables(): - print("At least one variable from IMAGE_NAME, OS, SINGLE_VERSION is missing.") + print("At least one variable from IMAGE_NAME, OS, VERSION is missing.") sys.exit(1) -VERSION = os.getenv("SINGLE_VERSION") +VERSION = os.getenv("VERSION") IMAGE_NAME = os.getenv("IMAGE_NAME") OS = os.getenv("TARGET")