From b4f519afa7a37dcf09eb70850f36c8c987e72e20 Mon Sep 17 00:00:00 2001
From: Andrea Panattoni <apanatto@redhat.com>
Date: Tue, 10 Oct 2023 09:42:15 +0200
Subject: [PATCH] e2e: Allow testing custom cni and dp image

Let `run-e2e-conformance-virtual-ocp.sh` and
`run-e2e-conformance-virtual-cluster.sh` deploy clusters
with specific SRIOV CNI and Device Plugin images. This will
enable other projects to have full end-to-end test CI with
operator's suite.

Signed-off-by: Andrea Panattoni <apanatto@redhat.com>
---
 hack/run-e2e-conformance-common             | 10 ++++++++++
 hack/run-e2e-conformance-virtual-cluster.sh | 21 +++++++++++++++++++++
 hack/run-e2e-conformance-virtual-ocp.sh     | 20 ++++++++++++++++++++
 3 files changed, 51 insertions(+)
 create mode 100644 hack/run-e2e-conformance-common

diff --git a/hack/run-e2e-conformance-common b/hack/run-e2e-conformance-common
new file mode 100644
index 000000000..c2a71e518
--- /dev/null
+++ b/hack/run-e2e-conformance-common
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+podman_tag_and_push() {
+  local_image=$1
+  cluster_image=$2
+
+  echo "## Pushing ${local_image} to cluster registry ${cluster_image}"
+  podman tag ${local_image} ${cluster_image}
+  podman push --tls-verify=false ${cluster_image}
+}
diff --git a/hack/run-e2e-conformance-virtual-cluster.sh b/hack/run-e2e-conformance-virtual-cluster.sh
index 1dadef5f6..e746311b7 100755
--- a/hack/run-e2e-conformance-virtual-cluster.sh
+++ b/hack/run-e2e-conformance-virtual-cluster.sh
@@ -1,6 +1,8 @@
 #!/usr/bin/env bash
+
 set -xeo pipefail
 
+
 cluster_name=${CLUSTER_NAME:-virtual}
 domain_name=$cluster_name.lab
 
@@ -19,6 +21,8 @@ if [ "$NUM_OF_WORKERS" -lt 2 ]; then
     exit 1
 fi
 
+source $here/run-e2e-conformance-common
+
 check_requirements() {
   for cmd in kcli virsh virt-edit podman make go; do
     if ! command -v "$cmd" &> /dev/null; then
@@ -274,6 +278,23 @@ podman push --tls-verify=false "${SRIOV_NETWORK_OPERATOR_IMAGE}"
 podman push --tls-verify=false "${SRIOV_NETWORK_CONFIG_DAEMON_IMAGE}"
 podman push --tls-verify=false "${SRIOV_NETWORK_WEBHOOK_IMAGE}"
 
+
+if [[ -v LOCAL_SRIOV_CNI_IMAGE ]]; then
+  export SRIOV_CNI_IMAGE="$controller_ip:5000/sriov-cni:latest"
+  podman_tag_and_push ${LOCAL_SRIOV_CNI_IMAGE} ${SRIOV_CNI_IMAGE}
+fi
+
+if [[ -v LOCAL_SRIOV_DEVICE_PLUGIN_IMAGE ]]; then
+  export SRIOV_DEVICE_PLUGIN_IMAGE="$controller_ip:5000/sriov-network-device-plugin:latest"
+  podman_tag_and_push ${LOCAL_SRIOV_DEVICE_PLUGIN_IMAGE} ${SRIOV_DEVICE_PLUGIN_IMAGE}
+fi
+
+if [[ -v LOCAL_NETWORK_RESOURCES_INJECTOR_IMAGE ]]; then
+  export NETWORK_RESOURCES_INJECTOR_IMAGE="$controller_ip:5000/network-resources-injector:latest"
+  podman_tag_and_push ${LOCAL_NETWORK_RESOURCES_INJECTOR_IMAGE} ${NETWORK_RESOURCES_INJECTOR_IMAGE}
+fi
+
+
 # remove the crio bridge and let flannel to recreate
 kcli ssh $cluster_name-ctlplane-0 << EOF
 sudo su
diff --git a/hack/run-e2e-conformance-virtual-ocp.sh b/hack/run-e2e-conformance-virtual-ocp.sh
index 076a0aa05..13f7b5068 100755
--- a/hack/run-e2e-conformance-virtual-ocp.sh
+++ b/hack/run-e2e-conformance-virtual-ocp.sh
@@ -21,6 +21,8 @@ fi
 here="$(dirname "$(readlink --canonicalize "${BASH_SOURCE[0]}")")"
 root="$(readlink --canonicalize "$here/..")"
 
+source $here/run-e2e-conformance-common
+
 check_requirements() {
   for cmd in kcli virsh podman make go jq base64 tar; do
     if ! command -v "$cmd" &> /dev/null; then
@@ -218,6 +220,9 @@ podman push --tls-verify=false "${SRIOV_NETWORK_OPERATOR_IMAGE}"
 podman push --tls-verify=false "${SRIOV_NETWORK_CONFIG_DAEMON_IMAGE}"
 podman push --tls-verify=false "${SRIOV_NETWORK_WEBHOOK_IMAGE}"
 
+
+
+
 podman logout $registry
 
 echo "## apply CRDs"
@@ -241,6 +246,21 @@ export SRIOV_NETWORK_OPERATOR_IMAGE="image-registry.openshift-image-registry.svc
 export SRIOV_NETWORK_CONFIG_DAEMON_IMAGE="image-registry.openshift-image-registry.svc:5000/$NAMESPACE/sriov-network-config-daemon:latest"
 export SRIOV_NETWORK_WEBHOOK_IMAGE="image-registry.openshift-image-registry.svc:5000/$NAMESPACE/sriov-network-operator-webhook:latest"
 
+if [[ -v LOCAL_SRIOV_CNI_IMAGE ]]; then
+  podman_tag_and_push ${LOCAL_SRIOV_CNI_IMAGE} "$registry/$NAMESPACE/sriov-cni:latest"
+  export SRIOV_CNI_IMAGE="image-registry.openshift-image-registry.svc:5000/$NAMESPACE/sriov-cni:latest"
+fi
+
+if [[ -v LOCAL_SRIOV_DEVICE_PLUGIN_IMAGE ]]; then
+  podman_tag_and_push ${LOCAL_SRIOV_DEVICE_PLUGIN_IMAGE} "$registry/$NAMESPACE/sriov-network-device-plugin:latest"
+  export SRIOV_DEVICE_PLUGIN_IMAGE="image-registry.openshift-image-registry.svc:5000/$NAMESPACE/sriov-network-device-plugin:latest"
+fi
+
+if [[ -v LOCAL_NETWORK_RESOURCES_INJECTOR_IMAGE ]]; then
+  podman_tag_and_push ${LOCAL_NETWORK_RESOURCES_INJECTOR_IMAGE} "$registry/$NAMESPACE/network-resources-injector:latest"
+  export NETWORK_RESOURCES_INJECTOR_IMAGE="image-registry.openshift-image-registry.svc:5000/$NAMESPACE/network-resources-injector:latest"
+fi
+
 echo "## deploying SRIOV Network Operator"
 hack/deploy-setup.sh $NAMESPACE