Stabilize e2e tests (#50)

canonical · Sep 13, 2024 · 00b2a6b · 00b2a6b
1 parent accc0a1
commit 00b2a6b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
@@ -93,10 +93,10 @@ jobs:
       - name: Load provider image
         run: sudo docker load -i provider-images.tar
       - name: Load k8s-snap old image
-        if: matrix.ginkgo_focus == 'Workload cluster upgrade'
         run: |
           sudo docker load -i k8s-snap-image-old.tar
       - name: Load k8s-snap new image
+        if: matrix.ginkgo_focus == 'Workload cluster upgrade'
         run: |
           sudo docker load -i k8s-snap-image-new.tar
       - name: Create docker network

diff --git a/hack/build-e2e-images.sh b/hack/build-e2e-images.sh
@@ -5,6 +5,7 @@
 #
 # Usage:
 #   ./build-e2e-images.sh
+set -xe
 
 DIR="$(realpath "$(dirname "${0}")")"
 

diff --git a/test/e2e/helpers.go b/test/e2e/helpers.go
@@ -417,6 +417,7 @@ func WaitForControlPlaneToBeReady(ctx context.Context, input WaitForControlPlane
 			Namespace: input.ControlPlane.GetNamespace(),
 			Name:      input.ControlPlane.GetName(),
 		}
+		Byf("Getting the control plane %s", klog.KObj(input.ControlPlane))
 		if err := input.Getter.Get(ctx, key, controlplane); err != nil {
 			return false, errors.Wrapf(err, "failed to get KCP")
 		}
@@ -431,6 +432,7 @@ func WaitForControlPlaneToBeReady(ctx context.Context, input WaitForControlPlane
 		// * .spec.replicas, .status.replicas, .status.updatedReplicas,
 		//   .status.readyReplicas are not equal and
 		// * unavailableReplicas > 0
+		Byf("Control plane %s: desired=%d, status=%d, updated=%d, ready=%d, unavailable=%d", klog.KObj(controlplane), *desiredReplicas, statusReplicas, updatedReplicas, readyReplicas, unavailableReplicas)
 		if statusReplicas != *desiredReplicas ||
 			updatedReplicas != *desiredReplicas ||
 			readyReplicas != *desiredReplicas ||