WIP

jamesnetherton · May 29, 2024 · bd48046 · bd48046
1 parent bf388f0
commit bd48046
Show file tree

Hide file tree

Showing 2 changed files with 58 additions and 76 deletions.
diff --git a/.github/workflows/ci-build.yaml b/.github/workflows/ci-build.yaml
@@ -61,7 +61,7 @@ env:
 
 jobs:
   pre-build-checks:
-    if: github.repository == 'apache/camel-quarkus'
+    if: github.repository == 'jamesnetherton/camel-quarkus'
     runs-on: ubuntu-latest
     outputs:
       continue-build: ${{ steps.pre-build-checks.outputs.continue-build }}
@@ -187,15 +187,6 @@ jobs:
         run: |
           CATEGORIES=$(yq -M -N -I 0 -o=json e 'keys' tooling/scripts/test-categories.yaml | tr '"' "'")
           echo "matrix={'category': ${CATEGORIES}}" >> $GITHUB_OUTPUT
-      - name: Setup Alternate JVM Matrix
-        id: set-alternate-jvm-matrix
-        shell: bash
-        run: |
-          cd integration-tests
-          mvn help:evaluate -Dexpression=project.modules -N -q -DforceStdout | sed -e 's/<[^>]*>//g' -e 's/^[[:space:]]*//' -e '/^$/d' > ${{ runner.temp }}/itest-modules.txt
-          GROUP1_MODULES=$(cat ${{ runner.temp }}/itest-modules.txt | grep -E '^[a-m].*' | tr '\n' ',' | sed 's/,$//')
-          GROUP2_MODULES=$(cat ${{ runner.temp }}/itest-modules.txt | grep -E '^[n-z].*' | tr '\n' ',' | sed 's/,$//')
-          echo "alternate-jvm-matrix={'include': [{'name': 'group-01', 'modules': '${GROUP1_MODULES}'},{'name': 'group-02', 'modules': '${GROUP2_MODULES}'}]}" >> $GITHUB_OUTPUT
       - name: Setup Examples Matrix
         id: set-examples-matrix
         run: |
@@ -292,7 +283,7 @@ jobs:
 
   functional-extension-tests:
     runs-on: ubuntu-latest
-    needs: initial-mvn-install
+    needs: native-tests
     if: github.event_name != 'pull_request' || !contains(github.event.pull_request.labels.*.name, 'JVM')
     env:
       MAVEN_OPTS: -Xmx3000m
@@ -381,7 +372,7 @@ jobs:
 
   extensions-jvm-tests:
     runs-on: ubuntu-latest
-    needs: initial-mvn-install
+    needs: native-tests
     strategy:
       fail-fast: false
       matrix:
@@ -425,13 +416,10 @@ jobs:
           test-report-xml-base-dir: integration-tests-jvm
 
   integration-tests-alternative-jdk:
-    name: Integration Tests Alternative JDK 21 ${{matrix.name}}
+    name: Integration Tests Alternative JDK 21
     runs-on: ubuntu-latest
     needs: initial-mvn-install
     if: github.event_name != 'pull_request' || !contains(github.event.pull_request.labels.*.name, 'JVM')
-    strategy:
-      fail-fast: false
-      matrix: ${{ fromJson(needs.initial-mvn-install.outputs.alternate-jvm-matrix) }}
     env:
       MAVEN_OPTS: -Xmx3000m
     steps:
@@ -461,12 +449,9 @@ jobs:
           df -h /
       - name: cd integration-tests && mvn clean verify
         shell: bash
-        env:
-          TEST_MODULES: ${{matrix.modules}}
         run: |
           cd integration-tests
           ../mvnw ${CQ_MAVEN_ARGS} ${BRANCH_OPTIONS} \
-            -pl "${TEST_MODULES// /,}" \
             -Dformatter.skip -Dimpsort.skip -Denforcer.skip \
             --fail-at-end \
             clean verify

diff --git a/tooling/scripts/test-categories.yaml b/tooling/scripts/test-categories.yaml
@@ -18,21 +18,27 @@
 # Association of test categories and integration test modules. Used by GitHub workflows. Keep sorted alphabetically.
 group-01:
   - caffeine
-  - qdrant
+  - compression-grouped
+  - disruptor
+  - flatpack
   - git
   - google-storage
+  - grok
   - hazelcast
   - http-grouped
   - infinispan
   - infinispan-quarkus-client
   - jcache
   - jms-artemis-client
   - jms-ibmmq-client
+  - jolt
   - jsch
-  - microprofile-fault-tolerance
+  - jsonata
   - kafka
   - kafka-sasl
