Skip to content

Commit e95e067

Browse files
committed
Adapt Quarkus build to test only necessary ORM bits
1 parent ac3b528 commit e95e067

File tree

3 files changed

+14
-101
lines changed

3 files changed

+14
-101
lines changed

ci/jpa-3.2-tck.Jenkinsfile

Lines changed: 0 additions & 93 deletions
This file was deleted.

ci/quarkus.Jenkinsfile

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@ pipeline {
1818
buildDiscarder(logRotator(numToKeepStr: '3', artifactNumToKeepStr: '3'))
1919
disableConcurrentBuilds(abortPrevious: true)
2020
}
21-
environment {
22-
MAVEN_OPTS = '-Xmx2g -XX:MaxMetaspaceSize=1g'
23-
}
2421
stages {
2522
stage('Build') {
2623
steps {
@@ -33,11 +30,19 @@ pipeline {
3330
).trim()
3431
}
3532
dir('.release/quarkus') {
36-
// checkout scmGit(branches: [[name: '*/orm-update']], extensions: [], userRemoteConfigs: [[credentialsId: 'ed25519.Hibernate-CI.github.com', url: 'https://github.com/beikov/quarkus.git']])
37-
checkout scmGit(branches: [[name: '*/main']], extensions: [], userRemoteConfigs: [[credentialsId: 'ed25519.Hibernate-CI.github.com', url: 'https://github.com/quarkusio/quarkus.git']])
33+
sh "git clone -b 3.2 --single-branch https://github.com/quarkusio/quarkus.git . || git reset --hard && git clean -fx && git pull"
3834
sh "sed -i 's@<hibernate-orm.version>.*</hibernate-orm.version>@<hibernate-orm.version>${env.HIBERNATE_VERSION}</hibernate-orm.version>@' bom/application/pom.xml"
39-
sh './mvnw -Dquickly install'
40-
sh './mvnw -pl :quarkus-hibernate-orm -amd -pl "!integration-tests/kafka-oauth-keycloak" verify -Dstart-containers -Dtest-containers'
35+
// Need to override the default maven configuration this way, because there is no other way to do it
36+
sh "sed -i 's/-Xmx5g/-Xmx1920m/' ./.mvn/jvm.config"
37+
sh "echo -e '\\n-XX:MaxMetaspaceSize=768m'>>./.mvn/jvm.config"
38+
sh "./mvnw -Dquickly install"
39+
// Need to kill the gradle daemons started during the Maven install run
40+
sh "pkill -f '.*GradleDaemon.*' || true"
41+
// Need to override the default maven configuration this way, because there is no other way to do it
42+
sh "sed -i 's/-Xmx1920m/-Xmx1372m/' ./.mvn/jvm.config"
43+
sh "sed -i 's/MaxMetaspaceSize=768m/MaxMetaspaceSize=512m/' ./.mvn/jvm.config"
44+
def excludes = "'!integration-tests/kafka-oauth-keycloak,!integration-tests/kafka-sasl-elytron,!integration-tests/hibernate-search-orm-opensearch,!integration-tests/maven,!docs,!integration-tests/mongodb-client,!integration-tests/mongodb-panache,!integration-tests/mongodb-panache-kotlin,!integration-tests/mongodb-devservices,!integration-tests/mongodb-rest-data-panache,!integration-tests/liquibase-mongodb,!extensions/mongodb-client/deployment,!extensions/liquibase-mongodb/deployment,!extensions/panache/mongodb-panache/deployment,!extensions/panache/mongodb-panache-kotlin/deployment,!extensions/panache/mongodb-panache-kotlin/runtime,!extensions/panache/mongodb-rest-data-panache/deployment,!extensions/panache/mongodb-panache-common/deployment'"
45+
sh "TESTCONTAINERS_RYUK_CONTAINER_PRIVILEGED=true ./mvnw -pl :quarkus-hibernate-orm -amd -pl ${excludes} verify -Dstart-containers -Dtest-containers -Dskip.gradle.build"
4146
}
4247
}
4348
}

ci/release/Jenkinsfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,8 @@ pipeline {
6262
def secondLastCommitter = sh(script: 'git show -s --format=\'%an\' HEAD~1', returnStdout: true).trim()
6363
if (lastCommitter == 'Hibernate-CI' && secondLastCommitter == 'Hibernate-CI') {
6464
print "INFO: Release skipped because last commits were for the previous release"
65-
currentBuild.result = 'ABORTED'
65+
currentBuild.getRawBuild().getExecutor().interrupt(Result.NOT_BUILT)
66+
sleep(1) // Interrupt is not blocking and does not take effect immediately.
6667
return
6768
}
6869

0 commit comments

Comments
 (0)