[camel-karaf] branch main updated: Set Jenkinsfile JDK 11 as standard for Camel-Karaf

[ac...@apache.org]

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-karaf.git


The following commit(s) were added to refs/heads/main by this push:
     new 879bc9c  Set Jenkinsfile JDK 11 as standard for Camel-Karaf
879bc9c is described below

commit 879bc9cb048cc5ae2aa93f506ff93441fede7484
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Jan 4 09:04:49 2022 +0100

    Set Jenkinsfile JDK 11 as standard for Camel-Karaf
---
 Jenkinsfile.karaf       |  8 ++---
 Jenkinsfile.karaf.jdk11 | 89 -------------------------------------------------
 2 files changed, 4 insertions(+), 93 deletions(-)

diff --git a/Jenkinsfile.karaf b/Jenkinsfile.karaf
index 2e86a1e..72e33a0 100644
--- a/Jenkinsfile.karaf
+++ b/Jenkinsfile.karaf
@@ -19,11 +19,11 @@
 
 def LOCAL_REPOSITORY = env.LOCAL_REPOSITORY ?: '/home/jenkins/jenkins-slave/maven-repositories/0'
 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 -Dmaven.repo.local=/home/jenkins/.m2/repository -Dmaven.compiler.fork=true'
 
-def karaf_itest_result
+def karaf_itests_result
 
 pipeline {
 
@@ -68,7 +68,7 @@ pipeline {
         stage('Build') {
             steps {
                 script {
-                    karaf_itest_result = sh script: "./mvnw $MAVEN_PARAMS -Dmaven.test.failure.ignore=true -Parchetypes-skip-tests clean install", returnStatus: true
+                    karaf_itests_result = sh script: "./mvnw $MAVEN_PARAMS -Dmaven.test.failure.ignore=true -Parchetypes-skip-tests clean install", returnStatus: true
                 }
             }
             post {
@@ -82,7 +82,7 @@ pipeline {
     post {
         always {
             script {
-                currentBuild.result = karaf_itest_result == 0 ? 'SUCCESS' : 'FAILURE'
+                currentBuild.result = karaf_itests_result == 0 ? 'SUCCESS' : 'FAILURE'
             }
         }
     }
diff --git a/Jenkinsfile.karaf.jdk11 b/Jenkinsfile.karaf.jdk11
deleted file mode 100644
index 72e33a0..0000000
--- a/Jenkinsfile.karaf.jdk11
+++ /dev/null
@@ -1,89 +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 LOCAL_REPOSITORY = env.LOCAL_REPOSITORY ?: '/home/jenkins/jenkins-slave/maven-repositories/0'
-def AGENT_LABEL = env.AGENT_LABEL ?: 'ubuntu'
-def JDK_NAME = env.JDK_NAME ?: 'jdk_11_latest'
-
-def MAVEN_PARAMS = '-U -B -e -fae -V -Dmaven.repo.local=/home/jenkins/.m2/repository -Dmaven.compiler.fork=true'
-
-def karaf_itests_result
-
-pipeline {
-
-    agent {
-        label AGENT_LABEL
-    }
-
-    triggers {
-        cron('@daily')
-    }
-
-    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') {
-            steps {
-                script {
-                    karaf_itests_result = sh script: "./mvnw $MAVEN_PARAMS -Dmaven.test.failure.ignore=true -Parchetypes-skip-tests clean install", returnStatus: true
-                }
-            }
-            post {
-                always {
-                    junit allowEmptyResults: true, testResults: '**/target/surefire-reports/*.xml'
-                }
-            }
-        }
-    }
-
-    post {
-        always {
-            script {
-                currentBuild.result = karaf_itests_result == 0 ? 'SUCCESS' : 'FAILURE'
-            }
-        }
-    }
-}