Merge pull request #288 from phracek/ocp4_testing

phracek · web-flow · commit 7250606285b7 · 2021-03-31T11:04:06.000+02:00
OCP 4 testing
diff --git a/7.3/test/test-lib-remote-openshift.sh b/7.3/test/test-lib-remote-openshift.sh
@@ -0,0 +1 @@
+../../common/test-lib-remote-openshift.sh
diff --git a/7.4/test/test-lib-remote-openshift.sh b/7.4/test/test-lib-remote-openshift.sh
@@ -0,0 +1 @@
+../../common/test-lib-remote-openshift.sh
diff --git a/common b/common
@@ -1 +1 @@
-Subproject commit 93c2c51fbe77b247fc4d3ff0cf703bf22a8f2a66
+Subproject commit e3cc7ceb75d1351f5e1152e4016b1c0bbc77c823
diff --git a/test/run-openshift-remote-cluster b/test/run-openshift-remote-cluster
@@ -11,18 +11,22 @@
 THISDIR=$(dirname ${BASH_SOURCE[0]})
 
 source ${THISDIR}/test-lib-php.sh
+source ${THISDIR}/test-lib-openshift.sh
+source ${THISDIR}/test-lib-remote-openshift.sh
 
 set -eo nounset
 
 trap ct_os_cleanup EXIT SIGINT
 
 ct_os_check_compulsory_vars
 
+ct_os_set_ocp4
+
+oc version
+
 oc status || false "It looks like oc is not properly logged in."
 
-export CT_SKIP_NEW_PROJECT=true
-export CT_SKIP_UPLOAD_IMAGE=true
-export CT_NAMESPACE=openshift
+export CT_EXTERNAL_REGISTRY=true
 
 test_php_integration "${IMAGE_NAME}"
 
diff --git a/test/test-lib-remote-openshift.sh b/test/test-lib-remote-openshift.sh
@@ -0,0 +1 @@
+../common/test-lib-remote-openshift.sh

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+../../common/test-lib-remote-openshift.sh`