@@ -879,9 +879,8 @@ func InstallNeo4jBackupAzureHelmChart(t *testing.T, standaloneReleaseName model.
879
879
SecretKeyName : "credentials" ,
880
880
Verbose : true ,
881
881
Type : "FULL" ,
882
- KeepBackupFiles : true ,
883
882
}
884
- helmValues .ConsistencyCheck .Database = "neo4j "
883
+ helmValues .ConsistencyCheck .Database = "system "
885
884
886
885
t .Logf ("Installing Azure backup helm chart with values: %+v" , helmValues )
887
886
_ , err := helmClient .Install (t , backupReleaseName .String (), namespace , helmValues )
@@ -891,7 +890,7 @@ func InstallNeo4jBackupAzureHelmChart(t *testing.T, standaloneReleaseName model.
891
890
}
892
891
893
892
t .Log ("Waiting for Azure backup job to complete" )
894
- time .Sleep (5 * time .Minute )
893
+ time .Sleep (2 * time .Minute )
895
894
896
895
cronjob , err := Clientset .BatchV1 ().CronJobs (namespace ).Get (context .Background (), backupReleaseName .String (), metav1.GetOptions {})
897
896
if err != nil {
@@ -933,10 +932,12 @@ func InstallNeo4jBackupAzureHelmChart(t *testing.T, standaloneReleaseName model.
933
932
// Check for connectivity and initialization logs
934
933
requiredLogs := []string {
935
934
"Connectivity established with Database" ,
935
+ "Connectivity with bucket" ,
936
936
"Printing backup flags" ,
937
937
"--include-metadata=all" ,
938
938
"--type=FULL" ,
939
939
"neo4j system" ,
940
+ "Backup command completed" ,
940
941
"Backup Completed" ,
941
942
"uploaded to azure container" ,
942
943
}
@@ -984,15 +985,14 @@ func InstallNeo4jBackupGCPHelmChart(t *testing.T, standaloneReleaseName model.Re
984
985
BucketName : bucketName ,
985
986
DatabaseAdminServiceName : fmt .Sprintf ("%s-admin" , standaloneReleaseName .String ()),
986
987
DatabaseNamespace : string (standaloneReleaseName .Namespace ()),
987
- Database : "neo4j,system " ,
988
+ Database : "neo4j" ,
988
989
CloudProvider : "gcp" ,
989
990
SecretName : "gcpcred" ,
990
991
SecretKeyName : "credentials" ,
991
992
Verbose : true ,
992
993
Type : "FULL" ,
993
994
KeepBackupFiles : true ,
994
995
}
995
- helmValues .ConsistencyCheck .Database = "neo4j"
996
996
997
997
t .Logf ("Installing GCP backup helm chart with values: %+v" , helmValues )
998
998
_ , err := helmClient .Install (t , backupReleaseName .String (), namespace , helmValues )
@@ -1002,7 +1002,7 @@ func InstallNeo4jBackupGCPHelmChart(t *testing.T, standaloneReleaseName model.Re
1002
1002
}
1003
1003
1004
1004
t .Log ("Waiting for GCP backup job to complete" )
1005
- time .Sleep (5 * time .Minute )
1005
+ time .Sleep (2 * time .Minute )
1006
1006
1007
1007
cronjob , err := Clientset .BatchV1 ().CronJobs (namespace ).Get (context .Background (), backupReleaseName .String (), metav1.GetOptions {})
1008
1008
if err != nil {
@@ -1048,6 +1048,8 @@ func InstallNeo4jBackupGCPHelmChart(t *testing.T, standaloneReleaseName model.Re
1048
1048
"Printing backup flags" ,
1049
1049
"--include-metadata=all" ,
1050
1050
"--type=FULL" ,
1051
+ "neo4j" ,
1052
+ "Backup command completed" ,
1051
1053
"Backup Completed" ,
1052
1054
}
1053
1055
@@ -1118,7 +1120,7 @@ func InstallNeo4jBackupGCPHelmChartWithInconsistencies(t *testing.T, standaloneR
1118
1120
}
1119
1121
1120
1122
t .Log ("Waiting for backup job to complete" )
1121
- time .Sleep (5 * time .Minute ) // Increased timeout to 5 minutes
1123
+ time .Sleep (2 * time .Minute )
1122
1124
1123
1125
cronjob , err := Clientset .BatchV1 ().CronJobs (namespace ).Get (context .Background (), backupReleaseName .String (), metav1.GetOptions {})
1124
1126
if err != nil {
@@ -1160,15 +1162,15 @@ func InstallNeo4jBackupGCPHelmChartWithInconsistencies(t *testing.T, standaloneR
1160
1162
// Check for connectivity and initialization logs
1161
1163
requiredLogs := []string {
1162
1164
"Connectivity established with Database" ,
1165
+ "Connectivity with bucket" ,
1163
1166
"Printing backup flags" ,
1164
1167
"--include-metadata=all" ,
1165
1168
"--type=FULL" ,
1166
1169
"neo4j system" ,
1167
- "Printing consistency check flags" ,
1168
- "--check-indexes=true" ,
1169
- "--check-graph=true" ,
1170
- "--check-counts=true" ,
1171
- "--check-property-owners=true" ,
1170
+ "--check-consistency" ,
1171
+ "--check-indexes" ,
1172
+ "--check-graph" ,
1173
+ "Backup command completed" ,
1172
1174
"Backup Completed" ,
1173
1175
}
1174
1176
0 commit comments