+  - microprofile-fault-tolerance
   - mllp
+  - qdrant
 group-02:
   - aws2
   - google-bigquery
@@ -43,16 +49,21 @@ group-02:
   - jfr
   - jdbc-grouped
   - kafka-oauth
+  - mustache
+  - netty
   - oaipmh
   - pubnub
   - protobuf
+  - qute
   - smallrye-reactive-messaging
   - sql
 group-03:
+  - aws2-grouped
   - bean-validator
   - box
-  - foundation-grouped
   - core-discovery-disabled
+  - csimple
+  - foundation-grouped
   - freemarker
   - github
   - google
@@ -66,11 +77,17 @@ group-03:
   - main-xml-io
   - main-xml-jaxb
   - main-yaml
+  - quartz-clustered
+  - platform-http
+  - reactive-streams
   - shiro
   - validator
 group-04:
   - arangodb
   - debezium
+  - camel-k-runtime
+  - camel-k-runtime-model-reifier
+  - camel-k-runtime-shutdown
   - cassandraql
   - couchdb
   - influxdb
@@ -81,7 +98,12 @@ group-04:
   - minio
   - mongodb-grouped
   - mybatis
+  - nitrite
+  - openapi-java
+  - paho-mqtt5
+  - pgevent
   - sjms-artemis-client
+  - twilio
 group-05:
   - avro
   - base64
@@ -94,16 +116,22 @@ group-05:
   - hl7
   - jaxb
   - mapstruct
-  - ssh
+  - servlet
+  - smb
   - soap
-  - xmlsecurity
+  - ssh
+  - stringtemplate
   - syslog
+  - xmlsecurity
 group-06:
   - exec
   - file
+  - fhir
+  - groovy-dsl
   - headersmap
-  - jta
+  - jasypt
   - jsonpath
+  - jta
   - kamelet
   - lra
   - micrometer
@@ -129,21 +157,33 @@ group-07:
   - sjms2-artemis-client
   - sjms2-qpid-amqp-client
   - stax
+  - tarfile
+  - univocity-parsers
+  - velocity
   - weather
 group-08:
   - azure-grouped
   - crypto
   - jq
+  - knative
+  - knative-channel-consumer
+  - knative-endpoint-consumer
+  - knative-event-consumer
+  - knative-producer
+  - kotlin-dsl
   - master
   - master-file
   - master-openshift
   - pdf
+  - rest
+  - rest-openapi
   - saxon
   - syndication
   - telegram
   - tika
   - twitter
   - vertx
+  - vertx-websocket
   - xml-jaxp
   - zendesk
 group-09:
@@ -152,13 +192,20 @@ group-09:
   - debug
   - ftp
   - graphql
+  - java-joor-dsl
+  - jira
+  - js-dsl
   - jt400
   - jt400-mocked
   - kafka-sasl-ssl
   - kafka-ssl
   - paho
   - management
   - nats
+  - salesforce
+  - sap-netweaver
+  - servicenow
+  - slack
   - spring-rabbitmq
   - xchange
   - xpath
@@ -172,64 +219,14 @@ group-10:
   - groovy
   - joor
   - kotlin
+  - kubernetes
   - mail
   - main-unknown-args-fail
   - main-unknown-args-ignore
   - microprofile-health
   - platform-http-proxy
   - platform-http-proxy-ssl
   - swift
-group-11:
-  - compression-grouped
-  - disruptor
-  - flatpack
-  - grok
-  - jolt
-  - jsonata
-  - mustache
-  - netty
-  - qute
-  - servlet
-  - smb
-  - stringtemplate
-  - tarfile
-  - univocity-parsers
-  - velocity
   - xj
   - xml-grouped
   - xslt-saxon
-group-12:
-  - aws2-grouped
-  - csimple
-  - quartz-clustered
-  - knative
-  - knative-channel-consumer
-  - knative-endpoint-consumer
-  - knative-event-consumer
-  - knative-producer
-  - openapi-java
-  - paho-mqtt5
-  - platform-http
-  - reactive-streams
-  - rest
-  - rest-openapi
-  - vertx-websocket
-group-13:
-  - camel-k-runtime
-  - camel-k-runtime-model-reifier
-  - camel-k-runtime-shutdown
-  - fhir
-  - groovy-dsl
-  - jasypt
-  - jira
-  - java-joor-dsl
-  - js-dsl
-  - kotlin-dsl
-  - kubernetes
-  - salesforce
-  - sap-netweaver
-  - servicenow
-  - slack
-  - nitrite
-  - twilio
-  - pgevent