From 6b20bd77581f3688ed6530f37b72f30f96549ffa Mon Sep 17 00:00:00 2001 From: "Petr \"Stone\" Hracek" Date: Wed, 24 Jul 2024 12:25:56 +0200 Subject: [PATCH] Add support for shared cluster Signed-off-by: Petr "Stone" Hracek --- test/run-openshift-pytest | 2 +- test/run-openshift-remote-cluster | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/run-openshift-pytest b/test/run-openshift-pytest index 9171aa32..3074b5d5 100755 --- a/test/run-openshift-pytest +++ b/test/run-openshift-pytest @@ -8,4 +8,4 @@ THISDIR=$(dirname ${BASH_SOURCE[0]}) -cd "${THISDIR}" && python3.12 -m pytest -s -rA --showlocals -vv test_httpd_*.py +cd "${THISDIR}" && python3.12 -m pytest -s -rA --showlocals -vv test_httpd*.py diff --git a/test/run-openshift-remote-cluster b/test/run-openshift-remote-cluster index a805b9cb..631f9cd4 100755 --- a/test/run-openshift-remote-cluster +++ b/test/run-openshift-remote-cluster @@ -22,9 +22,6 @@ test_latest_imagestreams trap ct_os_cleanup EXIT SIGINT -# For testing on shared OpenShift 4 cluster we use this variable -export SHARED_CLUSTER=true - ct_os_set_ocp4 || exit $OC_ERR ct_os_check_compulsory_vars || exit $OC_ERR @@ -35,6 +32,9 @@ ct_os_tag_image_for_cvp "httpd" set -u +# For testing on OpenShift 4 we use internal registry +export CT_OCP4_TEST=true + TEST_SUMMARY='' TEST_SET=${TESTS:-$TEST_LIST} ct_run_tests_from_testset "openshift-remote-cluster"