Merge pull request #4014 from replicatedhq/emosbaugh/sc-67936/flannel…

…-airgap-test-failing-installation

fix(testgrid): use weave with docker on rhel based distros

addons/containerd/template/testgrid/k8s-ctrd.yaml

@@ -96,11 +96,11 @@
   postUpgradeScript: |
     containerd --version | grep "__testver__"
 
-- name: "Migrate from Docker to Containerd"
+- name: "Migrate from Docker to Containerd and Kubernetes from 1.23 to 1.25"
   installerSpec:
     kubernetes:
       version: 1.23.x
-    flannel:
+    weave: # flannel has errors with dns and docker
       version: latest
     openebs:
       version: latest
@@ -118,8 +118,8 @@
       version: latest
   upgradeSpec:
     kubernetes:
-      version: 1.24.x
-    flannel:
+      version: 1.25.x
+    weave: # flannel has errors with dns and docker
       version: latest
     openebs:
       version: latest
@@ -136,11 +136,24 @@
     containerd:
       version: "__testver__"
       s3Override: "__testdist__"
-- name: "Migrate from Docker to Containerd airgap"
+  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
+- name: "Migrate from Docker to Containerd and Kubernetes from 1.23 to 1.25 airgap"
   installerSpec:
     kubernetes:
       version: 1.23.x
-    flannel:
+    weave: # flannel has errors with dns and docker
       version: latest
     openebs:
       version: latest
@@ -158,8 +171,8 @@
       version: latest
   upgradeSpec:
     kubernetes:
-      version: 1.24.x
-    flannel:
+      version: 1.25.x
+    weave: # flannel has errors with dns and docker
       version: latest
     openebs:
       version: latest
@@ -177,3 +190,16 @@
       version: "__testver__"
       s3Override: "__testdist__"
   airgap: true
+  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

testgrid/specs/deploy.yaml

@@ -286,13 +286,11 @@
       version: latest
     kotsadm:
       version: latest
-- name: "Airgap upgrade from k8s 1.23 to 1.25, and from Docker to Containerd"
+- name: "Migrate from Docker to Containerd and Kubernetes from 1.23 to 1.25 airgap"
   installerSpec:
     kubernetes:
       version: 1.23.x
-    kurl:
-      installerVersion: ""
-    flannel:
+    weave: # flannel has errors with dns and docker
       version: latest
     openebs:
       version: latest
@@ -302,14 +300,16 @@
       version: latest
     ekco:
       version: latest
+    registry:
+      version: latest
+    kotsadm:
+      version: latest
     docker:
       version: latest
   upgradeSpec:
     kubernetes:
       version: 1.25.x
-    kurl:
-      installerVersion: ""
-    flannel:
+    weave: # flannel has errors with dns and docker
       version: latest
     openebs:
       version: latest
@@ -319,6 +319,10 @@
       version: latest
     ekco:
       version: latest
+    registry:
+      version: latest
+    kotsadm:
+      version: latest
     containerd:
       version: latest
   airgap: true

testgrid/specs/full.yaml

@@ -900,73 +900,111 @@
   airgap: true
   unsupportedOSIDs:
   - centos-74 # Rook 1.8+ not supported on 3.10.0-693.el7.x86_64 kernel
-- name: "Migrate from Docker to Containerd"
+- name: "Migrate from Docker to Containerd and Kubernetes from 1.23 to 1.25"
   installerSpec:
     kubernetes:
       version: 1.23.x
-    flannel:
+    weave: # flannel has errors with dns and docker
       version: latest
-    longhorn:
+    openebs:
       version: latest
-    registry:
+      isLocalPVEnabled: true
+      localPVStorageClassName: default
+    minio:
       version: latest
     ekco:
       version: latest
+    registry:
+      version: latest
     kotsadm:
       version: latest
-      disableS3: true
     docker:
       version: latest
   upgradeSpec:
     kubernetes:
-      version: 1.23.x
-    flannel:
+      version: 1.25.x
+    weave: # flannel has errors with dns and docker
       version: latest
-    longhorn:
+    openebs:
       version: latest
-    registry:
+      isLocalPVEnabled: true
+      localPVStorageClassName: default
+    minio:
       version: latest
     ekco:
       version: latest
+    registry:
+      version: latest
     kotsadm:
       version: latest
-      disableS3: true
     containerd:
       version: latest
-- name: "Migrate from Docker to Containerd airgap"
+  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
+- name: "Migrate from Docker to Containerd and Kubernetes from 1.23 to 1.25 airgap"
   installerSpec:
     kubernetes:
       version: 1.23.x
-    flannel:
+    weave: # flannel has errors with dns and docker
       version: latest
-    longhorn:
+    openebs:
       version: latest
-    registry:
+      isLocalPVEnabled: true
+      localPVStorageClassName: default
+    minio:
       version: latest
     ekco:
       version: latest
+    registry:
+      version: latest
     kotsadm:
       version: latest
-      disableS3: true
     docker:
       version: latest
   upgradeSpec:
     kubernetes:
-      version: 1.23.x
-    flannel:
+      version: 1.25.x
+    weave: # flannel has errors with dns and docker
       version: latest
-    longhorn:
+    openebs:
       version: latest
-    registry:
+      isLocalPVEnabled: true
+      localPVStorageClassName: default
+    minio:
       version: latest
     ekco:
       version: latest
+    registry:
+      version: latest
     kotsadm:
       version: latest
-      disableS3: true
     containerd:
       version: latest
   airgap: true
+  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
 - name: "K8s 1.24x Rook"
   cpu: 6
   installerSpec:
@@ -1715,42 +1753,3 @@
       version: latest
     containerd:
       version: latest
-- name: "Migrate from Docker to Containerd and Kubernetes from 1.23 to 1.25"
-  installerSpec:
-    kubernetes:
-      version: 1.23.x
-    flannel:
-      version: latest
-    openebs:
-      version: latest
-      isLocalPVEnabled: true
-      localPVStorageClassName: default
-    minio:
-      version: latest
-    registry:
-      version: latest
-    ekco:
-      version: latest
-    kotsadm:
-      version: latest
-    docker:
-      version: latest
-  upgradeSpec:
-    kubernetes:
-      version: 1.25.x
-    flannel:
-      version: latest
-    openebs:
-      version: latest
-      isLocalPVEnabled: true
-      localPVStorageClassName: default
-    minio:
-      version: latest
-    registry:
-      version: latest
-    ekco:
-      version: latest
-    kotsadm:
-      version: latest
-    containerd:
-      version: latest