LPD-34573 Fix upgrade batch queries

rotty3000 · Aug 27, 2024 · 76bbf08 · 76bbf08
1 parent a1938cc
commit 76bbf08
Showing 1 changed file with 25 additions and 10 deletions.
diff --git a/test.properties b/test.properties
@@ -10027,38 +10027,53 @@ test.batch.run.property.query[functional-orcllinux9-tomcat90-mysql57-jdk8]=\
         (testray.main.component.name == "Upgrades Solutions")
 
     test.batch.run.property.query[functional-upgrade-tomcat90-db2111-jdk8][site-management]=\
-        (database.types ~ db2) AND \
+        (\
+            (database.types == null) OR \
+            (database.types ~ db2)\
+        ) AND \
         (\
             (testray.main.component.name == "Upgrades Site Management") OR \
-            (testray.main.component.name == "Upgrades Solutions")
+            (testray.main.component.name == "Upgrades Solutions")\
         )
 
     test.batch.run.property.query[functional-upgrade-tomcat90-mariadb102-jdk8][site-management]=\
-        (database.types ~ mariadb) AND \
+        (\
+            (database.types == null) OR \
+            (database.types ~ mariadb)\
+        ) AND \
         (\
             (testray.main.component.name == "Upgrades Site Management") OR \
-            (testray.main.component.name == "Upgrades Solutions")
+            (testray.main.component.name == "Upgrades Solutions")\
         )
 
     test.batch.run.property.query[functional-upgrade-tomcat90-oracle193-jdk8][site-management]=\
-        (database.types ~ oracle) AND \
+        (\
+            (database.types == null) OR \
+            (database.types ~ oracle)\
+        ) AND \
         (\
             (testray.main.component.name == "Upgrades Site Management") OR \
-            (testray.main.component.name == "Upgrades Solutions")
+            (testray.main.component.name == "Upgrades Solutions")\
         )
 
     test.batch.run.property.query[functional-upgrade-tomcat90-postgresql*-jdk8][site-management]=\
-        (database.types ~ postgresql) AND \
+        (\
+            (database.types == null) OR \
+            (database.types ~ postgresql)\
+        ) AND \
         (\
             (testray.main.component.name == "Upgrades Site Management") OR \
-            (testray.main.component.name == "Upgrades Solutions")
+            (testray.main.component.name == "Upgrades Solutions")\
         )
 
     test.batch.run.property.query[functional-upgrade-tomcat90-sqlserver2017-jdk8][site-management]=\
-        (database.types ~ sqlserver) AND \
+        (\
+            (database.types == null) OR \
+            (database.types ~ sqlserver)\
+        ) AND \
         (\
             (testray.main.component.name == "Upgrades Site Management") OR \
-            (testray.main.component.name == "Upgrades Solutions")
+            (testray.main.component.name == "Upgrades Solutions")\
         )
 
     #