Try to stabilise tests by checking for cluster health early

test/e2e/es/forced_upgrade_test.go

@@ -23,7 +23,8 @@ import (
 func TestForceUpgradePendingPods(t *testing.T) {
 	// create a cluster whose Pods will stay Pending forever
 	initial := elasticsearch.NewBuilder("force-upgrade-pending").
-		WithESMasterDataNodes(3, elasticsearch.DefaultResources)
+		WithESMasterDataNodes(3, elasticsearch.DefaultResources).
+		Unhealthy()
 	initial.Elasticsearch.Spec.NodeSets[0].PodTemplate.Spec.NodeSelector = map[string]string{
 		"cannot": "be-scheduled",
 	}
@@ -55,7 +56,8 @@ func TestForceUpgradePendingPodsInOneStatefulSet(t *testing.T) {
 			Name:        "pending",
 			Count:       1,
 			PodTemplate: elasticsearch.ESPodTemplate(elasticsearch.DefaultResources),
-		})
+		}).
+		Unhealthy()
 
 	// make Pods of the 2nds NodeSet pending
 	initial.Elasticsearch.Spec.NodeSets[1].PodTemplate.Spec.NodeSelector = map[string]string{
@@ -121,7 +123,8 @@ func TestForceUpgradeBootloopingPods(t *testing.T) {
 			"masterdata": {
 				"this leads": "to a bootlooping instance",
 			},
-		})
+		}).
+		Unhealthy()
 
 	// fix that cluster to remove the wrong configuration
 	fixed := initial.WithNoESTopology().WithESMasterDataNodes(3, elasticsearch.DefaultResources)

test/e2e/test/elasticsearch/builder.go

@@ -57,6 +57,7 @@ type Builder struct {
 	GlobalCA bool
 
 	mutationToleratedChecksFailureCount int
+	expectUnhealthy                     bool
 }
 
 func (b Builder) DeepCopy() *Builder {
@@ -111,6 +112,11 @@ func newBuilder(name, randSuffix string) Builder {
 		WithLabel(run.TestNameLabel, name)
 }
 
+func (b Builder) Unhealthy() Builder {
+	b.expectUnhealthy = true
+	return b
+}
+
 func (b Builder) WithAnnotation(key, value string) Builder {
 	if b.Elasticsearch.ObjectMeta.Annotations == nil {
 		b.Elasticsearch.ObjectMeta.Annotations = make(map[string]string)

test/e2e/test/elasticsearch/steps_creation.go

@@ -32,8 +32,12 @@ func (b Builder) CreationTestSteps(k *test.K8sClient) test.StepList {
 					if b.Elasticsearch.Spec.Version != createdEs.Spec.Version {
 						return fmt.Errorf("expected version %s but got %s", b.Elasticsearch.Spec.Version, createdEs.Spec.Version)
 					}
-					// TODO this is incomplete
-					return nil
+					if b.expectUnhealthy {
+						return nil
+					}
+					// check cluster health here already during the create steps to make sure any dependent builders can rely on a ready ES
+					// this is special casing Elasticsearch a little bit in the interest of test stability see https://github.com/elastic/cloud-on-k8s/issues/7172
+					return clusterHealthIs(b, k, esv1.ElasticsearchGreenHealth)
 				}),
 			},
 		})

test/e2e/test/helper/yaml.go

@@ -123,6 +123,8 @@ func (yd *YAMLDecoder) ToBuilders(reader *bufio.Reader, transform BuilderTransfo
 		builders = append(builders, builder)
 	}
 
+	// sort to make sure the ES builders come first to minimise the chance of test failures as in https://github.com/elastic/cloud-on-k8s/issues/7172
+	sortBuilders(builders)
 	return builders, nil
 }