Merge branch 'master' into concurrent-compaction

apache · Oct 19, 2023 · 8168f7e · 8168f7e
2 parents 95dce16 + 5752a1a
commit 8168f7e
Show file tree

Hide file tree

Showing 367 changed files with 14,728 additions and 6,706 deletions.
diff --git a/.github/workflows/reusable-revised-its.yml b/.github/workflows/reusable-revised-its.yml
@@ -132,6 +132,7 @@ jobs:
           docker images
 
       - name: Run IT
+        id: run-it
         run: ${{ inputs.script }}
 
       - name: Collect docker logs on failure
@@ -157,7 +158,7 @@ jobs:
       - name: Collect service logs on failure
         if: ${{ failure() && steps.run-it.conclusion == 'failure' }}
         run: |
-          tar cvzf ./service-logs.tgz ~/shared/logs
+          tar cvzf ./service-logs.tgz integration-tests-ex/cases/target/${{ inputs.it }}/logs
 
       - name: Upload Druid service logs to GitHub
         if: ${{ failure() && steps.run-it.conclusion == 'failure' }}

diff --git a/.github/workflows/unit-and-integration-tests-unified.yml b/.github/workflows/unit-and-integration-tests-unified.yml
@@ -121,6 +121,7 @@ jobs:
     name: "unit tests (jdk${{ matrix.jdk }}, sql-compat=true)"
     uses: ./.github/workflows/unit-tests.yml
     needs: unit-tests
+    if: ${{ always() && (needs.unit-tests.result == 'success' || needs.unit-tests.outputs.continue_tests) }}
     with:
       jdk: ${{ matrix.jdk }}
       sql_compatibility: true