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 14:46:43 UTC
(camel) branch devel-camel-20383 updated (0ff40e3491a -> 6814fbf4073)
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 0ff40e3491a Improve stage name for multi-arch builds
discard d05d79d4dfc Fixed build on the CI
discard f71d04cd435 Fixed few syntax errors.
discard edca299578c Fixed a few syntax errors on the Jenkinsfile
discard 1ffcd9208a2 Fixed license format on the matrix Jenkinsfiles
discard 61ef63c4e9d Updated the pipeline to consolidate all the CI automation in a single file.
discard 107d58ecd3d Martix Jenkins pipeline for CI/CD.
discard fbea21c165e Fixed license format on the Jenkinsfile
discard f7cd8863801 CAMEL-20383: renamed the JDK 17 Jenkinsfile so we can create the matrix job
add c4499beb638 CAMEL-19543 - camel-sjms2: replace Thread.sleep in tests.
add d5e89dacfec CAMEL-20640: Remove unused and old openapi v2 stuff
add 9e563446713 Fixed missing license information on the top of the files
new 14017832bef CAMEL-20383: renamed the JDK 17 Jenkinsfile so we can create the matrix job
new 2e6c3fd4d8a Fixed license format on the Jenkinsfile
new f4e55a407f3 Martix Jenkins pipeline for CI/CD.
new 32aaad2d713 Updated the pipeline to consolidate all the CI automation in a single file.
new e9b3c9345d8 Fixed license format on the matrix Jenkinsfiles
new 5eb1e73bfe0 Fixed a few syntax errors on the Jenkinsfile
new 956552fdf9d Fixed few syntax errors.
new 234515ba147 Fixed build on the CI
new 57f731c8cc1 Improve stage name for multi-arch builds
new 71e6d0901cb Fixed few syntax errors.
new 6814fbf4073 Used single quotes instead of double and removed java -version step.
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 (0ff40e3491a)
\
N -- N -- N refs/heads/devel-camel-20383 (6814fbf4073)
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 11 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:
Jenkinsfile.matrix.platform | 9 ++++-----
.../camel/openapi/DefaultRestDefinitionsResolver.java | 6 ------
.../apache/camel/openapi/RestDefinitionsResolver.java | 2 --
.../org/apache/camel/openapi/RestOpenApiReader.java | 3 ---
.../camel/openapi/jmx/JmxRestDefinitionsResolver.java | 18 ------------------
.../sjms2/consumer/InOnlyTopicDurableConsumerTest.java | 13 +++++++++++--
.../infra/openldap/services/OpenLdapContainer.java | 17 +++++++++++++++++
.../test/infra/redis/services/RedisContainer.java | 17 +++++++++++++++++
8 files changed, 49 insertions(+), 36 deletions(-)
(camel) 03/11: Martix Jenkins pipeline for CI/CD.
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 f4e55a407f3f752a51a13fa5abad54203ac53cf0
Author: Vaishnavi R <va...@var-thinkpadp1gen4i.remote.csb>
AuthorDate: Thu Mar 28 14:42:37 2024 +0530
Martix Jenkins pipeline for CI/CD.
---
Jenkinsfile.matrix.jdk | 115 +++++++++++++++++++++++++++++++++++++
Jenkinsfile.matrix.node | 147 ++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 262 insertions(+)
diff --git a/Jenkinsfile.matrix.jdk b/Jenkinsfile.matrix.jdk
new file mode 100644
index 00000000000..c68d0073a6a
--- /dev/null
+++ b/Jenkinsfile.matrix.jdk
@@ -0,0 +1,115 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+def AGENT_LABEL = env.AGENT_LABEL ?: 'ubuntu'
+//def JDK_NAME = env.JDK_NAME ?: 'jdk_17_latest'
+
+def MAVEN_PARAMS = "-B -e -fae -V -Dnoassembly -Dmaven.compiler.fork=true -Dsurefire.rerunFailingTestsCount=2 -Dfailsafe.rerunFailingTestsCount=1"
+def MAVEN_TEST_PARAMS = env.MAVEN_TEST_PARAMS ?: "-Dci.env.name=apache.org"
+
+pipeline {
+
+ agent {
+ label AGENT_LABEL
+ }
+
+ environment {
+ MAVEN_SKIP_RC = true
+ }
+
+ options {
+ buildDiscarder(
+ logRotator(artifactNumToKeepStr: '5', numToKeepStr: '10')
+ )
+ disableConcurrentBuilds()
+ }
+
+ parameters {
+ booleanParam(name: 'CLEAN', defaultValue: true, description: 'Perform the build in clean workspace'),
+ choice(name: 'JDK_FILTER', choices: ['all', 'jdk_17_latest', 'jdk_21_latest'], description: 'Run on specific jdk')
+ }
+ stages {
+ stage('BuildAndTest') {
+ matrix {
+ when { anyOf {
+ expression { params.JDK_FILTER == 'all' }
+ expression { params.JDK_FILTER == env.JDK_NAME }
+ } }
+ axes {
+ axis {
+ name 'JDK_NAME'
+ values 'jdk_17_latest', 'jdk_21_latest'
+ }
+ }
+ tools {
+ jdk ${JDK_NAME}
+ }
+ stages {
+ stage('Clean workspace') {
+ when {
+ expression { params.CLEAN }
+ }
+ steps {
+ sh 'git clean -fdx'
+ }
+ }
+
+ stage('Build & Install') {
+ steps {
+ echo "Do Build for ${JDK_NAME}"
+ sh 'java -version'
+ sh "./mvnw -U $MAVEN_PARAMS -Dskip.camel.maven.plugin.tests -Darchetype.test.skip -Dmaven.test.skip.exec=true clean install"
+ }
+ }
+
+ stage('Code Quality Review') {
+ steps {
+ 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"
+ }
+ }
+ }
+
+ stage('Test') {
+ steps {
+ echo "Do Test for ${JDK_NAME}"
+ sh 'java -version'
+ timeout(unit: 'HOURS', time: 7) {
+ sh "./mvnw $MAVEN_PARAMS $MAVEN_TEST_PARAMS -Darchetype.test.skip -Dmaven.test.failure.ignore=true -Dcheckstyle.skip=true verify"
+ }
+ }
+ post {
+ always {
+ junit allowEmptyResults: true, testResults: '**/target/surefire-reports/*.xml'
+ junit allowEmptyResults: true, testResults: '**/target/failsafe-reports/*.xml'
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
+ post {
+ always {
+ emailext(
+ subject: '${DEFAULT_SUBJECT}',
+ body: '${DEFAULT_CONTENT}',
+ recipientProviders: [[$class: 'DevelopersRecipientProvider']]
+ )
+ }
+ }
+}
\ No newline at end of file
diff --git a/Jenkinsfile.matrix.node b/Jenkinsfile.matrix.node
new file mode 100644
index 00000000000..f7fea84d4fb
--- /dev/null
+++ b/Jenkinsfile.matrix.node
@@ -0,0 +1,147 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+//def AGENT_LABEL = 'ppc64le'
+//def JDK_NAME = env.JDK_NAME ?: 'jdk_17_latest'
+
+def MAVEN_PARAMS = "-B -e -fae -V -Dnoassembly -Dmaven.compiler.fork=true -Dsurefire.rerunFailingTestsCount=2 -Dfailsafe.rerunFailingTestsCount=1"
+def MAVEN_TEST_PARAMS = env.MAVEN_TEST_PARAMS ?: "-Dkafka.instance.type=local-strimzi-container -Dci.env.name=apache.org"
+/*
+Below parameters are required for camel/core/camel-core module's test cases to pass
+- xpathExprGrpLimit: limits the number of groups an Xpath expression can contain
+- xpathExprOpLimit: limits the number of operators an Xpath expression can contain
+*/
+def MAVEN_TEST_LIMIT_PARAMS = "-Djdk.xml.xpathExprGrpLimit=100 -Djdk.xml.xpathExprOpLimit=2000"
+
+pipeline {
+
+ environment {
+ MAVEN_SKIP_RC = true
+ }
+
+ options {
+ buildDiscarder(
+ logRotator(artifactNumToKeepStr: '5', numToKeepStr: '10')
+ )
+ disableConcurrentBuilds()
+ }
+
+ parameters {
+ booleanParam(name: 'CLEAN', defaultValue: true, description: 'Perform the build in clean workspace'),
+ choice(name: 'AGENT_NODE_FILTER', choices: ['all', 'ppc64le', 's390x'], description: 'Run on specific node'),
+ choice(name: 'JDK_FILTER', choices: ['all', 'jdk_17_latest', 'jdk_21_latest'], description: 'Run on specific jdk')
+ }
+ agent none
+ stages {
+ stage('BuildAndTest') {
+ matrix {
+ agent {
+ label ${AGENT_LABEL}
+ }
+ when { anyOf {
+ expression { params.AGENT_NODE_FILTER == 'all' }
+ expression { params.AGENT_NODE_FILTER == env.AGENT_LABEL }
+ expression { params.JDK_FILTER == 'all' }
+ expression { params.JDK_FILTER == env.JDK_NAME }
+ } }
+ axes {
+ axis {
+ name 'JDK_NAME'
+ values 'jdk_17_latest', 'jdk_21_latest'
+ }
+ axis {
+ name 'AGENT_LABEL'
+ values 'ppc64le', 's390x'
+ }
+ }
+ excludes {
+ exclude {
+ axis {
+ name 'JDK_NAME'
+ values 'jdk_21_latest'
+ }
+ axis {
+ name 'AGENT_LABEL'
+ values 'ppc64le'
+ }
+ }
+ exclude {
+ axis {
+ name 'JDK_NAME'
+ values 'jdk_21_latest'
+ }
+ axis {
+ name 'AGENT_LABEL'
+ values 's390x'
+ }
+ }
+ }
+ tools {
+ jdk ${JDK_NAME}
+ }
+ stages {
+ stage('Clean workspace') {
+ when {
+ expression { params.CLEAN }
+ }
+ steps {
+ sh 'git clean -fdx'
+ }
+ }
+
+ stage('Build & Install') {
+ /*when {
+ branch 'main'
+ }*/
+ steps {
+ echo "Do Build for ${AGENT_LABEL}-${JDK_NAME}"
+ sh 'java -version'
+ sh "./mvnw -U $MAVEN_PARAMS -Dskip.camel.maven.plugin.tests -Dquickly clean install"
+ }
+ }
+
+ stage('Test') {
+ steps {
+ echo "Do Test for ${AGENT_LABEL}-${JDK_NAME}"
+ sh 'java -version'
+ timeout(unit: 'HOURS', time: 7) {
+ // 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_LIMIT_PARAMS -Darchetype.test.skip -Dmaven.test.failure.ignore=true -Dcheckstyle.skip=true verify -pl '!docs'"
+ }
+ }
+ post {
+ always {
+ junit allowEmptyResults: true, testResults: '**/target/surefire-reports/*.xml'
+ junit allowEmptyResults: true, testResults: '**/target/failsafe-reports/*.xml'
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
+ post {
+ always {
+ emailext(
+ subject: '${DEFAULT_SUBJECT}',
+ body: '${DEFAULT_CONTENT}',
+ recipientProviders: [[$class: 'DevelopersRecipientProvider']]
+ )
+ }
+ }
+}
+
(camel) 10/11: Fixed few syntax errors.
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 71e6d0901cb59be177c0c1dda1294a4401ba2f2b
Author: Vaishnavi R <va...@var-thinkpadp1gen4i.remote.csb>
AuthorDate: Fri Apr 5 19:22:33 2024 +0530
Fixed few syntax errors.
---
Jenkinsfile.matrix.platform | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/Jenkinsfile.matrix.platform b/Jenkinsfile.matrix.platform
index 020abcaf3ca..2897ef44a5a 100644
--- a/Jenkinsfile.matrix.platform
+++ b/Jenkinsfile.matrix.platform
@@ -135,10 +135,10 @@ pipeline {
sh 'java -version'
timeout(unit: 'HOURS', time: 7) {
script {
- if (${PLATFORM} == "ubuntu"){
- if(${JDK_NAME} == "jdk_21_latest") {
+ 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{
+ } else {
sh "./mvnw $MAVEN_PARAMS $MAVEN_TEST_PARAMS -Darchetype.test.skip -Dmaven.test.failure.ignore=true -Dcheckstyle.skip=true verify"
}
} else {
(camel) 01/11: CAMEL-20383: renamed the JDK 17 Jenkinsfile so we can create the matrix job
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 14017832bef37df4a9e4f17334bbe2542ddf44a6
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Wed Mar 20 11:16:25 2024 +0100
CAMEL-20383: renamed the JDK 17 Jenkinsfile so we can create the matrix job
---
Jenkinsfile.jdk17 => Jenkinsfile | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/Jenkinsfile.jdk17 b/Jenkinsfile
similarity index 100%
rename from Jenkinsfile.jdk17
rename to Jenkinsfile
(camel) 07/11: Fixed few syntax errors.
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 956552fdf9d41aa692e1befefabd738a28ae7c15
Author: Vaishnavi R <va...@var-thinkpadp1gen4i.remote.csb>
AuthorDate: Fri Apr 5 16:29:57 2024 +0530
Fixed few syntax errors.
---
Jenkinsfile.matrix.platform | 62 ++++++++++++++++++++++++---------------------
1 file changed, 33 insertions(+), 29 deletions(-)
diff --git a/Jenkinsfile.matrix.platform b/Jenkinsfile.matrix.platform
index 7dabd12ea7b..7e12dd485ab 100644
--- a/Jenkinsfile.matrix.platform
+++ b/Jenkinsfile.matrix.platform
@@ -42,7 +42,7 @@ pipeline {
parameters {
booleanParam(name: 'CLEAN', defaultValue: true, description: 'Perform the build in clean workspace')
- booleanParam(name: 'VIRTUAL_THREAD', defaultValue: false, description: 'Perform the build using virtual threads on JDK 21 and newer')
+ booleanParam(name: 'VIRTUAL_THREAD', defaultValue: false, description: 'Perform the build using virtual threads')
choice(name: 'PLATFORM_FILTER', choices: ['all', 'ppc64le', 's390x', 'ubuntu'], description: 'Run on specific platform')
choice(name: 'JDK_FILTER', choices: ['all', 'jdk_17_latest', 'jdk_21_latest'], description: 'Run on specific jdk')
}
@@ -51,16 +51,14 @@ pipeline {
stage('BuildAndTest') {
matrix {
agent {
- label ${PLATFORM}
- }
- when {
- anyOf {
- expression { params.PLATFORM_FILTER == 'all' }
- expression { params.PLATFORM_FILTER == env.PLATFORM }
- expression { params.JDK_FILTER == 'all' }
- expression { params.JDK_FILTER == env.JDK_NAME }
- }
+ label "${PLATFORM}"
}
+ when { anyOf {
+ expression { params.PLATFORM_FILTER == 'all' }
+ expression { params.PLATFORM_FILTER == env.PLATFORM }
+ expression { params.JDK_FILTER == 'all' }
+ expression { params.JDK_FILTER == env.JDK_NAME }
+ } }
axes {
axis {
name 'JDK_NAME'
@@ -94,7 +92,7 @@ pipeline {
}
}
tools {
- jdk ${JDK_NAME}
+ jdk "${JDK_NAME}"
}
stages {
stage('Clean workspace') {
@@ -113,38 +111,44 @@ pipeline {
steps {
echo "Do Build for ${PLATFORM}-${JDK_NAME}"
sh 'java -version'
- 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"
+ 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"
+ }
}
}
}
- if(${PLATFORM} == "ubuntu") {
- stage('Code Quality Review') {
- steps {
- 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"
+ script {
+ if("${PLATFORM}" == "ubuntu") {
+ stage('Code Quality Review') {
+ steps {
+ 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"
+ }
}
}
}
- }
+ }
stage('Test') {
steps {
echo "Do Test for ${PLATFORM}-${JDK_NAME}"
sh 'java -version'
timeout(unit: 'HOURS', time: 7) {
- 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{
- sh "./mvnw $MAVEN_PARAMS $MAVEN_TEST_PARAMS -Darchetype.test.skip -Dmaven.test.failure.ignore=true -Dcheckstyle.skip=true verify"
+ script {
+ 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{
+ sh "./mvnw $MAVEN_PARAMS $MAVEN_TEST_PARAMS -Darchetype.test.skip -Dmaven.test.failure.ignore=true -Dcheckstyle.skip=true verify"
+ }
+ } 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_LIMIT_PARAMS -Darchetype.test.skip -Dmaven.test.failure.ignore=true -Dcheckstyle.skip=true verify -pl '!docs'"
}
- } 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_LIMIT_PARAMS -Darchetype.test.skip -Dmaven.test.failure.ignore=true -Dcheckstyle.skip=true verify -pl '!docs'"
}
}
}
(camel) 05/11: Fixed license format on the matrix Jenkinsfiles
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 e9b3c9345d8a4330bcccc78b6f087281834931b5
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Fri Apr 5 11:28:50 2024 +0200
Fixed license format on the matrix Jenkinsfiles
---
pom.xml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/pom.xml b/pom.xml
index 1e1fe8f3aab..fa8908cfa71 100644
--- a/pom.xml
+++ b/pom.xml
@@ -339,6 +339,8 @@
<Dockerfile.native>SCRIPT_STYLE</Dockerfile.native>
<Dockerfile>SCRIPT_STYLE</Dockerfile>
<Jenkinsfile>SLASHSTAR_STYLE</Jenkinsfile>
+ <Jenkinsfile.matrix.platform>SLASHSTAR_STYLE</Jenkinsfile.matrix.platform>
+ <Jenkinsfile.matrix.jdk>SLASHSTAR_STYLE</Jenkinsfile.matrix.jdk>
<Jenkinsfile.deploy>SLASHSTAR_STYLE</Jenkinsfile.deploy>
<Jenkinsfile.dryrun>SLASHSTAR_STYLE</Jenkinsfile.dryrun>
<Jenkinsfile.jdk17>SLASHSTAR_STYLE</Jenkinsfile.jdk17>
(camel) 08/11: 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 234515ba147bc62fc97b8de17bd18ab9a8df06f5
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{
(camel) 06/11: Fixed a few syntax errors on the Jenkinsfile
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 5eb1e73bfe091f74aef85c3b8c64af3f8ca22daa
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Fri Apr 5 11:40:21 2024 +0200
Fixed a few syntax errors on the Jenkinsfile
---
Jenkinsfile.matrix.platform | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/Jenkinsfile.matrix.platform b/Jenkinsfile.matrix.platform
index ce495830e20..7dabd12ea7b 100644
--- a/Jenkinsfile.matrix.platform
+++ b/Jenkinsfile.matrix.platform
@@ -41,9 +41,9 @@ pipeline {
}
parameters {
- booleanParam(name: 'CLEAN', defaultValue: true, description: 'Perform the build in clean workspace'),
- booleanParam(name: 'VIRTUAL_THREAD', defaultValue: false, description: 'Perform the build using virtual threads')
- choice(name: 'PLATFORM_FILTER', choices: ['all', 'ppc64le', 's390x', 'ubuntu'], description: 'Run on specific platform'),
+ booleanParam(name: 'CLEAN', defaultValue: true, description: 'Perform the build in clean workspace')
+ booleanParam(name: 'VIRTUAL_THREAD', defaultValue: false, description: 'Perform the build using virtual threads on JDK 21 and newer')
+ choice(name: 'PLATFORM_FILTER', choices: ['all', 'ppc64le', 's390x', 'ubuntu'], description: 'Run on specific platform')
choice(name: 'JDK_FILTER', choices: ['all', 'jdk_17_latest', 'jdk_21_latest'], description: 'Run on specific jdk')
}
agent none
@@ -53,12 +53,14 @@ pipeline {
agent {
label ${PLATFORM}
}
- when { anyOf {
- expression { params.PLATFORM_FILTER == 'all' }
- expression { params.PLATFORM_FILTER == env.PLATFORM }
- expression { params.JDK_FILTER == 'all' }
- expression { params.JDK_FILTER == env.JDK_NAME }
- } }
+ when {
+ anyOf {
+ expression { params.PLATFORM_FILTER == 'all' }
+ expression { params.PLATFORM_FILTER == env.PLATFORM }
+ expression { params.JDK_FILTER == 'all' }
+ expression { params.JDK_FILTER == env.JDK_NAME }
+ }
+ }
axes {
axis {
name 'JDK_NAME'
(camel) 02/11: Fixed license format on the Jenkinsfile
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 2e6c3fd4d8a274b0210aaebc69de8389d45de7c2
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Wed Mar 20 11:26:47 2024 +0100
Fixed license format on the Jenkinsfile
---
pom.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/pom.xml b/pom.xml
index 6c1ded35405..1e1fe8f3aab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -338,6 +338,7 @@
<Dockerfile.native-micro>SCRIPT_STYLE</Dockerfile.native-micro>
<Dockerfile.native>SCRIPT_STYLE</Dockerfile.native>
<Dockerfile>SCRIPT_STYLE</Dockerfile>
+ <Jenkinsfile>SLASHSTAR_STYLE</Jenkinsfile>
<Jenkinsfile.deploy>SLASHSTAR_STYLE</Jenkinsfile.deploy>
<Jenkinsfile.dryrun>SLASHSTAR_STYLE</Jenkinsfile.dryrun>
<Jenkinsfile.jdk17>SLASHSTAR_STYLE</Jenkinsfile.jdk17>
(camel) 09/11: Improve stage name for multi-arch builds
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 57f731c8cc191fba8125ea24623dd266658d462c
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Fri Apr 5 14:13:33 2024 +0200
Improve stage name for multi-arch builds
---
Jenkinsfile.matrix.platform | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile.matrix.platform b/Jenkinsfile.matrix.platform
index 04ebb4efd7d..020abcaf3ca 100644
--- a/Jenkinsfile.matrix.platform
+++ b/Jenkinsfile.matrix.platform
@@ -104,7 +104,7 @@ pipeline {
}
}
- stage('Build & Install') {
+ stage("Build ${PLATFORM}-${JDK_NAME}") {
steps {
echo "Do Build for ${PLATFORM}-${JDK_NAME}"
sh 'java -version'
(camel) 04/11: Updated the pipeline to consolidate all the CI automation in a single file.
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 32aaad2d7136879a2d02ed907ebc436d4d3b0a49
Author: Vaishnavi R <va...@var-thinkpadp1gen4i.remote.csb>
AuthorDate: Mon Apr 1 14:10:00 2024 +0530
Updated the pipeline to consolidate all the CI automation in a single file.
---
...file.matrix.node => Jenkinsfile.matrix.platform | 52 ++++++++++++++++------
1 file changed, 38 insertions(+), 14 deletions(-)
diff --git a/Jenkinsfile.matrix.node b/Jenkinsfile.matrix.platform
similarity index 60%
rename from Jenkinsfile.matrix.node
rename to Jenkinsfile.matrix.platform
index f7fea84d4fb..ce495830e20 100644
--- a/Jenkinsfile.matrix.node
+++ b/Jenkinsfile.matrix.platform
@@ -14,11 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-//def AGENT_LABEL = 'ppc64le'
+//def PLATFORM = 'ppc64le'
//def JDK_NAME = env.JDK_NAME ?: 'jdk_17_latest'
def MAVEN_PARAMS = "-B -e -fae -V -Dnoassembly -Dmaven.compiler.fork=true -Dsurefire.rerunFailingTestsCount=2 -Dfailsafe.rerunFailingTestsCount=1"
def MAVEN_TEST_PARAMS = env.MAVEN_TEST_PARAMS ?: "-Dkafka.instance.type=local-strimzi-container -Dci.env.name=apache.org"
+def MAVEN_TEST_PARAMS_UBUNTU = env.MAVEN_TEST_PARAMS ?: "-Dci.env.name=apache.org"
/*
Below parameters are required for camel/core/camel-core module's test cases to pass
- xpathExprGrpLimit: limits the number of groups an Xpath expression can contain
@@ -41,7 +42,8 @@ pipeline {
parameters {
booleanParam(name: 'CLEAN', defaultValue: true, description: 'Perform the build in clean workspace'),
- choice(name: 'AGENT_NODE_FILTER', choices: ['all', 'ppc64le', 's390x'], description: 'Run on specific node'),
+ booleanParam(name: 'VIRTUAL_THREAD', defaultValue: false, description: 'Perform the build using virtual threads')
+ choice(name: 'PLATFORM_FILTER', choices: ['all', 'ppc64le', 's390x', 'ubuntu'], description: 'Run on specific platform'),
choice(name: 'JDK_FILTER', choices: ['all', 'jdk_17_latest', 'jdk_21_latest'], description: 'Run on specific jdk')
}
agent none
@@ -49,11 +51,11 @@ pipeline {
stage('BuildAndTest') {
matrix {
agent {
- label ${AGENT_LABEL}
+ label ${PLATFORM}
}
when { anyOf {
- expression { params.AGENT_NODE_FILTER == 'all' }
- expression { params.AGENT_NODE_FILTER == env.AGENT_LABEL }
+ expression { params.PLATFORM_FILTER == 'all' }
+ expression { params.PLATFORM_FILTER == env.PLATFORM }
expression { params.JDK_FILTER == 'all' }
expression { params.JDK_FILTER == env.JDK_NAME }
} }
@@ -63,8 +65,8 @@ pipeline {
values 'jdk_17_latest', 'jdk_21_latest'
}
axis {
- name 'AGENT_LABEL'
- values 'ppc64le', 's390x'
+ name 'PLATFORM'
+ values 'ppc64le', 's390x', 'ubuntu'
}
}
excludes {
@@ -74,7 +76,7 @@ pipeline {
values 'jdk_21_latest'
}
axis {
- name 'AGENT_LABEL'
+ name 'PLATFORM'
values 'ppc64le'
}
}
@@ -84,7 +86,7 @@ pipeline {
values 'jdk_21_latest'
}
axis {
- name 'AGENT_LABEL'
+ name 'PLATFORM'
values 's390x'
}
}
@@ -107,19 +109,41 @@ pipeline {
branch 'main'
}*/
steps {
- echo "Do Build for ${AGENT_LABEL}-${JDK_NAME}"
+ echo "Do Build for ${PLATFORM}-${JDK_NAME}"
sh 'java -version'
- sh "./mvnw -U $MAVEN_PARAMS -Dskip.camel.maven.plugin.tests -Dquickly clean install"
+ 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"
+ }
+ }
+ }
+
+ if(${PLATFORM} == "ubuntu") {
+ stage('Code Quality Review') {
+ steps {
+ 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"
+ }
+ }
}
}
stage('Test') {
steps {
- echo "Do Test for ${AGENT_LABEL}-${JDK_NAME}"
+ echo "Do Test for ${PLATFORM}-${JDK_NAME}"
sh 'java -version'
timeout(unit: 'HOURS', time: 7) {
- // 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_LIMIT_PARAMS -Darchetype.test.skip -Dmaven.test.failure.ignore=true -Dcheckstyle.skip=true verify -pl '!docs'"
+ 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{
+ sh "./mvnw $MAVEN_PARAMS $MAVEN_TEST_PARAMS -Darchetype.test.skip -Dmaven.test.failure.ignore=true -Dcheckstyle.skip=true verify"
+ }
+ } 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_LIMIT_PARAMS -Darchetype.test.skip -Dmaven.test.failure.ignore=true -Dcheckstyle.skip=true verify -pl '!docs'"
+ }
}
}
post {
(camel) 11/11: Used single quotes instead of double and removed java -version step.
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 6814fbf40730cdcf9d0ae8df47c8d2990feac230
Author: Vaishnavi R <va...@var-thinkpadp1gen4i.remote.csb>
AuthorDate: Fri Apr 5 20:04:41 2024 +0530
Used single quotes instead of double and removed java -version step.
---
Jenkinsfile.matrix.platform | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/Jenkinsfile.matrix.platform b/Jenkinsfile.matrix.platform
index 2897ef44a5a..781ab33141d 100644
--- a/Jenkinsfile.matrix.platform
+++ b/Jenkinsfile.matrix.platform
@@ -104,7 +104,7 @@ pipeline {
}
}
- stage("Build ${PLATFORM}-${JDK_NAME}") {
+ stage('Build ${PLATFORM}-${JDK_NAME}') {
steps {
echo "Do Build for ${PLATFORM}-${JDK_NAME}"
sh 'java -version'
@@ -132,7 +132,6 @@ pipeline {
stage('Test') {
steps {
echo "Do Test for ${PLATFORM}-${JDK_NAME}"
- sh 'java -version'
timeout(unit: 'HOURS', time: 7) {
script {
if ("${PLATFORM}" == "ubuntu") {