LRCI-6655 SF

Author: michaelhashimoto

modules/apps/batch-planner/test.properties

@@ -21,15 +21,15 @@ relevant.rule.names=\
 test.batch.class.names.includes[relevant][batch-planner-rule]=\
     **/batch-planner/**/*Test.java
 
-test.batch.run.property.query[functional-tomcat-mysql*-jdk*][test-portal-hotfix-release]=\
-    (portal.acceptance == true) AND \
-    (testray.main.component.name == "Data Migration Center")
-
 test.batch.names[relevant][batch-planner-java-rule]=\
     modules-integration-postgresql163,\
     modules-unit
 
 test.batch.names[relevant][batch-planner-playwright-rule]=\
     playwright-js-tomcat101-postgresql163
 
+test.batch.run.property.query[functional-tomcat-mysql*-jdk*][test-portal-hotfix-release]=\
+    (portal.acceptance == true) AND \
+    (testray.main.component.name == "Data Migration Center")
+
 testray.main.component.name=Data Migration Center

modules/apps/frontend-js/frontend-js-walkthrough-web/test.properties

@@ -1,15 +1,4 @@
 test.batch.run.property.query[functional-tomcat-mysql*-jdk*][test-portal-hotfix-release]=\
-    (testray.component.names ~ "Walkthrough") AND \
-    (\
-        (portal.acceptance == true) AND \
-        (portal.upstream == true)\
-    ) AND \
-    (\
-        (app.server.types == null) OR \
-        (app.server.types ~ "tomcat")\
-    ) AND \
-    (\
-        (database.types == null) OR \
-        (database.types ~ "mysql")\
+    (testray.component.names ~ "Walkthrough") AND ((portal.acceptance == true) AND (portal.upstream == true)) AND ((app.server.types == null) OR (app.server.types ~ "tomcat")) AND ((database.types == null) OR (database.types ~ "mysql")
 
 testray.main.component.name=Frontend JS

modules/apps/journal/test.properties

@@ -24,10 +24,6 @@ test.batch.names[relevant][journal-java-rule]=\
     modules-integration-postgresql163,\
     modules-unit
 
-test.batch.run.property.query[functional-upgrade*-tomcat*-mysql*][relevant][journal-functional-rule]=\
-    (portal.acceptance == true) AND \
-    (testray.main.component.name ~ "Upgrades Content Management")
-
 test.batch.run.property.query[functional-tomcat-mysql*-jdk*][test-portal-hotfix-release]=\
     (portal.acceptance == true) AND \
     (\
@@ -38,4 +34,8 @@ test.batch.run.property.query[functional-tomcat-mysql*-jdk*][test-portal-hotfix-
         (testray.main.component.name ~ "Web Content Display")\
     )
 
+test.batch.run.property.query[functional-upgrade*-tomcat*-mysql*][relevant][journal-functional-rule]=\
+    (portal.acceptance == true) AND \
+    (testray.main.component.name ~ "Upgrades Content Management")
+
 testray.main.component.name=Web Content

modules/apps/object/test.properties

@@ -42,14 +42,14 @@ test.batch.names[relevant][object-java-rule]=\
     modules-integration-postgresql163,\
     modules-unit
 
+test.batch.names[relevant][object-playwright-rule]=\
+    playwright-js-tomcat101-mysql84
+
 test.batch.run.property.query[functional-tomcat-mysql*-jdk*][test-portal-hotfix-release]=\
     (portal.acceptance == true) AND \
     (\
         (testray.component.names == "Object") OR \
         (testray.main.component.name == "Object")\
     )
 
-test.batch.names[relevant][object-playwright-rule]=\
-    playwright-js-tomcat101-mysql84
-
 testray.main.component.name=Object

modules/apps/rss/test.properties

@@ -24,9 +24,6 @@ test.batch.names[relevant][rss-java-rule]=\
     modules-integration-postgresql163,\
     modules-unit
 
-test.batch.run.property.query[functional-upgrade*-tomcat*-mysql*][relevant][rss-functional-rule]=\
-    (portal.acceptance == true)
-
 test.batch.run.property.query[functional-tomcat-mysql*-jdk*][test-portal-hotfix-release]=\
     (portal.acceptance == true) AND \
     (\
@@ -44,4 +41,7 @@ test.batch.run.property.query[functional-tomcat-mysql*-jdk*][test-portal-hotfix-
         (testray.main.component.name ~ "Tags")\
     )
 
+test.batch.run.property.query[functional-upgrade*-tomcat*-mysql*][relevant][rss-functional-rule]=\
+    (portal.acceptance == true)
+
 testray.main.component.name=RSS Publisher Widget

modules/dxp/apps/portal-workflow/portal-workflow-metrics-rest-impl/test.properties

@@ -19,4 +19,4 @@ test.batch.names[relevant][portal-workflow-metrics-rest-impl-java-rule]=\
 
 test.batch.run.property.query[functional-tomcat-mysql*-jdk*][test-portal-hotfix-release]=\
     (portal.acceptance == true) AND \
-    (testray.main.component.name ~ "Workflow Metrics")
+    (testray.main.component.name ~ "Workflow Metrics")