Fix BRANCH_TO_TEST. It is either 4.X or 5.X

Signed-off-by: Petr "Stone" Hracek <phracek@redhat.com>

Author: phracek

test/conftest.py

@@ -25,6 +25,10 @@
 VERSION = os.getenv("VERSION")
 OS = os.getenv("TARGET").lower()
 
+BRANCH_TO_TEST = "4.X"
+if VERSION == "8.2" or VERSION == "8.3":
+    BRANCH_TO_TEST = "5.X"
+
 VARS = Vars(
     OS=OS,
     TAG=TAGS.get(OS),
@@ -33,8 +37,8 @@
     IS_MINIMAL="minimal" in VERSION,
     SHORT_VERSION=VERSION.replace(".", ""),
     TEST_DIR=Path(__file__).parent.absolute(),
-    BRANCH_TO_TEST="master",
-    CHECK_MSG="Welcome to your CakePHP",
+    BRANCH_TO_TEST=BRANCH_TO_TEST,
+    CHECK_MSG="Welcome to CakePHP",
 )
 
 

test/test_container_basics.py

@@ -53,6 +53,6 @@ def test_dockerfiles(self, dockerfile):
         assert cip
         assert self.app.test_response(
             url=cip,
-            expected_output=VARS.CHECK_MSG,
+            expected_output="Welcome to your CakePHP application on OpenShift",
             debug=True
         )

test/test_ocp_php_deploy_templates.py

@@ -1,6 +1,6 @@
 from container_ci_suite.openshift import OpenShiftAPI
 
-from conftest import VARS
+from conftest import VARS, skip_clear_env_tests
 
 
 class TestDeployTemplate:
@@ -16,6 +16,7 @@ def test_php_template_inside_cluster(self):
         Test checks if local imagestreams and example application `cakephp-ex` works with properly
         and response is as expected
         """
+        skip_clear_env_tests()
         self.oc_api.import_is("imagestreams/php-rhel.json", "", skip_check=True)
         service_name = f"php-{VARS.SHORT_VERSION}-testing"
         template_url = self.oc_api.get_raw_url_for_json(
@@ -32,7 +33,7 @@ def test_php_template_inside_cluster(self):
             name_in_template="php",
             openshift_args=openshift_args
         )
-        assert self.oc_api.is_template_deployed(name_in_template=service_name)
+        assert self.oc_api.is_template_deployed(name_in_template=service_name, timeout=480)
         assert self.oc_api.check_response_inside_cluster(
             name_in_template=service_name, expected_output=VARS.CHECK_MSG
         )