From 6a8591bd76e3daac081d8cf5b131cd26565e1f44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20St=C3=A4bler?= <cstabler@redhat.com>
Date: Fri, 21 Jan 2022 14:12:55 +0100
Subject: [PATCH] UPSTREAM: <carry>: Add make target to run operator e2e tests
 against ocp
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Christoph Stäbler <cstabler@redhat.com>
---
 Makefile                                      |  9 +++++++--
 ...-e2e-tests.sh => ocp-e2e-tests-handler.sh} |  0
 hack/ocp-e2e-tests-operator.sh                | 19 +++++++++++++++++++
 3 files changed, 26 insertions(+), 2 deletions(-)
 rename hack/{ocp-e2e-tests.sh => ocp-e2e-tests-handler.sh} (100%)
 create mode 100755 hack/ocp-e2e-tests-operator.sh

diff --git a/Makefile b/Makefile
index 17715c931..f9294e5f3 100644
--- a/Makefile
+++ b/Makefile
@@ -169,8 +169,13 @@ test-e2e-operator: 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
diff --git a/hack/ocp-e2e-tests.sh b/hack/ocp-e2e-tests-handler.sh
similarity index 100%
rename from hack/ocp-e2e-tests.sh
rename to hack/ocp-e2e-tests-handler.sh
diff --git a/hack/ocp-e2e-tests-operator.sh b/hack/ocp-e2e-tests-operator.sh
new file mode 100755
index 000000000..ff82b4b38
--- /dev/null
+++ b/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