From 699fe821ee2adcaa7ffa1fa722e12561164577f8 Mon Sep 17 00:00:00 2001
From: Andrew Lavery <laverya@umich.edu>
Date: Fri, 17 Nov 2023 14:54:44 -0500
Subject: [PATCH] add 'is kots working' checks to postrelease kurl testing
 (#4139)

* add 'is kots working' checks to postrelease kurl testing

* update tests
---
 .../kotsadm/template/testgrid/k8s-docker.yaml | 64 ++++++++++++++++---
 1 file changed, 55 insertions(+), 9 deletions(-)

diff --git a/deploy/kurl/kotsadm/template/testgrid/k8s-docker.yaml b/deploy/kurl/kotsadm/template/testgrid/k8s-docker.yaml
index d2eb5c3b4c..4c6ad58a77 100644
--- a/deploy/kurl/kotsadm/template/testgrid/k8s-docker.yaml
+++ b/deploy/kurl/kotsadm/template/testgrid/k8s-docker.yaml
@@ -1,20 +1,26 @@
 - name: "minimal rook"
   installerSpec:
     kubernetes:
-      version: "1.26.x"
+      version: "1.28.x"
     containerd:
       version: "latest"
     flannel:
       version: "latest"
     rook:
-      version: 1.11.x
+      version: 1.12.x
     kotsadm:
       version: "__testver__"
       s3Override: "__testdist__"
+  postInstallScript: |
+    # source helper functions
+    source /opt/kurl-testgrid/testhelpers.sh
+    # deploy sample app
+    install_and_customize_kurl_integration_test_application
+
 - name: "minimal disableS3"
   installerSpec:
     kubernetes:
-      version: "1.26.x"
+      version: "1.28.x"
     containerd:
       version: "latest"
     flannel:
@@ -29,10 +35,16 @@
       version: "__testver__"
       s3Override: "__testdist__"
       disableS3: true
+  postInstallScript: |
+    # source helper functions
+    source /opt/kurl-testgrid/testhelpers.sh
+    # deploy sample app
+    install_and_customize_kurl_integration_test_application
+
 - name: "all optional addons openebs"
   installerSpec:
     kubernetes:
-      version: "1.26.x"
+      version: "1.28.x"
     containerd:
       version: "latest"
     flannel:
@@ -50,10 +62,16 @@
     kotsadm:
       version: "__testver__"
       s3Override: "__testdist__"
+  postInstallScript: |
+    # source helper functions
+    source /opt/kurl-testgrid/testhelpers.sh
+    # deploy sample app
+    install_and_customize_kurl_integration_test_application
+
 - name: "upgrade from 1.49"
   installerSpec:
     kubernetes:
-      version: "1.26.x"
+      version: "1.28.x"
     containerd:
       version: "latest"
     flannel:
@@ -72,7 +90,7 @@
       version: 1.49.0
   upgradeSpec:
     kubernetes:
-      version: "1.26.x"
+      version: "1.28.x"
     containerd:
       version: "latest"
     flannel:
@@ -90,6 +108,17 @@
     kotsadm:
       version: "__testver__"
       s3Override: "__testdist__"
+  postInstallScript: |
+    # source helper functions
+    source /opt/kurl-testgrid/testhelpers.sh
+    # deploy sample app
+    install_and_customize_kurl_integration_test_application
+  postUpgradeScript: |
+    # source helper functions
+    source /opt/kurl-testgrid/testhelpers.sh
+    # ensure we can redeploy sample app
+    check_and_customize_kurl_integration_test_application
+
 - name: "upgrade from 1.49 into disableS3"
   installerSpec:
     kubernetes:
@@ -125,25 +154,37 @@
       version: "__testver__"
       s3Override: "__testdist__"
       disableS3: true
+  postUpgradeScript: |
+    # source helper functions
+    source /opt/kurl-testgrid/testhelpers.sh
+    # ensure we can redeploy sample app
+    install_and_customize_kurl_integration_test_application
 - name: "minimal rook airgap"
   airgap: true
   installerSpec:
     kubernetes:
-      version: "1.26.x"
+      version: "1.28.x"
     containerd:
       version: "latest"
     flannel:
       version: "latest"
     rook:
-      version: 1.11.x
+      version: 1.12.x
+    registry:
+      version: "latest"
     kotsadm:
       version: "__testver__"
       s3Override: "__testdist__"
+  postInstallScript: |
+    # source helper functions
+    source /opt/kurl-testgrid/testhelpers.sh
+    # deploy sample app
+    install_and_customize_kurl_integration_test_application
 - name: "minimal disableS3 airgap"
   airgap: true
   installerSpec:
     kubernetes:
-      version: "1.26.x"
+      version: "1.28.x"
     containerd:
       version: "latest"
     flannel:
@@ -158,3 +199,8 @@
       version: "__testver__"
       s3Override: "__testdist__"
       disableS3: true
+  postInstallScript: |
+    # source helper functions
+    source /opt/kurl-testgrid/testhelpers.sh
+    # deploy sample app
+    install_and_customize_kurl_integration_test_application