Skip to content

Commit b1f541c

Browse files
phracekphracek
committed
Fix php OpenShift 4 tests
Signed-off-by: Petr "Stone" Hracek <[email protected]>
1 parent 089018c commit b1f541c

5 files changed

+35
-21
lines changed

‎test/test_php_deploy_templates.py

+11-11
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,17 @@
3030
}
3131
TAG = TAGS.get(OS, None)
3232

33-
DEPLOYED_MYSQL_IMAGE = "quay.io/sclorg/mysql-80-c8s"
34-
IMAGE_SHORT = f"mysql:8.0-el8"
35-
IMAGE_TAG = f"8.0-el8"
33+
# DEPLOYED_MYSQL_IMAGE = "quay.io/sclorg/mysql-80-c9s"
34+
# IMAGE_SHORT = f"mysql:8.0-el9"
35+
# IMAGE_TAG = f"8.0-el9"
3636

3737

3838
class TestDeployTemplate:
3939

4040
def setup_method(self):
41-
self.oc_api = OpenShiftAPI(pod_name_prefix="php-testing", version=VERSION)
41+
self.oc_api = OpenShiftAPI(pod_name_prefix="php-testing", version=VERSION, shared_cluster=True)
4242
self.oc_api.import_is("imagestreams/php-rhel.json", "", skip_check=True)
43-
assert self.oc_api.upload_image(DEPLOYED_MYSQL_IMAGE, IMAGE_SHORT)
43+
#assert self.oc_api.upload_image(DEPLOYED_MYSQL_IMAGE, IMAGE_SHORT)
4444

4545
def teardown_method(self):
4646
self.oc_api.delete_project()
@@ -62,12 +62,12 @@ def test_php_template_inside_cluster(self, template):
6262
f"PHP_VERSION={VERSION}{TAG}",
6363
f"NAME={service_name}"
6464
]
65-
if template != "cakephp.json":
66-
openshift_args.extend([
67-
f"MYSQL_VERSION={IMAGE_TAG}",
68-
f"DATABASE_USER=testu",
69-
f"DATABASE_PASSWORD=testp"
70-
])
65+
# if template != "cakephp.json":
66+
# openshift_args.extend([
67+
# f"MYSQL_VERSION={IMAGE_TAG}",
68+
# f"DATABASE_USER=testu",
69+
# f"DATABASE_PASSWORD=testp"
70+
# ])
7171
assert self.oc_api.deploy_template_with_image(
7272
image_name=IMAGE_NAME,
7373
template=template_url,

‎test/test_php_s2i_imagestreams.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
class TestPHPImagestreams:
2121

2222
def setup_method(self):
23-
self.oc_api = OpenShiftAPI(pod_name_prefix="php", version=VERSION)
23+
self.oc_api = OpenShiftAPI(pod_name_prefix="php", version=VERSION, shared_cluster=True)
2424

2525
def teardown_method(self):
2626
self.oc_api.delete_project()

‎test/test_php_s2i_integration.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
class TestS2IPHPTemplate:
1919

2020
def setup_method(self):
21-
self.oc_api = OpenShiftAPI(pod_name_prefix="php-testing", version=VERSION)
21+
self.oc_api = OpenShiftAPI(pod_name_prefix="php-testing", version=VERSION, shared_cluster=True)
2222

2323
def teardown_method(self):
2424
self.oc_api.delete_project()

‎test/test_shared_helm_cakephp_application.py

+21-7
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class TestHelmCakePHPTemplate:
3838
def setup_method(self):
3939
package_name = "redhat-php-cakephp-application"
4040
path = test_dir
41-
self.hc_api = HelmChartsAPI(path=path, package_name=package_name, tarball_dir=test_dir)
41+
self.hc_api = HelmChartsAPI(path=path, package_name=package_name, tarball_dir=test_dir, shared_cluster=True)
4242
self.hc_api.clone_helm_chart_repo(
4343
repo_url="https://github.com/sclorg/helm-charts", repo_name="helm-charts",
4444
subdir="charts/redhat"
@@ -48,8 +48,13 @@ def teardown_method(self):
4848
self.hc_api.delete_project()
4949

5050
def test_curl_connection(self):
51-
if self.hc_api.oc_api.shared_cluster:
51+
branch_to_test = "4.X"
52+
check_msg = "Welcome to CakePHP"
53+
if self.hc_api.shared_cluster:
5254
pytest.skip("Do NOT test on shared cluster")
55+
if VERSION.startswith("8.2") or VERSION.startswith("8.3"):
56+
branch_to_test = "5.X"
57+
check_msg = "Welcome to CakePHP"
5358
self.hc_api.package_name = "redhat-php-imagestreams"
5459
assert self.hc_api.helm_package()
5560
assert self.hc_api.helm_installation()
@@ -58,16 +63,23 @@ def test_curl_connection(self):
5863
assert self.hc_api.helm_installation(
5964
values={
6065
"php_version": f"{VERSION}{TAG}",
61-
"namespace": self.hc_api.namespace
66+
"namespace": self.hc_api.namespace,
67+
"source_repository_ref": branch_to_test,
68+
"name": "cakephp-example"
6269
}
6370
)
6471
assert self.hc_api.is_s2i_pod_running(pod_name_prefix="cakephp-example", timeout=300)
65-
assert self.hc_api.test_helm_curl_output(
66-
route_name="cakephp-example",
67-
expected_str=check_msg
72+
assert self.hc_api.oc_api.check_response_inside_cluster(
73+
name_in_template="cakephp-example",
74+
expected_output=check_msg,
6875
)
6976

7077
def test_by_helm_test(self):
78+
branch_to_test = "4.X"
79+
check_msg = "Welcome to CakePHP"
80+
if VERSION.startswith("8.2") or VERSION.startswith("8.3"):
81+
branch_to_test = "5.X"
82+
check_msg = "Welcome to CakePHP"
7183
self.hc_api.package_name = "redhat-php-imagestreams"
7284
assert self.hc_api.helm_package()
7385
assert self.hc_api.helm_installation()
@@ -76,7 +88,9 @@ def test_by_helm_test(self):
7688
assert self.hc_api.helm_installation(
7789
values={
7890
"php_version": f"{VERSION}{TAG}",
79-
"namespace": self.hc_api.namespace
91+
"namespace": self.hc_api.namespace,
92+
"source_repository_ref": branch_to_test,
93+
"name": "cakephp-example"
8094
}
8195
)
8296
assert self.hc_api.is_s2i_pod_running(pod_name_prefix="cakephp-example", timeout=300)

‎test/test_shared_helm_chart_imagestreams.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class TestHelmRHELPHPImageStreams:
2020
def setup_method(self):
2121
package_name = "redhat-php-imagestreams"
2222
path = test_dir
23-
self.hc_api = HelmChartsAPI(path=path, package_name=package_name, tarball_dir=test_dir)
23+
self.hc_api = HelmChartsAPI(path=path, package_name=package_name, tarball_dir=test_dir, shared_cluster=True)
2424
self.hc_api.clone_helm_chart_repo(
2525
repo_url="https://github.com/sclorg/helm-charts", repo_name="helm-charts",
2626
subdir="charts/redhat"

0 commit comments

Comments
 (0)