From f908a43a36a0d8d0a394fe7c5dd03773cf9653c7 Mon Sep 17 00:00:00 2001
From: David Simansky <dsimansk@redhat.com>
Date: Fri, 19 Jan 2024 09:36:15 +0100
Subject: [PATCH] Refactor post install to standalone function

---
 test/e2e-common.sh                    | 22 +++++++++++++++-------
 test/upgrade/installation/git_head.go |  1 +
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/test/e2e-common.sh b/test/e2e-common.sh
index a2d67320467..081bcf179e9 100755
--- a/test/e2e-common.sh
+++ b/test/e2e-common.sh
@@ -149,12 +149,6 @@ function install_knative_eventing() {
       -f "${EVENTING_CORE_NAME}" || return 1
     UNINSTALL_LIST+=( "${EVENTING_CORE_NAME}" )
 
-    local EVENTING_POST_INSTALL_NAME=${TMP_DIR}/${EVENTING_POST_INSTALL_YAML##*/}
-    sed "s/namespace: ${KNATIVE_DEFAULT_NAMESPACE}/namespace: ${SYSTEM_NAMESPACE}/g" "${EVENTING_POST_INSTALL_YAML}" > "${EVENTING_POST_INSTALL_NAME=}"
-    kubectl create \
-          -f "${EVENTING_POST_INSTALL_NAME}" || return 1
-    UNINSTALL_LIST+=( "${EVENTING_POST_INSTALL_NAME}" )
-
     local EVENTING_TLS_REPLACES=${TMP_DIR}/${EVENTING_TLS_YAML##*/}
     sed "s/namespace: ${KNATIVE_DEFAULT_NAMESPACE}/namespace: ${SYSTEM_NAMESPACE}/g" "${EVENTING_TLS_YAML}" > "${EVENTING_TLS_REPLACES}"
     if [[ ! -z "${CLUSTER_SUFFIX:-}" ]]; then
@@ -227,7 +221,7 @@ function install_mt_broker() {
   if [[ -z "${EVENTING_MT_CHANNEL_BROKER_YAML:-}" ]]; then
     build_knative_from_source
   else
-    echo "use exist EVENTING_MT_CHANNEL_BROKER_YAML"
+    echo "use existing EVENTING_MT_CHANNEL_BROKER_YAML"
   fi
   local EVENTING_MT_CHANNEL_BROKER_NAME=${TMP_DIR}/${EVENTING_MT_CHANNEL_BROKER_YAML##*/}
   sed "s/namespace: ${KNATIVE_DEFAULT_NAMESPACE}/namespace: ${SYSTEM_NAMESPACE}/g" "${EVENTING_MT_CHANNEL_BROKER_YAML}" > "${EVENTING_MT_CHANNEL_BROKER_NAME}"
@@ -239,6 +233,20 @@ function install_mt_broker() {
   wait_until_pods_running "${SYSTEM_NAMESPACE}" || fail_test "Knative Eventing with MT Broker did not come up"
 }
 
+function install_post_install_job() {
+    # Var defined and populated by generate-yaml.sh
+    if [[ -z "${EVENTING_POST_INSTALL_YAML:-}" ]]; then
+        build_knative_from_source
+      else
+        echo "use existing EVENTING_POST_INSTALL_YAML"
+      fi
+    local EVENTING_POST_INSTALL_NAME=${TMP_DIR}/${EVENTING_POST_INSTALL_YAML##*/}
+    sed "s/namespace: ${KNATIVE_DEFAULT_NAMESPACE}/namespace: ${SYSTEM_NAMESPACE}/g" "${EVENTING_POST_INSTALL_YAML}" > "${EVENTING_POST_INSTALL_NAME=}"
+    kubectl create \
+      -f "${EVENTING_POST_INSTALL_NAME}" || return 1
+    UNINSTALL_LIST+=( "${EVENTING_POST_INSTALL_NAME}" )
+}
+
 function enable_sugar() {
   # Extra parameters for ko apply
   KO_FLAGS="${KO_FLAGS:-}"
diff --git a/test/upgrade/installation/git_head.go b/test/upgrade/installation/git_head.go
index f3378e0ff93..447c907ad3b 100644
--- a/test/upgrade/installation/git_head.go
+++ b/test/upgrade/installation/git_head.go
@@ -26,6 +26,7 @@ func GitHead() pkgupgrade.Operation {
 			"install_head",
 			"install_channel_crds",
 			"install_mt_broker",
+			"install_post_install_job",
 			"enable_sugar",
 		}
 		for _, shellfunc := range ops {