setup for merge queues

Author: toptobes

.github/workflows/_astra-integration-tests.yml

@@ -3,10 +3,6 @@ name: Run integration tests against Astra
 on:
   workflow_call:
   workflow_dispatch:
-  pull_request: # temporary until it's merged
-    branches: [ KG-ci-additions ]
-  push:
-    branches: [ KG-ci-additions ]
 
 permissions:
   id-token: write

.github/workflows/_docs-compile-tests.yml

@@ -3,10 +3,6 @@ name: Compile against documentation examples
 on:
   workflow_call:
   workflow_dispatch:
-#  pull_request: # temporary until it's merged
-#    branches: [ KG-ci-additions ]
-#  push:
-#    branches: [ KG-ci-additions ]
 
 jobs:
   test-compilation:

.github/workflows/_hcd-integration-tests.yml

@@ -3,10 +3,6 @@ name: Run integration tests against HCD
 on:
   workflow_call:
   workflow_dispatch:
-  pull_request: # temporary until it's merged
-    branches: [ KG-ci-additions ]
-  push:
-    branches: [ KG-ci-additions ]
 
 permissions:
   id-token: write

.github/workflows/tests.yml

@@ -2,15 +2,20 @@ name: Tests
 
 on:
   merge_group:
-  pull_request:
+#  pull_request:
+  pull_request: # temporary until it's merged
+    branches: [ KG-ci-additions ]
+  push:
+    branches: [ KG-ci-additions ]
 
 # alias act='act --container-architecture linux/amd64 -P ubuntu-latest=quay.io/jamezp/act-maven'
 
 jobs:
   run-unit-tests:
     name: Run unit tests
     uses: ./.github/workflows/_unit-tests.yml
-#    with:
+    with:
+      java_versions: '"17","21"'
 #      java_versions: ${{ github.event_name == 'merge_group' && '"17","21"' || '"17"' }}
 
   run-docs-compilation-tests:
@@ -27,6 +32,13 @@ jobs:
     uses: ./.github/workflows/_hcd-integration-tests.yml
     secrets: inherit
 
+  run-astra-integration-tests:
+    name: Run Astra integration tests
+    needs: [run-unit-tests]
+    if: github.event_name == 'merge_group'
+    uses: ./.github/workflows/_hcd-integration-tests.yml
+    secrets: inherit
+
   can-enqueue:
     name: Can enqueue
     needs: [run-unit-tests]
@@ -39,7 +51,7 @@ jobs:
 
   can-merge:
     name: Can merge
-    needs: [run-unit-tests, run-docs-compilation-tests, run-hcd-integration-tests]
+    needs: [run-unit-tests, run-docs-compilation-tests, run-hcd-integration-tests, run-astra-integration-tests]
     if: always() && github.event_name == 'merge_group'
     runs-on: ubuntu-latest
     steps: