From 0eac383fe2fa3367d90a8d39b4bcfc1e03301270 Mon Sep 17 00:00:00 2001
From: Nash Luffman <nashluffman@gmail.com>
Date: Wed, 13 Nov 2024 09:19:16 +0000
Subject: [PATCH] test: remove unnecessary waits from e2e tests (#1106)

* remove unnecessary waits from e2e tests

Signed-off-by: mluffman <mluffman@thoughtmachine.net>

* small refactor of platforms in Makefile

Signed-off-by: mluffman <mluffman@thoughtmachine.net>

* fix

* update

* fix

---------

Signed-off-by: mluffman <mluffman@thoughtmachine.net>
Co-authored-by: mluffman <mluffman@thoughtmachine.net>
Co-authored-by: drivebyer <wuyangmuc@gmail.com>
---
 Makefile                                                 | 9 +++++----
 .../v1beta2/redis-cluster-restart/ready-cluster.yaml     | 2 ++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 9dc6ebe84..6aa892c05 100644
--- a/Makefile
+++ b/Makefile
@@ -25,6 +25,7 @@ GOBIN=$(shell go env GOBIN)
 endif
 
 CONTAINER_ENGINE ?= docker
+PLATFORMS="linux/arm64,linux/amd64"
 
 all: manager
 
@@ -78,15 +79,15 @@ generate: controller-gen
 	$(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./..."
 
 docker-create:
-	${CONTAINER_ENGINE} buildx create --platform "linux/amd64,linux/arm64" --use
+	${CONTAINER_ENGINE} buildx create --platform $(PLATFORMS) --use
 
 # Build the docker image
 docker-build:
-	${CONTAINER_ENGINE} buildx build --platform="linux/arm64,linux/amd64" -t ${IMG} .
+	${CONTAINER_ENGINE} buildx build --platform=$(PLATFORMS) -t ${IMG} .
 
 # Push the docker image
 docker-push:
-	${CONTAINER_ENGINE} buildx build --push --platform="linux/arm64,linux/amd64" -t ${IMG} .
+	${CONTAINER_ENGINE} buildx build --push --platform="$(PLATFORMS)" -t ${IMG} .
 
 
 # go-install-tool will 'go install' any package with custom target and name of binary, if it doesn't exist
@@ -114,7 +115,7 @@ bundle: manifests kustomize
 # Build the bundle image.
 .PHONY: bundle-build
 bundle-build:
-	${CONTAINER_ENGINE} buildx build --platform="linux/arm64,linux/amd64" -f bundle.Dockerfile -t $(BUNDLE_IMG) .
+	${CONTAINER_ENGINE} buildx build --platform="$(PLATFORMS)" -f bundle.Dockerfile -t $(BUNDLE_IMG) .
 
 # Generate bundle manifests and metadata, then validate generated files.
 .PHONY: codegen
diff --git a/tests/e2e-chainsaw/v1beta2/redis-cluster-restart/ready-cluster.yaml b/tests/e2e-chainsaw/v1beta2/redis-cluster-restart/ready-cluster.yaml
index 43462e53d..60c60ecfe 100644
--- a/tests/e2e-chainsaw/v1beta2/redis-cluster-restart/ready-cluster.yaml
+++ b/tests/e2e-chainsaw/v1beta2/redis-cluster-restart/ready-cluster.yaml
@@ -4,5 +4,7 @@ kind: RedisCluster
 metadata:
   name: redis-cluster-v1beta2
 status:
+  readyFollowerReplicas: 0
+  readyLeaderReplicas: 3
   state: Ready
   reason: RedisCluster is ready