Skip to content

Commit 11646f3

Browse files
committed
Do not run tests on OpenShift 4 shared cluster. Imagestreams
are not yet defined Signed-off-by: Petr "Stone" Hracek <[email protected]>
1 parent d6f633e commit 11646f3

File tree

3 files changed

+10
-2
lines changed

3 files changed

+10
-2
lines changed

test/test_nginx_imagestream_s2i.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616

1717
TAGS = {
1818
"rhel8": "-ubi8",
19-
"rhel9": "-ubi9"
19+
"rhel9": "-ubi9",
20+
"rhel10": "-ubi10"
2021
}
2122
TAG = TAGS.get(OS, None)
2223

@@ -31,6 +32,8 @@ def teardown_method(self):
3132
self.oc_api.delete_project()
3233

3334
def test_inside_cluster(self):
35+
if OS == "rhel10":
36+
pytest.skip("Skipping test for rhel10")
3437
os_name = ''.join(i for i in OS if not i.isdigit())
3538
new_version = VERSION
3639
if "-minimal" in VERSION:

test/test_nginx_template_example_app.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ def teardown_method(self):
2828
self.oc_api.delete_project()
2929

3030
def test_python_template_inside_cluster(self):
31+
if OS == "rhel10":
32+
pytest.skip("Skipping test for rhel10")
3133
service_name = "nginx-testing"
3234
template_url = self.oc_api.get_raw_url_for_json(
3335
container="nginx-ex", dir="openshift/templates", filename="nginx.json", branch="master"

test/test_shared_helm_nginx_template.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@
2121

2222
TAGS = {
2323
"rhel8": "-ubi8",
24-
"rhel9": "-ubi9"
24+
"rhel9": "-ubi9",
25+
"rhel10": "-ubi10",
2526
}
2627
TAG = TAGS.get(OS, None)
2728

@@ -65,6 +66,8 @@ def test_curl_connection(self):
6566
)
6667

6768
def test_helm_connection(self):
69+
if OS == "rhel10":
70+
pytest.skip("Skipping test for rhel10")
6871
self.hc_api.package_name = "redhat-nginx-imagestreams"
6972
new_version = VERSION
7073
if "micro" in VERSION:

0 commit comments

Comments
 (0)