chore(deps): bump surefire to 3.2.2

.ci/config/matrices.yaml

@@ -13,7 +13,6 @@ engine-webapp-unit:
   - 'aws_aurora_postgresql_13'
   - 'aws_aurora_postgresql_14'
   - 'mariadb_106'
-  - 'mysql_80'
   - 'oracle_19'
   - 'db2_115'
   - 'sqlserver_2017'

.ci/config/stage-types.yaml

@@ -23,12 +23,9 @@
 db-unit:
   directory: '.'
   command: 'clean package -pl "engine,webapps/assembly,webapps/assembly-jakarta" -Dskip.frontend.build=true -P'
-  stash:
-    runtimeStash: true
   labels:
   - 'all-db'
   - 'db2'
-  - 'mysql'
   - 'oracle'
   - 'mariadb'
   - 'sqlserver'
@@ -43,7 +40,6 @@ sql-scripts:
   labels:
   - 'all-db'
   - 'db2'
-  - 'mysql'
   - 'oracle'
   - 'mariadb'
   - 'sqlserver'
@@ -63,7 +59,6 @@ old-engine:
   labels:
   - 'all-db'
   - 'db2'
-  - 'mysql'
   - 'oracle'
   - 'mariadb'
   - 'sqlserver'

Jenkinsfile

@@ -111,16 +111,6 @@ pipeline {
                 )
               }
 
-              // don't trigger the daily pipeline from a master branch build
-              // or if a PR has no relevant labels
-              if (env.BRANCH_NAME != cambpmDefaultBranch() && cambpmWithLabels('default-build', 'jdk', 'rolling-update', 'migration', 'all-db', 'h2', 'db2', 'mysql', 'oracle', 'mariadb', 'sqlserver', 'postgresql')) {
-                cambpmTriggerDownstream(
-                  platformVersionDir + "/cambpm-ce/cambpm-daily/${env.BRANCH_NAME}",
-                  [string(name: 'UPSTREAM_PROJECT_NAME', value: upstreamProjectName),
-                  string(name: 'UPSTREAM_BUILD_NUMBER', value: upstreamBuildNumber)]
-                )
-              }
-
               // only execute on version (default) branch (e.g. master, 7.15)
               if (env.BRANCH_NAME == cambpmDefaultBranch()) {
                 cambpmRunMaven('.',
@@ -465,7 +455,7 @@ pipeline {
         stage('engine-UNIT-database-table-prefix') {
           when {
             expression {
-              cambpmIsNotFailedStageType(failedStageTypes, 'engine-unit') && cambpmWithLabels('all-db','h2','db2','mysql','oracle','mariadb','sqlserver','postgresql','cockroachdb')
+              cambpmIsNotFailedStageType(failedStageTypes, 'engine-unit') && cambpmWithLabels('all-db','h2','db2','oracle','sqlserver','postgresql','cockroachdb')
             }
           }
           steps {
@@ -580,6 +570,42 @@ pipeline {
             ])
           }
         }
+        stage('engine-UNIT-mysql') {
+          when {
+            expression {
+              cambpmIsNotFailedStageType(failedStageTypes, 'engine-unit') && cambpmWithLabels('all-db', 'mysql')
+            }
+          }
+          steps {
+            cambpmConditionalRetry([
+              agentLabel: 'mysql_80',
+              runSteps: {
+                cambpmRunMaven('engine/', ' clean package -Pmysql', runtimeStash: true)
+              },
+              postFailure: {
+                cambpmPublishTestResult()
+              }
+            ])
+          }
+        }
+        stage('webapps-UNIT-mysql') {
+          when {
+            expression {
+              cambpmIsNotFailedStageType(failedStageTypes, 'engine-unit') && cambpmWithLabels('all-db', 'mysql')
+            }
+          }
+          steps {
+            cambpmConditionalRetry([
+              agentLabel: 'mysql_80',
+              runSteps: {
+                cambpmRunMaven('.', ' clean package -pl "webapps/assembly,webapps/assembly-jakarta" -Dskip.frontend.build=true -Pmysql', runtimeStash: true)
+              },
+              postFailure: {
+                cambpmPublishTestResult()
+              }
+            ])
+          }
+        }
       }
     }
   }

