This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 4e7fce7864d9 chore(ci): merge Jenkins quality into test
4e7fce7864d9 is described below
commit 4e7fce7864d9c96d3c4fd22e2ea1ffa4347dfab0
Author: Pasquale Congiusti <[email protected]>
AuthorDate: Mon Jan 19 11:31:08 2026 +0100
chore(ci): merge Jenkins quality into test
* Includes IT test verification for coverage
* Speed up the execution by doing test only once
Closes CAMEL-22877
---
Jenkinsfile | 29 +++++++++--------------------
parent/pom.xml | 5 +++--
2 files changed, 12 insertions(+), 22 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index ce527529afbd..462c92ce71a1 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -139,26 +139,7 @@ pipeline {
}
}
- stage('Code Quality Review') {
- steps {
- script {
- if ("${PLATFORM}" == "ubuntu-avx") {
- if ("${JDK_NAME}" == "jdk_17_latest") {
- withCredentials([string(credentialsId:
'apache-camel-core', variable: 'SONAR_TOKEN')]) {
- echo "Code quality review ENABLED
for ${PLATFORM}"
- sh "./mvnw $MAVEN_PARAMS
-Dsonar.host.url=https://sonarcloud.io
-Dsonar.java.experimental.batchModeSizeInKB=2048 -Dsonar.organization=apache
-Dsonar.projectKey=apache_camel -Dsonar.branch.name=$BRANCH_NAME clean test
org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Pcoverage"
- }
- } else {
- echo "Code quality review disabled for
${PLATFORM} with JDK ${JDK_NAME}"
- }
- } else {
- echo "Code quality review disabled for
${PLATFORM} with JDK ${JDK_NAME}"
- }
- }
- }
- }
-
- stage('Test') {
+ stage('Test and Quality') {
steps {
echo "Do Test for ${PLATFORM}-${JDK_NAME}"
timeout(unit: 'HOURS', time: 7) {
@@ -166,12 +147,20 @@ pipeline {
if ("${PLATFORM}" == "ubuntu-avx") {
if ("${JDK_NAME}" == "jdk_21_latest") {
sh "./mvnw $MAVEN_PARAMS
$MAVEN_TEST_PARAMS_UBUNTU -Darchetype.test.skip
-Dmaven.test.failure.ignore=true -Dcheckstyle.skip=true verify
-Dcamel.threads.virtual.enabled=${params.VIRTUAL_THREAD}"
+ echo "Code quality review disabled
for ${PLATFORM} with JDK ${JDK_NAME}"
+ } else if ("${JDK_NAME}" ==
"jdk_17_latest") {
+
withCredentials([string(credentialsId: 'apache-camel-core', variable:
'SONAR_TOKEN')]) {
+ echo "Code quality review
ENABLED for ${PLATFORM} with ${JDK_NAME}"
+ sh "./mvnw $MAVEN_PARAMS
-Dsonar.host.url=https://sonarcloud.io
-Dsonar.java.experimental.batchModeSizeInKB=2048 -Dsonar.organization=apache
-Dsonar.projectKey=apache_camel -Dsonar.branch.name=$BRANCH_NAME clean verify
org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Pcoverage"
+ }
} else {
sh "./mvnw $MAVEN_PARAMS
$MAVEN_TEST_PARAMS -Darchetype.test.skip -Dmaven.test.failure.ignore=true
-Dcheckstyle.skip=true verify"
+ echo "Code quality review disabled
for ${PLATFORM} with JDK ${JDK_NAME}"
}
} else {
// Skip the test case execution of
modules which are either not supported on ppc64le or vendor images are not
available for ppc64le.
sh "./mvnw $MAVEN_PARAMS
$MAVEN_TEST_PARAMS $MAVEN_TEST_PARAMS_ALT_ARCHS -Darchetype.test.skip
-Dmaven.test.failure.ignore=true -Dcheckstyle.skip=true verify -pl '!docs'"
+ echo "Code quality review disabled for
${PLATFORM} with JDK ${JDK_NAME}"
}
}
}
diff --git a/parent/pom.xml b/parent/pom.xml
index 5462563cef87..3c0cf5cdcb66 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -199,6 +199,7 @@
<jaxb-osgi-version>4.0.5</jaxb-osgi-version>
<jaxb-xjc-version>4.0.6</jaxb-xjc-version>
<jaxb-jxc-version>4.0.6</jaxb-jxc-version>
+ <jacoco-version>0.8.14</jacoco-version>
<gmavenplus-plugin-version>4.2.1</gmavenplus-plugin-version>
<google-auth-library-oauth2-http-version>1.41.0</google-auth-library-oauth2-http-version>
<google-api-client-version>2.8.1</google-api-client-version>
@@ -4365,7 +4366,7 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
- <version>0.8.14</version>
+ <version>${jacoco-version}</version>
<executions>
<execution>
<id>prepare-agent</id>
@@ -4378,7 +4379,7 @@
</execution>
<execution>
<id>report</id>
- <phase>test</phase>
+ <phase>verify</phase>
<goals>
<goal>report</goal>
</goals>
