merge: #12441 #12449

12441: deps(maven): bump maven-dependency-analyzer from 1.13.0 to 1.13.1 r=npepinpe a=dependabot[bot] Bumps [maven-dependency-analyzer](https://github.com/apache/maven-dependency-analyzer) from 1.13.0 to 1.13.1. <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/apache/maven-dependency-analyzer/commit/54a53397f1f286804cb9ee340ed0243df4d00eb0"><code>54a5339</code></a> [maven-release-plugin] prepare release maven-dependency-analyzer-1.13.1</li> <li><a href="https://github.com/apache/maven-dependency-analyzer/commit/9c05199709db540441a05578d4727d2a3b6326f8"><code>9c05199</code></a> [MSHARED-1149] Replace System.out by logger</li> <li><a href="https://github.com/apache/maven-dependency-analyzer/commit/93f9e364970d50e4afea06ec0280991070d81d24"><code>93f9e36</code></a> [MSHARED-1224] Prefer JDK classes to Plexus utils (<a href="https://redirect.github.com/apache/maven-dependency-analyzer/issues/81">#81</a>)</li> <li><a href="https://github.com/apache/maven-dependency-analyzer/commit/0cfe70fcbc00a57c10fbf82890ffdd925d284bad"><code>0cfe70f</code></a> [MSHARED-1205] Build on JDK 19, 20</li> <li><a href="https://github.com/apache/maven-dependency-analyzer/commit/9739f21104175ba0fd7c5b53d088cf21618ae8d9"><code>9739f21</code></a> [MSHARED-1219] Upgrade Parent to 39 - code reformat</li> <li><a href="https://github.com/apache/maven-dependency-analyzer/commit/0ce92bbcb8bd9b9a6efc4be21d1b4a8bee8ab2db"><code>0ce92bb</code></a> [MSHARED-1219] Upgrade Parent to 39</li> <li><a href="https://github.com/apache/maven-dependency-analyzer/commit/f72c12244669a8fb4a0a8c37d7adc9088506a737"><code>f72c122</code></a> [MSHARED-1220] Refresh download page</li> <li><a href="https://github.com/apache/maven-dependency-analyzer/commit/2ce51238d78ddf2093455cc763f81c5a7f66ea99"><code>2ce5123</code></a> Disable merge button, add jira autolink</li> <li><a href="https://github.com/apache/maven-dependency-analyzer/commit/5155be74246574895ede47aa10f8594ce3511075"><code>5155be7</code></a> [MSHARED-1218] Bump asm from 9.4 to 9.5 (<a href="https://redirect.github.com/apache/maven-dependency-analyzer/issues/83">#83</a>)</li> <li><a href="https://github.com/apache/maven-dependency-analyzer/commit/03725618e1d03d7a9d0ac9b83dd1286123f8c0b3"><code>0372561</code></a> Bump asm from 9.3 to 9.4 (<a href="https://redirect.github.com/apache/maven-dependency-analyzer/issues/70">#70</a>)</li> <li>Additional commits viewable in <a href="https://github.com/apache/maven-dependency-analyzer/compare/maven-dependency-analyzer-1.13.0...maven-dependency-analyzer-1.13.1">compare view</a></li> </ul> </details> <br /> [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.apache.maven.shared:maven-dependency-analyzer&package-manager=maven&previous-version=1.13.0&new-version=1.13.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting ``@dependabot` rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - ``@dependabot` rebase` will rebase this PR - ``@dependabot` recreate` will recreate this PR, overwriting any edits that have been made to it - ``@dependabot` merge` will merge this PR after your CI passes on it - ``@dependabot` squash and merge` will squash and merge this PR after your CI passes on it - ``@dependabot` cancel merge` will cancel a previously requested merge and block automerging - ``@dependabot` reopen` will reopen this PR if it is closed - ``@dependabot` close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - ``@dependabot` ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - ``@dependabot` ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - ``@dependabot` ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details> 12449: [Backport stable/8.0] ci(integration): split module and integration test jobs r=npepinpe a=megglos # Description Backport of #12406 to `stable/8.1`. relates to #12028 Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Nicolas Pepin-Perreault <nicolas.pepin-perreault@camunda.com> Co-authored-by: Meggle (Sebastian Bathke) <sebastian.bathke@camunda.com>
camunda · Apr 20, 2023 · 40c81a7 · 40c81a7
3 parents b0d0c64 + e81f69c + 96130ac
commit 40c81a7
Show file tree

Hide file tree

Showing 9 changed files with 76 additions and 74 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -20,71 +20,38 @@ defaults:
 
 jobs:
   integration-tests:
-    name: Integration tests
-    runs-on: [ self-hosted, linux, "16" ]
-    timeout-minutes: 45
-    env:
-      TC_CLOUD_LOGS_VERBOSE: true
-      TC_CLOUD_TOKEN: ${{ secrets.TC_CLOUD_TOKEN }}
-      TC_CLOUD_CONCURRENCY: 2
-      ZEEBE_TEST_DOCKER_IMAGE: localhost:5000/camunda/zeebe:current-test
-    services:
-      registry:
-        image: registry:2
-        ports:
-          - 5000:5000
-    steps:
-      - uses: actions/checkout@v3
-      - uses: ./.github/actions/setup-zeebe
-        with:
-          maven-cache: 'true'
-      - uses: ./.github/actions/build-zeebe
-        id: build-zeebe
-        with:
-          maven-extra-args: -T1C
-      - uses: ./.github/actions/build-docker
-        with:
-          repository: localhost:5000/camunda/zeebe
-          version: current-test
-          push: true
-          distball: ${{ steps.build-zeebe.outputs.distball }}
-      - name: Prepare Testcontainers Cloud agent
-        if: env.TC_CLOUD_TOKEN != ''
-        run: |
-          curl -L -o agent https://app.testcontainers.cloud/download/testcontainers-cloud-agent_linux_x86-64
-          chmod +x agent
-          ./agent --private-registry-url=http://localhost:5000 '--private-registry-allowed-image-name-globs=*,*/*' > .testcontainers-agent.log 2>&1 &
-          ./agent wait
-      - name: Create build output log file
-        run: echo "BUILD_OUTPUT_FILE_PATH=$(mktemp)" >> $GITHUB_ENV
-      - name: Maven Test Build
-        run: >
-          mvn -B -T2 --no-snapshot-updates
-          -D forkCount=5
-          -D maven.javadoc.skip=true
-          -D skipUTs -D skipChecks
-          -D failsafe.rerunFailingTestsCount=3 -D flaky.test.reportDir=failsafe-reports
-          -P parallel-tests,extract-flaky-tests
-          -pl '!qa/update-tests'
-          verify
-          | tee "${BUILD_OUTPUT_FILE_PATH}"
-      - name: Duplicate Test Check
-        uses: ./.github/actions/check-duplicate-tests
-        with:
-          buildOutputFilePath: ${{ env.BUILD_OUTPUT_FILE_PATH }}
-      - name: Upload test artifacts
-        uses: ./.github/actions/collect-test-artifacts
-        if: always()
-        with:
-          name: Integration Tests
-  qa-update-tests:
-    name: QA Update tests
-    runs-on: [ self-hosted, linux, "16" ]
-    timeout-minutes: 45
+    name: "[IT] ${{ matrix.name }}"
+    timeout-minutes: 20
+    runs-on: [ self-hosted, linux, amd64, "16" ]
+    strategy:
+      fail-fast: false
+      matrix:
+        group: [ modules, qa-integration, qa-update ]
+        include:
+          - group: modules
+            name: "Module Integration Tests"
+            maven-modules: "'!qa/integration-tests,!qa/update-tests'"
+            maven-build-threads: 2
+            maven-test-fork-count: 7
+            tcc-enabled: 'false'
+          - group: qa-integration
+            name: "QA Integration Tests"
+            maven-modules: "qa/integration-tests"
+            maven-build-threads: 1
+            maven-test-fork-count: 10
+            tcc-enabled: 'true'
+            tcc-concurrency: 3
+          - group: qa-update
+            name: "QA Update Tests"
+            maven-modules: "qa/update-tests"
+            maven-build-threads: 1
+            maven-test-fork-count: 10
+            tcc-enabled: 'true'
+            tcc-concurrency: 2
     env:
       TC_CLOUD_LOGS_VERBOSE: true
-      TC_CLOUD_TOKEN: ${{ secrets.TC_CLOUD_TOKEN }}
-      TC_CLOUD_CONCURRENCY: 2
+      TC_CLOUD_TOKEN: ${{ matrix.tcc-enabled == 'true' && secrets.TC_CLOUD_TOKEN || '' }}
+      TC_CLOUD_CONCURRENCY: ${{ matrix.tcc-concurrency }}
       ZEEBE_TEST_DOCKER_IMAGE: localhost:5000/camunda/zeebe:current-test
     services:
       registry:
@@ -117,12 +84,13 @@ jobs:
         run: echo "BUILD_OUTPUT_FILE_PATH=$(mktemp)" >> $GITHUB_ENV
       - name: Maven Test Build
         run: >
-          mvn -B -T2 --no-snapshot-updates
+          mvn -B -T ${{ matrix.maven-build-threads }} --no-snapshot-updates
+          -D forkCount=${{ matrix.maven-test-fork-count }}
           -D maven.javadoc.skip=true
           -D skipUTs -D skipChecks
           -D failsafe.rerunFailingTestsCount=3 -D flaky.test.reportDir=failsafe-reports
           -P parallel-tests,extract-flaky-tests
-          -pl qa/update-tests
+          -pl ${{ matrix.maven-modules }}
           verify
           | tee "${BUILD_OUTPUT_FILE_PATH}"
       - name: Duplicate Test Check
@@ -133,7 +101,7 @@ jobs:
         uses: ./.github/actions/collect-test-artifacts
         if: always()
         with:
-          name: QA Update Tests
+          name: "[IT] ${{ matrix.name }}"
   unit-tests:
     name: Unit tests
     runs-on: [ self-hosted, linux, "16" ]
@@ -172,7 +140,7 @@ jobs:
         with:
           name: "unit tests"
   smoke-tests:
-    name: Smoke tests on ${{ matrix.os }}
+    name: "[Smoke] ${{ matrix.os }}"
     timeout-minutes: 20
     runs-on: ${{ matrix.os }}
     strategy:
@@ -203,7 +171,7 @@ jobs:
         uses: ./.github/actions/collect-test-artifacts
         if: always()
         with:
-          name: Smoke Tests ${{ matrix.os }}
+          name: "[Smoke] ${{ matrix.os }}"
   property-tests:
     name: Property Tests
     runs-on: [ self-hosted, linux, "16" ]
@@ -381,7 +349,6 @@ jobs:
     runs-on: ubuntu-latest
     needs:
       - integration-tests
-      - qa-update-tests
       - unit-tests
       - smoke-tests
       - property-tests
@@ -400,7 +367,6 @@ jobs:
     runs-on: ubuntu-latest
     needs:
       - integration-tests
-      - qa-update-tests
       - unit-tests
       - smoke-tests
       - property-tests

diff --git a/...java/io/atomix/raft/RaftFailOverTest.java → ...t/java/io/atomix/raft/RaftFailOverIT.java b/...java/io/atomix/raft/RaftFailOverTest.java → ...t/java/io/atomix/raft/RaftFailOverIT.java
@@ -29,7 +29,7 @@
 import org.junit.runners.Parameterized.Parameters;
 
 @RunWith(Parameterized.class)
-public class RaftFailOverTest {
+public class RaftFailOverIT {
 
   @Rule @Parameter public RaftRule raftRule;
 

diff --git a/.../java/io/atomix/raft/zeebe/ZeebeTest.java → ...st/java/io/atomix/raft/zeebe/ZeebeIT.java b/.../java/io/atomix/raft/zeebe/ZeebeTest.java → ...st/java/io/atomix/raft/zeebe/ZeebeIT.java
@@ -52,7 +52,7 @@
 import org.junit.runners.Parameterized.Parameters;
 
 @RunWith(Parameterized.class)
-public class ZeebeTest {
+public class ZeebeIT {
 
   // rough estimate of how many entries we'd need to write to fill a segment
   // segments are configured for 1kb, and one entry takes ~30 bytes (plus some metadata I guess)

diff --git a/atomix/pom.xml b/atomix/pom.xml
@@ -74,6 +74,18 @@
           <suppressionsLocation>src/main/resources/suppression.xml</suppressionsLocation>
         </configuration>
       </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-failsafe-plugin</artifactId>
+        <configuration>
+          <includes>
+            <include>**/IT*.java</include>
+            <include>**/*IT.java</include>
+            <include>**/*ITCase.java</include>
+          </includes>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/parent/pom.xml b/parent/pom.xml
@@ -128,7 +128,7 @@
     <plugin.version.build-helper>3.3.0</plugin.version.build-helper>
     <plugin.version.checkstyle>3.1.2</plugin.version.checkstyle>
     <plugin.version.compiler>3.10.1</plugin.version.compiler>
-    <plugin.version.dependency-analyzer>1.13.0</plugin.version.dependency-analyzer>
+    <plugin.version.dependency-analyzer>1.13.1</plugin.version.dependency-analyzer>
     <plugin.version.dependency>3.4.0</plugin.version.dependency>
     <plugin.version.enforcer>3.2.1</plugin.version.enforcer>
     <plugin.version.exec>3.1.0</plugin.version.exec>

diff --git a/protocol-jackson/pom.xml b/protocol-jackson/pom.xml
@@ -40,6 +40,11 @@
       <artifactId>jackson-databind</artifactId>
     </dependency>
 
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-core</artifactId>
+    </dependency>
+
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-api</artifactId>
@@ -65,6 +70,16 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
       </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <configuration>
+          <ignoredNonTestScopedDependencies>
+            <ignoredNonTestScopedDependency>com.fasterxml.jackson.core:jackson-core</ignoredNonTestScopedDependency>
+          </ignoredNonTestScopedDependencies>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/protocol-test-util/pom.xml b/protocol-test-util/pom.xml
@@ -85,6 +85,10 @@
       <artifactId>zeebe-atomix-cluster</artifactId>
     </dependency>
 
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-core</artifactId>
+    </dependency>
   </dependencies>
 
 </project>
diff --git a/test-util/pom.xml b/test-util/pom.xml
@@ -124,6 +124,11 @@
       <artifactId>netty-common</artifactId>
     </dependency>
 
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-buffer</artifactId>
+    </dependency>
+
     <dependency>
       <groupId>org.awaitility</groupId>
       <artifactId>awaitility</artifactId>

diff --git a/transport/pom.xml b/transport/pom.xml
@@ -54,11 +54,11 @@
       <artifactId>assertj-core</artifactId>
       <scope>test</scope>
     </dependency>
+
     <dependency>
       <groupId>io.camunda</groupId>
       <artifactId>zeebe-test-util</artifactId>
       <scope>test</scope>
     </dependency>
-
   </dependencies>
 </project>