Fix tests

test/batch_restart_pods_test.go

@@ -20,9 +20,8 @@ import (
 const batchClusterName = "batch-restart"
 
 var (
-	unavailableImage = fmt.Sprintf("%s:%s", baseImage, "7.0.0.99")
-	availableImage1  = fmt.Sprintf("%s:%s", baseImage, "7.0.0.0_1")
-	availableImage2  = fmt.Sprintf("%s:%s", baseImage, "7.0.0.0_2")
+	unavailableImage = fmt.Sprintf("%s:%s", baseImage, "7.1.0.99")
+	availableImage1  = nextImage
 )
 
 func percent(val string) *intstr.IntOrString {
@@ -429,7 +428,7 @@ func BatchUpgrade(ctx goctx.Context, clusterNamespacedName types.NamespacedName)
 		aeroCluster, err = getCluster(k8sClient, ctx, clusterNamespacedName)
 		Expect(err).ToNot(HaveOccurred())
 		aeroCluster.Spec.RackConfig.RollingUpdateBatchSize = count(1)
-		aeroCluster.Spec.Image = availableImage2
+		aeroCluster.Spec.Image = latestImage
 		err = k8sClient.Update(ctx, aeroCluster)
 		Expect(err).ToNot(HaveOccurred())
 

test/cluster_helper.go

@@ -31,7 +31,7 @@ import (
 
 const (
 	baseImage           = "aerospike/aerospike-server-enterprise"
-	prevServerVersion   = "7.0.0.0"
+	nextServerVersion   = "7.1.0.0_1"
 	latestServerVersion = "7.1.0.0"
 	invalidVersion      = "3.0.0.4"
 
@@ -45,7 +45,7 @@ var (
 	cascadeDeleteFalse = false
 	cascadeDeleteTrue  = true
 	logger             = logr.Discard()
-	prevImage          = fmt.Sprintf("%s:%s", baseImage, prevServerVersion)
+	nextImage          = fmt.Sprintf("%s:%s", baseImage, nextServerVersion)
 	latestImage        = fmt.Sprintf("%s:%s", baseImage, latestServerVersion)
 	invalidImage       = fmt.Sprintf("%s:%s", baseImage, invalidVersion)
 

test/cluster_test.go

@@ -254,8 +254,7 @@ func clusterWithMaxIgnorablePod(ctx goctx.Context) {
 					Eventually(func() error {
 						aeroCluster, err = getCluster(k8sClient, ctx, clusterNamespacedName)
 						Expect(err).ToNot(HaveOccurred())
-						newImage := baseImage + ":7.0.0.0_2"
-						aeroCluster.Spec.Image = newImage
+						aeroCluster.Spec.Image = nextImage
 						// As pod is in pending state, CR object will be won't reach the final phase.
 						// So expectedPhases can be InProgress or Completed
 						return updateClusterWithExpectedPhases(k8sClient, ctx, aeroCluster, expectedPhases)
@@ -1032,7 +1031,7 @@ func UpdateClusterTest(ctx goctx.Context) {
 					// TODO: How to check if it is checking cluster stability before killing node
 					// dont change image, it upgrade, check old version
 					err = upgradeClusterTest(
-						k8sClient, ctx, clusterNamespacedName, prevImage,
+						k8sClient, ctx, clusterNamespacedName, nextImage,
 					)
 					Expect(err).ToNot(HaveOccurred())
 				},

test/k8snode_block_list_test.go

@@ -122,7 +122,7 @@ var _ = Describe(
 						aeroCluster, err = getCluster(k8sClient, ctx, clusterNamespacedName)
 						Expect(err).ToNot(HaveOccurred())
 						aeroCluster.Spec.K8sNodeBlockList = []string{oldK8sNode}
-						aeroCluster.Spec.Image = availableImage2
+						aeroCluster.Spec.Image = availableImage1
 
 						err = updateCluster(k8sClient, ctx, aeroCluster)
 						Expect(err).ToNot(HaveOccurred())

test/large_reconcile_test.go

@@ -139,7 +139,7 @@ var _ = Describe(
 						)
 						Expect(err).ToNot(HaveOccurred())
 
-						err = UpdateClusterImage(aeroCluster, prevImage)
+						err = UpdateClusterImage(aeroCluster, nextImage)
 						Expect(err).ToNot(HaveOccurred())
 						err = k8sClient.Update(goctx.TODO(), aeroCluster)
 						Expect(err).ToNot(HaveOccurred())
@@ -159,7 +159,7 @@ var _ = Describe(
 						// Only 1 pod need upgrade
 						err = waitForClusterUpgrade(
 							k8sClient, aeroCluster, int(aeroCluster.Spec.Size),
-							prevImage, retryInterval, getTimeout(4),
+							nextImage, retryInterval, getTimeout(4),
 						)
 						Expect(err).ToNot(HaveOccurred())
 

test/multicluster_test.go

@@ -227,7 +227,7 @@ func validateLifecycleOperationInRackCluster(
 	By("Upgrade/Downgrade")
 	// don't change image, it upgrades, check old version
 	err = upgradeClusterTest(
-		k8sClient, ctx, clusterNamespacedName, prevImage,
+		k8sClient, ctx, clusterNamespacedName, nextImage,
 	)
 	Expect(err).ToNot(HaveOccurred())
 

test/rack_enabled_cluster_test.go

@@ -132,7 +132,7 @@ var _ = Describe(
 
 						// don't change image, it upgrade, check old version
 						err = upgradeClusterTest(
-							k8sClient, ctx, clusterNamespacedName, prevImage,
+							k8sClient, ctx, clusterNamespacedName, nextImage,
 						)
 						Expect(err).ToNot(HaveOccurred())
 

test/storage_init_test.go

@@ -212,7 +212,7 @@ var _ = Describe(
 						Expect(err).ToNot(HaveOccurred())
 
 						By("Forcing a rolling restart, volumes should still have data")
-						err = UpdateClusterImage(aeroCluster, prevImage)
+						err = UpdateClusterImage(aeroCluster, nextImage)
 						Expect(err).ToNot(HaveOccurred())
 						err = aerospikeClusterCreateUpdate(
 							k8sClient, aeroCluster, ctx,
@@ -231,7 +231,7 @@ var _ = Describe(
 						By("Recreating. Older volumes will still be around and reused")
 						aeroCluster = getStorageInitAerospikeCluster(
 							clusterNamespacedName, storageConfig, racks,
-							prevImage,
+							nextImage,
 						)
 						aeroCluster.Spec.PodSpec = podSpec
 						err = aerospikeClusterCreateUpdate(

test/storage_wipe_test.go

@@ -107,7 +107,7 @@ var _ = Describe(
 						By(
 							fmt.Sprintf(
 								"Downgrading image from %s to %s - volumes should not be wiped",
-								latestImage, version6,
+								post6Image, version6,
 							),
 						)
 						err = UpdateClusterImage(aeroCluster, version6Image)

test/strong_consistency_test.go

@@ -194,7 +194,7 @@ var _ = Describe("SCMode", func() {
 			By("Upgrade/Downgrade")
 			// don't change image, it upgrades
 			err = upgradeClusterTest(
-				k8sClient, ctx, clusterNamespacedName, prevImage,
+				k8sClient, ctx, clusterNamespacedName, nextImage,
 			)
 			Expect(err).ToNot(HaveOccurred())
 
@@ -366,7 +366,7 @@ func validateLifecycleOperationInSCCluster(
 	By("Upgrade/Downgrade")
 	// don't change image, it upgrades, check old version
 	err = upgradeClusterTest(
-		k8sClient, ctx, clusterNamespacedName, prevImage,
+		k8sClient, ctx, clusterNamespacedName, nextImage,
 	)
 	Expect(err).ToNot(HaveOccurred())