From cc4958ee17fb403ef0e4431564739f8dc8a1e3de Mon Sep 17 00:00:00 2001
From: Andrew Lavery <laverya@umich.edu>
Date: Mon, 25 Sep 2023 15:25:19 +0300
Subject: [PATCH] testing

---
 addons/containerd/1.6.24/install.sh           |   1 +
 .../template/testgrid/k8s-ctrd.yaml           | 453 +++++++++---------
 2 files changed, 228 insertions(+), 226 deletions(-)

diff --git a/addons/containerd/1.6.24/install.sh b/addons/containerd/1.6.24/install.sh
index 638aa6098f..71db0b0597 100644
--- a/addons/containerd/1.6.24/install.sh
+++ b/addons/containerd/1.6.24/install.sh
@@ -293,6 +293,7 @@ function containerd_migrate_from_docker() {
     systemctl daemon-reload
 
     echo "Migrated to containerd"
+    echo "------------------------------------- YES IT REALLY MIGRATED ------------------------------------------------"
     CONTAINERD_DID_MIGRATE_FROM_DOCKER=1
 }
 
diff --git a/addons/containerd/template/testgrid/k8s-ctrd.yaml b/addons/containerd/template/testgrid/k8s-ctrd.yaml
index d25c209ec5..150d05bf52 100644
--- a/addons/containerd/template/testgrid/k8s-ctrd.yaml
+++ b/addons/containerd/template/testgrid/k8s-ctrd.yaml
@@ -1,26 +1,27 @@
-- name: basic containerd and flannel, internal LB
-  installerSpec:
-    kubernetes:
-      version: "1.26.x"
-    flannel:
-      version: latest
-    containerd:
-      version: "__testver__"
-      s3Override: "__testdist__"
-    openebs:
-      version: latest
-      isLocalPVEnabled: true
-      localPVStorageClassName: default
-    minio:
-      version: latest
-    ekco:
-      version: latest
-      enableInternalLoadBalancer: true
-    kotsadm:
-      version: latest
+#- name: basic containerd and flannel, internal LB
+#  installerSpec:
+#    kubernetes:
+#      version: "1.26.x"
+#    flannel:
+#      version: latest
+#    containerd:
+#      version: "__testver__"
+#      s3Override: "__testdist__"
+#    openebs:
+#      version: latest
+#      isLocalPVEnabled: true
+#      localPVStorageClassName: default
+#    minio:
+#      version: latest
+#    ekco:
+#      version: latest
+#      enableInternalLoadBalancer: true
+#    kotsadm:
+#      version: latest
 
 - name: "Migrate from Docker to Containerd and Kubernetes from 1.23 to 1.25"
   flags: "yes"
+  numSecondaryNodes: 2
   installerSpec:
     kubernetes:
       version: 1.23.x
@@ -75,209 +76,209 @@
     validate_read_write_object_store postupgrade upgradefile.txt
   unsupportedOSIDs:
   - rocky-92 # docker is not supported on rhel 9 variants
