Skip to content

Commit

Permalink
Merge pull request quarkus-qe#1533 from michalvavrik/feature/introduc…
Browse files Browse the repository at this point in the history
…e-cache-modules

Move cache extensions from root modules to spread load evenly in matrix (especially as way to mitigate native build OOM in dailys)
  • Loading branch information
michalvavrik authored Nov 20, 2023
2 parents 694a317 + ca5f1cc commit 8bd2f13
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ jobs:
echo "Running modules: ${MODULES_ARG}"
echo "MODULES_MAVEN_PARAM=[\" -pl ${MODULES_ARG} -Dall-modules\"]" >> $GITHUB_OUTPUT
else
echo "MODULES_MAVEN_PARAM=[' -P root-modules,spring-modules,http-modules,test-tooling-modules', ' -P security-modules,sql-db-modules,messaging-modules,websockets-modules,monitoring-modules']" >> $GITHUB_OUTPUT
echo "MODULES_MAVEN_PARAM=[' -P root-modules,cache-modules,spring-modules,http-modules,test-tooling-modules', ' -P security-modules,sql-db-modules,messaging-modules,websockets-modules,monitoring-modules']" >> $GITHUB_OUTPUT
fi
outputs:
MODULES_MAVEN_PARAM: ${{ steps.prepare-modules-mvn-param.outputs.MODULES_MAVEN_PARAM }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/daily.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
java: [ 11, 17 ]
profiles: [ "root-modules,http-modules,security-modules,spring-modules",
"sql-db-modules",
"messaging-modules,websockets-modules,monitoring-modules,test-tooling-modules"]
"messaging-modules,websockets-modules,monitoring-modules,cache-modules,test-tooling-modules"]
steps:
- uses: actions/checkout@v4
- name: Reclaim Disk Space
Expand Down Expand Up @@ -93,7 +93,7 @@ jobs:
java: [ 11 ]
image: [ "ubi-quarkus-graalvmce-builder-image:jdk-17", "ubi-quarkus-mandrel-builder-image:23.0-java17" ]
profiles: [ "root-modules",
"http-modules",
"http-modules,cache-modules",
"security-modules,spring-modules",
"sql-db-modules -pl env-info,sql-db/hibernate,sql-db/sql-app,sql-db/sql-app-compatibility,sql-db/multiple-pus,sql-db/panache-flyway,sql-db/hibernate-reactive",
"sql-db-modules -pl env-info,sql-db/reactive-rest-data-panache,sql-db/vertx-sql,sql-db/reactive-vanilla,sql-db/hibernate-fulltext-search,sql-db/narayana-transactions",
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/quarkus-snapshot.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
matrix:
profiles: [ "root-modules-no-qute,monitoring-modules,spring-modules,test-tooling-modules",
"http-modules",
"security-modules",
"security-modules,cache-modules",
"sql-db-modules",
"messaging-modules-no-kafka,websockets-modules"]

Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ The following subsections will introduce how to deploy and run the test suite in
If you have a look the main `pom.xml` you will notice that there are several profiles or in other words the test suite is a maven monorepo that you can compile and verify at once or by topics. Let's review the main profiles:

* root-modules: talk about Quarkus "core stuff" as configuration or properties. Is a basic stuff that should work as a pre-requisite to other modules.
* cache-modules: cover Quarkus application data caching
* http-modules: talk about HTTP extensions and no-application endpoints like `/q/health`
* security-modules: cover all security stuff like OAuth, JWT, OpenId, Keycloak etc
* messaging-modules: is focus on brokers as Kafka or Artemis-AMQP
Expand Down
18 changes: 14 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -410,11 +410,9 @@
<module>lifecycle-application</module>
<module>external-applications</module>
<module>scheduling/quartz</module>
<module>infinispan-client</module>
<module>super-size/many-extensions</module>
<module>quarkus-cli</module>
<module>logging/jboss</module>
<module>cache/caffeine</module>
<module>qute/multimodule</module>
<module>qute/synchronous</module>
<module>qute/reactive</module>
Expand All @@ -436,14 +434,26 @@
<module>lifecycle-application</module>
<module>external-applications</module>
<module>scheduling/quartz</module>
<module>infinispan-client</module>
<module>super-size/many-extensions</module>
<module>quarkus-cli</module>
<module>logging/jboss</module>
<module>cache/caffeine</module>
<module>build-time-analytics</module>
</modules>
</profile>
<profile>
<id>cache-modules</id>
<activation>
<activeByDefault>true</activeByDefault>
<property>
<name>all-modules</name>
</property>
</activation>
<modules>
<module>env-info</module>
<module>cache/caffeine</module>
<module>infinispan-client</module>
</modules>
</profile>
<profile>
<id>http-modules</id>
<activation>
Expand Down

0 comments on commit 8bd2f13

Please sign in to comment.