Revert "Run only E2E tests on OpenShift CI"

This reverts commit 133356ae44.

scripts/openshiftci-Nightly-SBO-tests.sh

@@ -27,6 +27,8 @@ oc login -u developer -p password@123 --insecure-skip-tls-verify
 # Check login user name for debugging purpose
 oc whoami
 
+# Cluster related integration tests
+make test-integration-cluster
 make test-e2e
 
 oc logout

scripts/openshiftci-periodic-tests.sh

@@ -26,6 +26,9 @@ oc login -u developer -p password@123 --insecure-skip-tls-verify
 # Check login user name for debugging purpose
 oc whoami
 
+# Cluster related Integration tests
+make test-integration-cluster || error=true
+
 # E2e tests
 make test-e2e || error=true
 
@@ -33,4 +36,6 @@ if [ $error ]; then
     exit -1
 fi
 
+
+
 oc logout

scripts/openshiftci-presubmit-all-tests.sh

@@ -37,12 +37,19 @@ oc whoami
 # We want to use a stable Devfile registry for InterOP testing, and so we use the custom Devfile Registry setup on IBM cloud
 source ./scripts/openshiftci-config.sh
 if [ "${ARCH}" == "s390x" ]; then
+    # Integration tests
+    make test-integration
     # E2e tests
     make test-e2e
 elif [ "${ARCH}" == "ppc64le" ]; then
+    # Integration tests
+    make test-integration
     # E2e tests
     make test-e2e
 else
+    # Integration tests
+    make test-integration || error=true
+
     # E2e tests
     make test-e2e || error=true