@@ -961,57 +961,14 @@ func TestAggregateBackupWithWildcard(t *testing.T, standaloneReleaseName model.R
961961 return fmt .Errorf ("initial backup did not complete: %v" , initialPollErr )
962962 }
963963
964- // Uninstall step 1 CronJob to prevent it from firing new FULL backups
965- // that would interfere with the DIFF backup in step 2
966- t .Log ("Uninstalling initial backup CronJob before proceeding to step 2" )
964+ // Uninstall FULL backup CronJob to prevent interference with the aggregate step
965+ t .Log ("Uninstalling FULL backup CronJob before proceeding to aggregate" )
967966 _ = runAll (t , "helm" , [][]string {
968967 {"uninstall" , initialBackupReleaseName .String (), "--wait" , "--timeout" , "3m" , "--namespace" , namespace },
969968 }, false )
970969
971- // Step 2: Create DIFF backup to establish backup chain (needed for aggregation)
972- t .Log ("Step 2: Creating DIFF backup to establish backup chain" )
973- secondBackupReleaseName := model .NewReleaseName ("wildcard-second-backup-" + TestRunIdentifier )
974-
975- t .Cleanup (func () {
976- _ = runAll (t , "helm" , [][]string {
977- {"uninstall" , secondBackupReleaseName .String (), "--wait" , "--timeout" , "3m" , "--namespace" , namespace },
978- }, false )
979- })
980-
981- secondHelmValues := model .DefaultNeo4jBackupValues
982- secondHelmValues .Backup = model.Backup {
983- BucketName : bucketName ,
984- DatabaseAdminServiceName : fmt .Sprintf ("%s-admin" , standaloneReleaseName .String ()),
985- DatabaseNamespace : namespace ,
986- Database : "neo4j,system" ,
987- CloudProvider : "gcp" ,
988- SecretName : "gcpcred" ,
989- SecretKeyName : "credentials" ,
990- KeepBackupFiles : true ,
991- Type : "DIFF" ,
992- Verbose : true ,
993- }
994- secondHelmValues .ConsistencyCheck .Enable = false
995-
996- t .Logf ("Installing DIFF backup chart to create backup chain" )
997- _ , err = helmClient .Install (t , secondBackupReleaseName .String (), namespace , secondHelmValues )
998- if err != nil {
999- return fmt .Errorf ("failed to install DIFF backup helm chart: %v" , err )
1000- }
1001-
1002- _ , _ , secondPollErr := waitForBackupPodCompletion (t , namespace , "wildcard-second-backup" , "Cloud backup completed successfully" , 12 * time .Minute )
1003- if secondPollErr != nil {
1004- return fmt .Errorf ("DIFF backup did not complete: %v" , secondPollErr )
1005- }
1006-
1007- // Uninstall step 2 CronJob to prevent interference with the aggregate backup
1008- t .Log ("Uninstalling DIFF backup CronJob before proceeding to step 3" )
1009- _ = runAll (t , "helm" , [][]string {
1010- {"uninstall" , secondBackupReleaseName .String (), "--wait" , "--timeout" , "3m" , "--namespace" , namespace },
1011- }, false )
1012-
1013- // Step 3: Run aggregate backup with wildcard
1014- t .Log ("Step 3: Running aggregate backup with wildcard" )
970+ // Step 2: Run aggregate backup with wildcard
971+ t .Log ("Step 2: Running aggregate backup with wildcard" )
1015972 aggregateBackupReleaseName := model .NewReleaseName ("wildcard-aggregate-backup-" + TestRunIdentifier )
1016973
1017974 t .Cleanup (func () {
@@ -1048,8 +1005,8 @@ func TestAggregateBackupWithWildcard(t *testing.T, standaloneReleaseName model.R
10481005 return fmt .Errorf ("failed to install aggregate backup helm chart: %v" , err )
10491006 }
10501007
1051- // Step 4 : Poll for aggregate backup completion and verify logs
1052- t .Log ("Step 4 : Waiting for aggregate backup with wildcard to complete" )
1008+ // Step 3 : Poll for aggregate backup completion and verify logs
1009+ t .Log ("Step 3 : Waiting for aggregate backup with wildcard to complete" )
10531010
10541011 deadline := time .Now ().Add (8 * time .Minute )
10551012 var aggregateBackupPodFound bool
0 commit comments