Fix e2e tests and add 'time.Minute' timeout to waitFor condition

Signed-off-by: Jordi Gil <[email protected]>
apache · Feb 28, 2024 · 9865cca · 9865cca
1 parent 214e0b2
commit 9865cca
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 11 deletions.
diff --git a/test/e2e/helpers.go b/test/e2e/helpers.go
@@ -44,8 +44,9 @@ type health struct {
 }
 
 type check struct {
-	Name   string `json:"name"`
-	Status string `json:"status"`
+	Name   string            `json:"name"`
+	Status string            `json:"status"`
+	Data   map[string]string `json:"data"`
 }
 
 var (

diff --git a/test/e2e/workflow_test.go b/test/e2e/workflow_test.go
@@ -144,6 +144,10 @@ var _ = Describe("SonataFlow Operator", Ordered, func() {
 
 var _ = Describe("Validate the persistence ", Ordered, func() {
 
+	const (
+		dbConnectionName = "Database connections health check"
+		defaultDataCheck = "<default>"
+	)
 	var (
 		ns string
 	)
@@ -198,21 +202,20 @@ var _ = Describe("Validate the persistence ", Ordered, func() {
 				}
 				Expect(h.Status).To(Equal(upStatus), "Pod health is not UP")
 				for _, c := range h.Checks {
-					if withPersistence {
-						if c.Name == "Database connections health check" {
-							Expect(c.Status).To(Equal(upStatus), "Pod's database connection is not UP")
+					if c.Name == dbConnectionName {
+						Expect(c.Status).To(Equal(upStatus), "Pod's database connection is not UP")
+						if withPersistence {
+							Expect(c.Data[defaultDataCheck]).To(Equal(upStatus), "Pod's 'default' database data is not UP")
+							return true
+						} else {
+							Expect(defaultDataCheck).NotTo(BeElementOf(c.Data), "Pod's 'default' database data check exists in health manifest")
 							return true
 						}
-					} else {
-						Expect(c.Name).NotTo(Equal("Database connections health check"), "persistence configuration found in workflow")
 					}
 				}
-				if !withPersistence {
-					return true
-				}
 			}
 			return false
-		}, 1).Should(BeTrue())
+		}, 1*time.Minute).Should(BeTrue())
 	},
 		Entry("defined in the workflow from an existing kubernetes service as a reference", test.GetSonataFlowE2EWorkflowPersistenceSampleDataDirectory("by_service"), true),
 		Entry("defined in the workflow and from the sonataflow platform", test.GetSonataFlowE2EWorkflowPersistenceSampleDataDirectory("from_platform_overwritten_by_service"), true),

diff --git a/...ata/workflow/persistence/from_platform_overwritten_by_service/02-sonataflow_platform.yaml b/...ata/workflow/persistence/from_platform_overwritten_by_service/02-sonataflow_platform.yaml
@@ -28,6 +28,10 @@ spec:
         port: 3456
         databaseName: db_name
   build:
+    template:
+      buildArgs:
+      - name: QUARKUS_EXTENSIONS
+        value: org.kie.kogito:kogito-addons-quarkus-persistence-jdbc:999-SNAPSHOT,io.quarkus:quarkus-jdbc-postgresql:3.2.9.Final,io.quarkus:quarkus-agroal:3.2.9.Final
     config:
       strategyOptions:
         KanikoBuildCacheEnabled: "true"  
diff --git a/...ta/workflow/persistence/from_platform_with_di_and_js_services/02-sonataflow_platform.yaml b/...ta/workflow/persistence/from_platform_with_di_and_js_services/02-sonataflow_platform.yaml
@@ -28,6 +28,10 @@ spec:
         port: 5432
         databaseName: sonataflow
   build:
+    template:
+      buildArgs:
+      - name: QUARKUS_EXTENSIONS
+        value: org.kie.kogito:kogito-addons-quarkus-persistence-jdbc:999-SNAPSHOT,io.quarkus:quarkus-jdbc-postgresql:3.2.9.Final,io.quarkus:quarkus-agroal:3.2.9.Final
     config:
       strategyOptions:
         KanikoBuildCacheEnabled: "true"

diff --git a/...rkflow/persistence/from_platform_with_no_persistence_required/02-sonataflow_platform.yaml b/...rkflow/persistence/from_platform_with_no_persistence_required/02-sonataflow_platform.yaml
@@ -28,6 +28,10 @@ spec:
         port: 5432
         databaseName: sonataflow
   build:
+    template:
+      buildArgs:
+      - name: QUARKUS_EXTENSIONS
+        value: org.kie.kogito:kogito-addons-quarkus-persistence-jdbc:999-SNAPSHOT,io.quarkus:quarkus-jdbc-postgresql:3.2.9.Final,io.quarkus:quarkus-agroal:3.2.9.Final
     config:
       strategyOptions:
         KanikoBuildCacheEnabled: "true"
diff --git a/...workflow/persistence/from_platform_without_di_and_js_services/02-sonataflow_platform.yaml b/...workflow/persistence/from_platform_without_di_and_js_services/02-sonataflow_platform.yaml
@@ -28,6 +28,10 @@ spec:
         port: 5432
         databaseName: sonataflow
   build:
+    template:
+      buildArgs:
+      - name: QUARKUS_EXTENSIONS
+        value: org.kie.kogito:kogito-addons-quarkus-persistence-jdbc:999-SNAPSHOT,io.quarkus:quarkus-jdbc-postgresql:3.2.9.Final,io.quarkus:quarkus-agroal:3.2.9.Final
     config:
       strategyOptions:
         KanikoBuildCacheEnabled: "true"