This is an automated email from the ASF dual-hosted git repository.
acosentino 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 8dd13d2 Moved Jenkinsfile.jdk11 file as standard build for Camel
8dd13d2 is described below
commit 8dd13d2f2e7cee07aad081ebee07e6f4415cbd9b
Author: Andrea Cosentino <[email protected]>
AuthorDate: Mon Jan 3 07:34:46 2022 +0100
Moved Jenkinsfile.jdk11 file as standard build for Camel
---
Jenkinsfile | 16 ++-------
Jenkinsfile.jdk11 | 100 ------------------------------------------------------
2 files changed, 2 insertions(+), 114 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index f9bf444..8b32852 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -18,7 +18,7 @@
*/
def AGENT_LABEL = env.AGENT_LABEL ?: 'ubuntu'
-def JDK_NAME = env.JDK_NAME ?: 'adoptopenjdk_hotspot_8u282'
+def JDK_NAME = env.JDK_NAME ?: 'jdk_11_latest'
def MAVEN_PARAMS = "-U -B -e -fae -V -Dnoassembly -Dmaven.compiler.fork=true
-Dsurefire.rerunFailingTestsCount=2"
@@ -63,24 +63,12 @@ pipeline {
branch 'main'
}
steps {
- sh "./mvnw $MAVEN_PARAMS -Pdeploy -Dmaven.test.skip.exec=true
clean deploy"
- }
- }
-
- stage('Website update') {
- when {
- branch 'main'
- changeset 'docs/**/*'
- }
-
- steps {
- build job: 'Camel/Camel.website/main', wait: false
+ sh "./mvnw $MAVEN_PARAMS -Dmaven.test.skip.exec=true clean
deploy"
}
}
stage('Checks') {
steps {
- sh "./mvnw $MAVEN_PARAMS -pl :camel-buildtools install"
sh "./mvnw $MAVEN_PARAMS -Psourcecheck
-Dcheckstyle.failOnViolation=false checkstyle:check"
}
}
diff --git a/Jenkinsfile.jdk11 b/Jenkinsfile.jdk11
deleted file mode 100644
index c9af873..0000000
--- a/Jenkinsfile.jdk11
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * 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_11_latest'
-
-def MAVEN_PARAMS = "-U -B -e -fae -V -Dnoassembly -Dmaven.compiler.fork=true
-Dsurefire.rerunFailingTestsCount=2"
-
-pipeline {
-
- agent {
- label AGENT_LABEL
- }
-
- tools {
- jdk JDK_NAME
- }
-
- 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')
- }
-
- stages {
-
- stage('Clean workspace') {
- when {
- expression { params.CLEAN }
- }
- steps {
- sh 'git clean -fdx'
- }
- }
-
- stage('Build & Deploy') {
- when {
- branch 'main'
- }
- steps {
- sh "./mvnw $MAVEN_PARAMS -Dmaven.test.skip.exec=true clean
install"
- }
- }
-
- stage('Checks') {
- steps {
- sh "./mvnw $MAVEN_PARAMS -Psourcecheck
-Dcheckstyle.failOnViolation=false checkstyle:check"
- }
- }
-
- stage('Test') {
- steps {
- sh "./mvnw $MAVEN_PARAMS -Dmaven.test.failure.ignore=true
clean install"
- }
- 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: 'CulpritsRecipientProvider']]
- )
- }
- }
-}
-