-- name: "Migrate from Docker to Containerd and Kubernetes from 1.23 to 1.25 airgap"
-  flags: "yes"
-  installerSpec:
-    kubernetes:
-      version: 1.23.x
-    weave: # flannel has errors with dns and docker
-      version: latest
-    openebs:
-      version: latest
-      isLocalPVEnabled: true
-      localPVStorageClassName: default
-    minio:
-      version: latest
-    ekco:
-      version: latest
-    registry:
-      version: latest
-    kotsadm:
-      version: latest
-    docker:
-      version: latest
-  upgradeSpec:
-    kubernetes:
-      version: 1.25.x
-    weave: # flannel has errors with dns and docker
-      version: latest
-    openebs:
-      version: latest
-      isLocalPVEnabled: true
-      localPVStorageClassName: default
-    minio:
-      version: latest
-    ekco:
-      version: latest
-    registry:
-      version: latest
-    kotsadm:
-      version: latest
-    containerd:
-      version: "__testver__"
-      s3Override: "__testdist__"
-  airgap: true
-  preInstallScript: |
-    source /opt/kurl-testgrid/testhelpers.sh
-    mkdir -p /var/lib/kurl/assets
-    ( cd /var/lib/kurl/assets && curl -fLO "$(kubernetes_upgrade_bundle_url "$KURL_URL" "$KURL_UPGRADE_URL")" )
-  postInstallScript: |
-    source /opt/kurl-testgrid/testhelpers.sh
-    minio_object_store_info
-    validate_read_write_object_store rwtest testfile.txt
-    echo "Checking kubectl with kube/config"
-    echo "Kubeconfig was $KUBECONFIG"
-    unset KUBECONFIG
-    kubectl get namespaces
-  postUpgradeScript: |
-    source /opt/kurl-testgrid/testhelpers.sh
-    minio_object_store_info
-    validate_testfile rwtest testfile.txt
-    validate_read_write_object_store postupgrade upgradefile.txt
-  unsupportedOSIDs:
-  - rocky-92 # docker is not supported on rhel 9 variants
-
-- name: Upgrade Containerd from 1.4.x to __testver__
-  installerSpec:
-    kubernetes:
-      version: "1.25.x"
-    flannel:
-      version: latest
-    containerd:
-      version: "1.4.x"
-    openebs:
-      version: latest
-      isLocalPVEnabled: true
-      localPVStorageClassName: default
-    minio:
-      version: latest
-    ekco:
-      version: latest
-    kotsadm:
-      version: latest
-  upgradeSpec:
-    kubernetes:
-      version: "1.25.x"
-    flannel:
-      version: latest
-    containerd:
-      version: "__testver__"
-      s3Override: "__testdist__"
-    openebs:
-      version: latest
-      isLocalPVEnabled: true
-      localPVStorageClassName: default
-    minio:
-      version: latest
-    ekco:
-      version: latest
-    kotsadm:
-      version: latest
-  postInstallScript: |
-    source /opt/kurl-testgrid/testhelpers.sh
-    minio_object_store_info
-    validate_read_write_object_store rwtest testfile.txt
-    echo "Checking kubectl with kube/config"
-    echo "Kubeconfig was $KUBECONFIG"
-    unset KUBECONFIG
-    kubectl get namespaces
-  postUpgradeScript: |
-    source /opt/kurl-testgrid/testhelpers.sh
-    minio_object_store_info
-    validate_testfile rwtest testfile.txt
-    validate_read_write_object_store postupgrade upgradefile.txt
-    containerd --version | grep "__testver__"
-  unsupportedOSIDs:
-  - centos-74
-  - centos-79
-  - ol-79
-  - ubuntu-2204
-  - rocky-92 # containerd < 1.6 is not supported on rhel 9 variants
-
-- name: Upgrade Containerd from 1.5.x to __testver__
-  installerSpec:
-    kubernetes:
-      version: "1.25.x"
-    flannel:
-      version: latest
-    containerd:
-      version: "1.5.11"
-    openebs:
-      version: latest
-      isLocalPVEnabled: true
-      localPVStorageClassName: default
-    minio:
-      version: latest
-    ekco:
-      version: latest
-    kotsadm:
-      version: latest
-  upgradeSpec:
-    kubernetes:
-      version: "1.25.x"
-    flannel:
-      version: latest
-    containerd:
-      version: "__testver__"
-      s3Override: "__testdist__"
-    openebs:
-      version: latest
-      isLocalPVEnabled: true
-      localPVStorageClassName: default
-    minio:
-      version: latest
-    ekco:
-      version: latest
-    kotsadm:
-      version: latest
-  postUpgradeScript: |
-    containerd --version | grep "__testver__"
-  unsupportedOSIDs:
-  - rocky-92 # containerd < 1.6 is not supported on rhel 9 variants
-
-- name: "Upgrade Containerd from current to __testver__"
-  installerSpec:
-    kubernetes:
-      version: "1.25.x"
-    flannel:
-      version: latest
-    containerd:
-      version: latest
-    openebs:
-      version: latest
-      isLocalPVEnabled: true
-      localPVStorageClassName: default
-    minio:
-      version: latest
-    ekco:
-      version: latest
-    kotsadm:
-      version: latest
-  upgradeSpec:
-    kubernetes:
-      version: "1.25.x"
-    flannel:
-      version: latest
-    containerd:
-      version: "__testver__"
-      s3Override: "__testdist__"
-    openebs:
-      version: latest
-      isLocalPVEnabled: true
-      localPVStorageClassName: default
-    minio:
-      version: latest
-    ekco:
-      version: latest
-    kotsadm:
-      version: latest
-  postInstallScript: |
-    source /opt/kurl-testgrid/testhelpers.sh
-    minio_object_store_info
-    validate_read_write_object_store rwtest testfile.txt
-  postUpgradeScript: |
-    source /opt/kurl-testgrid/testhelpers.sh
-    minio_object_store_info
-    validate_testfile rwtest testfile.txt
-    validate_read_write_object_store postupgrade upgradefile.txt
-    containerd --version | grep "__testver__"
+#- name: "Migrate from Docker to Containerd and Kubernetes from 1.23 to 1.25 airgap"
+#  flags: "yes"
+#  installerSpec:
+#    kubernetes:
+#      version: 1.23.x
+#    weave: # flannel has errors with dns and docker
+#      version: latest
+#    openebs:
+#      version: latest
+#      isLocalPVEnabled: true
+#      localPVStorageClassName: default
+#    minio:
+#      version: latest
+#    ekco:
+#      version: latest
+#    registry:
+#      version: latest
+#    kotsadm:
+#      version: latest
+#    docker:
+#      version: latest
+#  upgradeSpec:
+#    kubernetes:
+#      version: 1.25.x
+#    weave: # flannel has errors with dns and docker
+#      version: latest
+#    openebs:
+#      version: latest
+#      isLocalPVEnabled: true
+#      localPVStorageClassName: default
+#    minio:
+#      version: latest
+#    ekco:
+#      version: latest
+#    registry:
+#      version: latest
+#    kotsadm:
+#      version: latest
+#    containerd:
+#      version: "__testver__"
+#      s3Override: "__testdist__"
+#  airgap: true
+#  preInstallScript: |
+#    source /opt/kurl-testgrid/testhelpers.sh
+#    mkdir -p /var/lib/kurl/assets
+#    ( cd /var/lib/kurl/assets && curl -fLO "$(kubernetes_upgrade_bundle_url "$KURL_URL" "$KURL_UPGRADE_URL")" )
+#  postInstallScript: |
+#    source /opt/kurl-testgrid/testhelpers.sh
+#    minio_object_store_info
+#    validate_read_write_object_store rwtest testfile.txt
+#    echo "Checking kubectl with kube/config"
+#    echo "Kubeconfig was $KUBECONFIG"
+#    unset KUBECONFIG
+#    kubectl get namespaces
+#  postUpgradeScript: |
+#    source /opt/kurl-testgrid/testhelpers.sh
+#    minio_object_store_info
+#    validate_testfile rwtest testfile.txt
+#    validate_read_write_object_store postupgrade upgradefile.txt
+#  unsupportedOSIDs:
+#  - rocky-92 # docker is not supported on rhel 9 variants
+#
+#- name: Upgrade Containerd from 1.4.x to __testver__
+#  installerSpec:
+#    kubernetes:
+#      version: "1.25.x"
+#    flannel:
+#      version: latest
+#    containerd:
+#      version: "1.4.x"
+#    openebs:
+#      version: latest
+#      isLocalPVEnabled: true
+#      localPVStorageClassName: default
+#    minio:
+#      version: latest
+#    ekco:
+#      version: latest
+#    kotsadm:
+#      version: latest
+#  upgradeSpec:
+#    kubernetes:
+#      version: "1.25.x"
+#    flannel:
+#      version: latest
+#    containerd:
+#      version: "__testver__"
+#      s3Override: "__testdist__"
+#    openebs:
+#      version: latest
+#      isLocalPVEnabled: true
+#      localPVStorageClassName: default
+#    minio:
+#      version: latest
+#    ekco:
+#      version: latest
+#    kotsadm:
+#      version: latest
+#  postInstallScript: |
+#    source /opt/kurl-testgrid/testhelpers.sh
+#    minio_object_store_info
+#    validate_read_write_object_store rwtest testfile.txt
+#    echo "Checking kubectl with kube/config"
+#    echo "Kubeconfig was $KUBECONFIG"
+#    unset KUBECONFIG
+#    kubectl get namespaces
+#  postUpgradeScript: |
+#    source /opt/kurl-testgrid/testhelpers.sh
+#    minio_object_store_info
+#    validate_testfile rwtest testfile.txt
+#    validate_read_write_object_store postupgrade upgradefile.txt
+#    containerd --version | grep "__testver__"
+#  unsupportedOSIDs:
+#  - centos-74
+#  - centos-79
+#  - ol-79
+#  - ubuntu-2204
+#  - rocky-92 # containerd < 1.6 is not supported on rhel 9 variants
+#
+#- name: Upgrade Containerd from 1.5.x to __testver__
+#  installerSpec:
+#    kubernetes:
+#      version: "1.25.x"
+#    flannel:
+#      version: latest
+#    containerd:
+#      version: "1.5.11"
+#    openebs:
+#      version: latest
+#      isLocalPVEnabled: true
+#      localPVStorageClassName: default
+#    minio:
+#      version: latest
+#    ekco:
+#      version: latest
+#    kotsadm:
+#      version: latest
+#  upgradeSpec:
+#    kubernetes:
+#      version: "1.25.x"
+#    flannel:
+#      version: latest
+#    containerd:
+#      version: "__testver__"
+#      s3Override: "__testdist__"
+#    openebs:
+#      version: latest
+#      isLocalPVEnabled: true
+#      localPVStorageClassName: default
+#    minio:
+#      version: latest
+#    ekco:
+#      version: latest
+#    kotsadm:
+#      version: latest
+#  postUpgradeScript: |
+#    containerd --version | grep "__testver__"
+#  unsupportedOSIDs:
+#  - rocky-92 # containerd < 1.6 is not supported on rhel 9 variants
+#
+#- name: "Upgrade Containerd from current to __testver__"
+#  installerSpec:
+#    kubernetes:
+#      version: "1.25.x"
+#    flannel:
+#      version: latest
+#    containerd:
+#      version: latest
+#    openebs:
+#      version: latest
+#      isLocalPVEnabled: true
+#      localPVStorageClassName: default
+#    minio:
+#      version: latest
+#    ekco:
+#      version: latest
+#    kotsadm:
+#      version: latest
+#  upgradeSpec:
+#    kubernetes:
+#      version: "1.25.x"
+#    flannel:
+#      version: latest
+#    containerd:
+#      version: "__testver__"
+#      s3Override: "__testdist__"
+#    openebs:
+#      version: latest
+#      isLocalPVEnabled: true
+#      localPVStorageClassName: default
+#    minio:
+#      version: latest
+#    ekco:
+#      version: latest
+#    kotsadm:
+#      version: latest
+#  postInstallScript: |
+#    source /opt/kurl-testgrid/testhelpers.sh
+#    minio_object_store_info
+#    validate_read_write_object_store rwtest testfile.txt
+#  postUpgradeScript: |
+#    source /opt/kurl-testgrid/testhelpers.sh
+#    minio_object_store_info
+#    validate_testfile rwtest testfile.txt
+#    validate_read_write_object_store postupgrade upgradefile.txt
+#    containerd --version | grep "__testver__"