webapps/assembly-jakarta/pom.xml

@@ -583,20 +583,6 @@
       </properties>
     </profile>
 
-    <profile>
-      <id>mariadb</id>
-      <build>
-        <plugins>
-          <plugin>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <configuration>
-              <excludedGroups>org.camunda.bpm.cockpit.plugin.base.SlowMariaDbTest</excludedGroups>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-
     <profile>
       <id>h2</id>
       <properties>

webapps/assembly/pom.xml

@@ -345,20 +345,6 @@
       </properties>
     </profile>
 
-    <profile>
-      <id>mariadb</id>
-      <build>
-        <plugins>
-          <plugin>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <configuration>
-              <excludedGroups>org.camunda.bpm.cockpit.plugin.base.SlowMariaDbTest</excludedGroups>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-
     <profile>
       <id>h2</id>
       <properties>

webapps/assembly/src/test/java/org/camunda/bpm/cockpit/plugin/base/ProcessDefinitionResourceTest.java

@@ -37,6 +37,8 @@
 import org.camunda.bpm.engine.RepositoryService;
 import org.camunda.bpm.engine.RuntimeService;
 import org.camunda.bpm.engine.impl.cfg.ProcessEngineConfigurationImpl;
+import org.camunda.bpm.engine.impl.db.sql.DbSqlSessionFactory;
+import org.camunda.bpm.engine.impl.test.RequiredDatabase;
 import org.camunda.bpm.engine.repository.ProcessDefinition;
 import org.camunda.bpm.engine.rest.dto.VariableQueryParameterDto;
 import org.camunda.bpm.engine.runtime.ProcessInstance;
@@ -45,7 +47,6 @@
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.experimental.categories.Category;
 
 public class ProcessDefinitionResourceTest extends AbstractCockpitPluginTest {
 
@@ -625,7 +626,7 @@ public void testQueryWithIntegerVariable() {
       "processes/variables-process-with-call-activity.bpmn",
       "processes/user-task-process.bpmn"
   })
-  @Category(SlowMariaDbTest.class)
+  @RequiredDatabase(excludes = {DbSqlSessionFactory.MYSQL, DbSqlSessionFactory.MARIADB})
   public void testQueryWithComplexVariableFilter() {
     // given
     ProcessInstance processInstance = runtimeService.startProcessInstanceByKey("variableProcessWithCallActivity");

webapps/assembly/src/test/java/org/camunda/bpm/cockpit/plugin/base/ProcessInstanceRestServiceTest.java

@@ -47,6 +47,8 @@
 import org.camunda.bpm.engine.RuntimeService;
 import org.camunda.bpm.engine.impl.calendar.DateTimeUtil;
 import org.camunda.bpm.engine.impl.cfg.ProcessEngineConfigurationImpl;
+import org.camunda.bpm.engine.impl.db.sql.DbSqlSessionFactory;
+import org.camunda.bpm.engine.impl.test.RequiredDatabase;
 import org.camunda.bpm.engine.impl.util.ClockUtil;
 import org.camunda.bpm.engine.repository.ProcessDefinition;
 import org.camunda.bpm.engine.rest.dto.CountResultDto;
@@ -59,7 +61,6 @@
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
-import org.junit.experimental.categories.Category;
 
 /**
  * @author roman.smirnov
@@ -502,7 +503,7 @@ public void testQueryWithIntegerVariable() {
   @Deployment(resources = {
     "processes/variables-process.bpmn"
   })
-  @Category(SlowMariaDbTest.class)
+  @RequiredDatabase(excludes = {DbSqlSessionFactory.MYSQL, DbSqlSessionFactory.MARIADB})
   public void testQueryWithComplexVariableFilter() {
     // given
     startProcessInstances("variableProcess", 2);