You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2024/04/05 12:03:36 UTC
(camel) branch devel-camel-20383 updated (b3bb5ac0893 -> d05d79d4dfc)
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a change to branch devel-camel-20383
in repository https://gitbox.apache.org/repos/asf/camel.git
discard b3bb5ac0893 More small fixes
discard 30ecd8aa73d More small fixes
discard cd2e1e38bb2 More small fixes
discard e89df9167a1 More small fixes
discard 307b85fe579 More small fixes
new d05d79d4dfc Fixed build on the CI
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (b3bb5ac0893)
\
N -- N -- N refs/heads/devel-camel-20383 (d05d79d4dfc)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
(camel) 01/01: Fixed build on the CI
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch devel-camel-20383
in repository https://gitbox.apache.org/repos/asf/camel.git
commit d05d79d4dfcc33639ae4d3f76238555602007a8b
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Fri Apr 5 13:39:54 2024 +0200
Fixed build on the CI
Also temporarily disabled a few steps to prevent problems for the actual jobs
---
Jenkinsfile.matrix.platform | 30 +++++++++++++-----------------
1 file changed, 13 insertions(+), 17 deletions(-)
diff --git a/Jenkinsfile.matrix.platform b/Jenkinsfile.matrix.platform
index 7e12dd485ab..04ebb4efd7d 100644
--- a/Jenkinsfile.matrix.platform
+++ b/Jenkinsfile.matrix.platform
@@ -105,29 +105,25 @@ pipeline {
}
stage('Build & Install') {
- /*when {
- branch 'main'
- }*/
steps {
echo "Do Build for ${PLATFORM}-${JDK_NAME}"
sh 'java -version'
- script {
- if(${PLATFORM} == "ubuntu"){
- sh "./mvnw -U $MAVEN_PARAMS -Dskip.camel.maven.plugin.tests -Darchetype.test.skip -Dmaven.test.skip.exec=true clean install"
- } else {
- sh "./mvnw -U $MAVEN_PARAMS -Dskip.camel.maven.plugin.tests -Dquickly clean install"
- }
- }
+ sh "./mvnw -U $MAVEN_PARAMS -Dskip.camel.maven.plugin.tests -Darchetype.test.skip -Dmaven.test.skip.exec=true clean install"
}
}
-
- script {
- if("${PLATFORM}" == "ubuntu") {
- stage('Code Quality Review') {
- steps {
+
+ stage('Code Quality Review') {
+ steps {
+ script {
+ if ("${PLATFORM}" == "ubuntu") {
withCredentials([string(credentialsId: 'apache-camel-core', variable: 'SONAR_TOKEN')]) {
- 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 org.sonarsource.scanner.maven:sonar-maven-plugin:sonar"
+ /*
+ * 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 org.sonarsource.scanner.maven:sonar-maven-plugin:sonar"
+ */
+ echo "Code quality review ENABLED for ${PLATFORM}"
}
+ } else {
+ echo "Code quality review disabled for ${PLATFORM}"
}
}
}
@@ -139,7 +135,7 @@ pipeline {
sh 'java -version'
timeout(unit: 'HOURS', time: 7) {
script {
- if(${PLATFORM} == "ubuntu"){
+ if (${PLATFORM} == "ubuntu"){
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}"
} else{