Run only of asubset of the integration tests in OpenShift CI

Rationale: All of the integration tests are already covered in GitHb CI
(using Kubernetes), and they tend to be a bit flaky on OpenShift.

scripts/openshiftci-Nightly-SBO-tests.sh

@@ -28,7 +28,12 @@ oc login -u developer -p password@123 --insecure-skip-tls-verify
 oc whoami
 
 # Cluster related integration tests
-make test-integration-cluster
-make test-e2e
+make test-integration-openshift || error=true
+
+make test-e2e || error=true
+
+if [ $error ]; then
+    exit -1
+fi
 
 oc logout

scripts/openshiftci-periodic-tests.sh

@@ -27,7 +27,7 @@ oc login -u developer -p password@123 --insecure-skip-tls-verify
 oc whoami
 
 # Cluster related Integration tests
-make test-integration-cluster || error=true
+make test-integration-openshift || error=true
 
 # E2e tests
 make test-e2e || error=true
@@ -36,6 +36,4 @@ if [ $error ]; then
     exit -1
 fi
 
-
-
 oc logout

scripts/openshiftci-presubmit-all-tests.sh

@@ -36,32 +36,22 @@ 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
+# Integration tests
+make test-integration-openshift || error=true
 
-    # Fail the build if there is any error while test execution
-    if [ $error ]; then
-        exit -1
-    fi
+# E2e tests
+make test-e2e || error=true
+
+# Fail the build if there is any error while test execution
+if [ $error ]; then
+    exit -1
 fi
 
 if [ ! -z "$ARTIFACT_DIR" ]
 then
     #copy artifact to $ARTIFACT_DIR if ARTIFACT_DIR var is exposed
-    cp -r test-*.xml $ARTIFACT_DIR
+    cp -vr test-*.xml $ARTIFACT_DIR || true
 fi
+
 oc logout