UPSTREAM: <carry>: Add make target to run operator e2e tests against ocp

Signed-off-by: Christoph Stäbler <cstabler@redhat.com>
(cherry picked from commit 6a8591b)
(cherry picked from commit ded6769)
(cherry picked from commit 5d1c799)
(cherry picked from commit 25ab920)

Makefile

@@ -184,8 +184,13 @@ test-e2e-upgrade: manifests
 
 test-e2e: test-e2e-operator test-e2e-handler
 
-test-e2e-ocp: 
-	./hack/ocp-e2e-tests.sh
+test-e2e-ocp: test-e2e-handler-ocp # deprecated. Use test-e2e-handler-ocp instead
+
+test-e2e-handler-ocp:
+	./hack/ocp-e2e-tests-handler.sh
+
+test-e2e-operator-ocp:
+	./hack/ocp-e2e-tests-operator.sh
 
 cluster-up:
 	./cluster/up.sh

hack/ocp-e2e-tests-operator.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+
+# Make sure to set the IMAGE_REPO env variable to your quay.io username
+# before running this script.
+
+# Additionally, the e2e tests rely on extra nics being configured on the
+# node. If running from dev-scripts, it will be necessary to configure it to
+# deploy the extra nics.
+# See https://github.com/openshift-metal3/dev-scripts/pull/1286 for an example.
+
+set -ex
+
+export KUBEVIRT_PROVIDER=external
+export IMAGE_BUILDER=podman
+export DEV_IMAGE_REGISTRY=quay.io
+export KUBEVIRTCI_RUNTIME=podman
+
+make cluster-sync-operator
+make test-e2e-operator