Do not tests 22 / 22-minimal in OpenShift 4

Signed-off-by: Petr "Stone" Hracek <[email protected]>

Author: phracek

14-minimal/test/run-openshift

@@ -46,6 +46,11 @@ test -n "${VERSION-}" || false 'make sure $VERSION is defined'
 export CT_OCP4_TEST=true
 export CT_SKIP_UPLOAD_IMAGE=true
 
+# TODO VERSION 22 is not supported at all
+if [ "${VERSION}" == "22" ] || [ "${VERSION}" == "22-minimal" ]; then
+  exit 0
+fi
+
 TEST_SUMMARY=''
 TEST_SET=${TESTS:-$TEST_LIST} ct_run_tests_from_testset "openshift-remote-cluster"
 

16-minimal/test/run-openshift

@@ -39,6 +39,9 @@ def teardown_method(self):
         self.hc_api.delete_project()
 
     def test_curl_connection(self):
+        # TODO VERSION 22 is not supported at all
+        if VERSION.startswith("22"):
+            pass
         if self.hc_api.oc_api.shared_cluster:
             pytest.skip("Do NOT test on shared cluster")
         self.hc_api.package_name = "nodejs-imagestreams"
@@ -59,6 +62,9 @@ def test_curl_connection(self):
         )
 
     def test_by_helm_test(self):
+        # TODO VERSION 22 is not supported at all
+        if VERSION.startswith("22"):
+            pass
         self.hc_api.package_name = "nodejs-imagestreams"
         self.hc_api.helm_package()
         assert self.hc_api.helm_installation()

18-minimal/test/run-openshift

@@ -22,6 +22,10 @@ def setup_method(self):
         print(TEST_DIR.parent.parent)
 
     def test_latest_imagestream(self):
+        # TODO VERSION 22 is not supported at all
+        if VERSION.startswith("22"):
+            pass
+
         self.latest_version = self.isc.get_latest_version()
         assert self.latest_version != ""
         self.isc.check_imagestreams(self.latest_version)

22-minimal/test/run-openshift

@@ -42,6 +42,10 @@ def teardown_method(self):
         ]
     )
     def test_nodejs_ex_template_inside_cluster(self, template):
+        # TODO VERSION 22 is not supported at all
+        if VERSION.startswith("22"):
+            pass
+
         service_name = "nodejs-testing"
         template_url = self.oc_api.get_raw_url_for_json(
             container="nodejs-ex", dir="openshift/templates", filename=template, branch="master"