Fix PyTest test suite to not use obsoleted names

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

Author: phracek

test/test_httpd_ex_template.py

@@ -17,7 +17,6 @@
 
 VERSION = os.getenv("VERSION")
 IMAGE_NAME = os.getenv("IMAGE_NAME")
-BRANCH_TO_TEST = BRANCH_TO_MASTER
 
 
 class TestHTTPDExExampleRepo:
@@ -32,7 +31,7 @@ def teardown_method(self):
     def test_httpd_ex_template_inside_cluster(self):
         assert self.oc_api.deploy_s2i_app(
             image_name=IMAGE_NAME,
-            app=f"https://github.com/sclorg/httpd-ex#{BRANCH_TO_TEST}",
+            app=f"https://github.com/sclorg/httpd-ex#{BRANCH_TO_MASTER}",
             context="."
         )
         assert self.oc_api.is_template_deployed(name_in_template=self.template_name)

test/test_httpd_imagestream_s2i.py

@@ -6,14 +6,11 @@
 from container_ci_suite.openshift import OpenShiftAPI
 from container_ci_suite.utils import get_service_image, check_variables
 
-from constants import BRANCH_TO_MASTER
-
 
 if not check_variables():
     print("At least one variable from IMAGE_NAME, OS, SINGLE_VERSION is missing.")
     sys.exit(1)
 
-BRANCH_TO_TEST = BRANCH_TO_MASTER
 IMAGE_NAME = os.getenv("IMAGE_NAME")
 OS = os.getenv("OS")
 VERSION = os.getenv("VERSION")

test/test_httpd_integration.py

@@ -6,16 +6,12 @@
 from container_ci_suite.openshift import OpenShiftAPI
 from container_ci_suite.utils import get_service_image, check_variables
 
-from constants import BRANCH_TO_MASTER
-
-
 if not check_variables():
     print("At least one variable from IMAGE_NAME, OS, VERSION is missing.")
     sys.exit(1)
 
 VERSION = os.getenv("VERSION")
 IMAGE_NAME = os.getenv("IMAGE_NAME")
-BRANCH_TO_TEST = BRANCH_TO_MASTER
 
 
 class TestHTTPDIntegrationTemplate:

test/test_httpd_shared_helm_template.py

@@ -12,7 +12,6 @@
 
 VERSION = os.getenv("VERSION")
 IMAGE_NAME = os.getenv("IMAGE_NAME")
-BRANCH_TO_TEST = BRANCH_TO_MASTER
 OS = os.getenv("OS")
 
 TAG = TAGS.get(OS)