You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by ma...@apache.org on 2020/04/04 01:09:03 UTC
[logging-log4j2] branch master updated (e2b952e -> 83ac32a)
This is an automated email from the ASF dual-hosted git repository.
mattsicker pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git.
from e2b952e Add helpers.
new b211efd Remove jenkins ibm toolchain config
new 83ac32a Clean up Jenkins pipelines
The 2 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 | 65 +++++++++++--------------------------------
toolchains-jenkins-ibm.xml | 63 -----------------------------------------
toolchains-jenkins-ubuntu.xml | 52 ++++++++++++++++++++++++++--------
toolchains-jenkins-win.xml | 55 ++++++++++++++++++++++++++++++------
4 files changed, 104 insertions(+), 131 deletions(-)
delete mode 100644 toolchains-jenkins-ibm.xml
[logging-log4j2] 01/02: Remove jenkins ibm toolchain config
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mattsicker pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit b211efd89e80259d660e5924babfd01406625d6b
Author: Matt Sicker <bo...@gmail.com>
AuthorDate: Fri Apr 3 19:27:47 2020 -0500
Remove jenkins ibm toolchain config
As the ASF Jenkins doesn't have IBM JDK beyond 1.8, there's no reason to
keep this file.
---
toolchains-jenkins-ibm.xml | 63 ----------------------------------------------
1 file changed, 63 deletions(-)
diff --git a/toolchains-jenkins-ibm.xml b/toolchains-jenkins-ibm.xml
deleted file mode 100644
index 4fdd5c6..0000000
--- a/toolchains-jenkins-ibm.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF8"?>
-<!--
- ~ 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.
- -->
-<toolchains>
- <!-- JDK toolchains -->
- <toolchain>
- <type>jdk</type>
- <provides>
- <version>1.7</version>
- <vendor>ibm</vendor>
- </provides>
- <configuration>
- <jdkHome>/home/jenkins/tools/java/ibm-1.7-64</jdkHome>
- </configuration>
- </toolchain>
- <toolchain>
- <type>jdk</type>
- <provides>
- <version>1.8</version>
- <vendor>ibm</vendor>
- </provides>
- <configuration>
- <jdkHome>/home/jenkins/tools/java/ibm-java-x86_64-80</jdkHome>
- </configuration>
- </toolchain>
- <!-- TODO: configure OpenJ9/J9 whenever it's installed -->
- <toolchain>
- <type>jdk</type>
- <provides>
- <version>9</version>
- <vendor>sun</vendor>
- </provides>
- <configuration>
- <jdkHome>/home/jenkins/tools/java/latest1.9</jdkHome>
- </configuration>
- </toolchain>
- <toolchain>
- <type>jdk</type>
- <provides>
- <version>10</version>
- <vendor>sun</vendor>
- </provides>
- <configuration>
- <jdkHome>/home/jenkins/tools/java/latest10</jdkHome>
- </configuration>
- </toolchain>
-
- <!-- other toolchains -->
-</toolchains>
[logging-log4j2] 02/02: Clean up Jenkins pipelines
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mattsicker pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 83ac32af989907761477ddffa3f2aacb3169bc80
Author: Matt Sicker <bo...@gmail.com>
AuthorDate: Fri Apr 3 20:08:37 2020 -0500
Clean up Jenkins pipelines
---
Jenkinsfile | 65 +++++++++++--------------------------------
toolchains-jenkins-ubuntu.xml | 52 ++++++++++++++++++++++++++--------
toolchains-jenkins-win.xml | 55 ++++++++++++++++++++++++++++++------
3 files changed, 104 insertions(+), 68 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index ac900ce..cd7cbed 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -18,7 +18,9 @@
pipeline {
options {
- timeout time: 60, unit: 'MINUTES'
+ ansiColor('xterm')
+ buildDiscarder logRotator(numToKeepStr: '10')
+ timeout(90)
}
agent none
stages {
@@ -26,69 +28,34 @@ pipeline {
failFast true
parallel {
stage('Ubuntu') {
- agent { label 'ubuntu&&!H20' }
- tools {
- // https://cwiki.apache.org/confluence/display/INFRA/JDK+Installation+Matrix
- jdk 'JDK 1.8 (latest)'
- // https://cwiki.apache.org/confluence/display/INFRA/Maven+Installation+Matrix
- maven 'Maven 3 (latest)'
- }
+ agent { label 'ubuntu' }
steps {
- ansiColor('xterm') {
- sh 'mvn -t toolchains-jenkins-ubuntu.xml -Djenkins -V install'
- junit '*/target/*-reports/*.xml'
- stash includes: 'target/**', name: 'target'
+ withMaven {
+ sh 'mvn -B -t toolchains-jenkins-ubuntu.xml -Djenkins -V install'
}
}
- }
- stage('IBM JDK') {
- agent { label 'ubuntu&&!H20' }
- tools {
- jdk 'IBM 1.8 64-bit (on Ubuntu only)'
- maven 'Maven 3 (latest)'
- }
- steps {
- ansiColor('xterm') {
- sh 'mvn -t toolchains-jenkins-ibm.xml -Djenkins -V install'
- junit '*/target/*-reports/*.xml'
+ post {
+ always {
+ //junit '*/target/*-reports/*.xml'
+ recordIssues tools: [cpd(), checkStyle(), pmdParser(), mavenConsole(), errorProne()]
}
}
}
stage('Windows') {
agent { label 'Windows' }
- tools {
- // https://cwiki.apache.org/confluence/display/INFRA/JDK+Installation+Matrix
- jdk 'JDK 1.8 (latest)'
- // https://cwiki.apache.org/confluence/display/INFRA/Maven+Installation+Matrix
- maven 'Maven 3 (latest)'
- }
steps {
bat 'if exist %userprofile%\\.embedmongo\\ rd /s /q %userprofile%\\.embedmongo'
- bat 'mvn -t toolchains-jenkins-win.xml -V -Dfile.encoding=UTF-8 install'
- junit '*/target/*-reports/*.xml'
+ withMaven {
+ bat 'mvn -B -t toolchains-jenkins-win.xml -V -Dfile.encoding=UTF-8 install'
+ }
}
}
}
}
- stage('Deploy') {
- when { branch 'master' }
- tools {
- // https://cwiki.apache.org/confluence/display/INFRA/JDK+Installation+Matrix
- jdk 'JDK 1.8 (latest)'
- // https://cwiki.apache.org/confluence/display/INFRA/Maven+Installation+Matrix
- maven 'Maven 3 (latest)'
- }
- steps {
- ansiColor('xterm') {
- unstash 'target'
- sh 'mvn -t toolchains-jenkins-ubuntu.xml -Djenkins -DskipTests -V deploy'
- }
+ post {
+ failure {
+ slackSend channel: 'logging', message: "Jenkins build failure: ${env.BUILD_URL}"
}
-// post {
-// failure {
-// emailext body: "See <${env.BUILD_URL}>", replyTo: 'dev@logging.apache.org', subject: "[Log4j] Jenkins build failure (#${env.BUILD_NUMBER})", to: 'notifications@logging.apache.org'
-// }
-// }
}
}
}
diff --git a/toolchains-jenkins-ubuntu.xml b/toolchains-jenkins-ubuntu.xml
index c94b888..09898d7 100644
--- a/toolchains-jenkins-ubuntu.xml
+++ b/toolchains-jenkins-ubuntu.xml
@@ -20,16 +20,6 @@
<toolchain>
<type>jdk</type>
<provides>
- <version>1.7</version>
- <vendor>sun</vendor>
- </provides>
- <configuration>
- <jdkHome>/home/jenkins/tools/java/latest1.7</jdkHome>
- </configuration>
- </toolchain>
- <toolchain>
- <type>jdk</type>
- <provides>
<version>1.8</version>
<vendor>sun</vendor>
</provides>
@@ -61,11 +51,51 @@
<type>jdk</type>
<provides>
<version>11</version>
- <vendor>oracle</vendor>
+ <vendor>sun</vendor>
</provides>
<configuration>
<jdkHome>/home/jenkins/tools/java/latest11/</jdkHome>
</configuration>
</toolchain>
+ <toolchain>
+ <type>jdk</type>
+ <provides>
+ <version>12</version>
+ <vendor>sun</vendor>
+ </provides>
+ <configuration>
+ <jdkHome>/home/jenkins/tools/java/latest12/</jdkHome>
+ </configuration>
+ </toolchain>
+ <toolchain>
+ <type>jdk</type>
+ <provides>
+ <version>13</version>
+ <vendor>sun</vendor>
+ </provides>
+ <configuration>
+ <jdkHome>/home/jenkins/tools/java/latest13/</jdkHome>
+ </configuration>
+ </toolchain>
+ <toolchain>
+ <type>jdk</type>
+ <provides>
+ <version>14</version>
+ <vendor>sun</vendor>
+ </provides>
+ <configuration>
+ <jdkHome>/home/jenkins/tools/java/latest14/</jdkHome>
+ </configuration>
+ </toolchain>
+ <toolchain>
+ <type>jdk</type>
+ <provides>
+ <version>15</version>
+ <vendor>sun</vendor>
+ </provides>
+ <configuration>
+ <jdkHome>/home/jenkins/tools/java/latest15/</jdkHome>
+ </configuration>
+ </toolchain>
<!-- other toolchains -->
</toolchains>
diff --git a/toolchains-jenkins-win.xml b/toolchains-jenkins-win.xml
index 8b5199b..df01b39 100644
--- a/toolchains-jenkins-win.xml
+++ b/toolchains-jenkins-win.xml
@@ -20,43 +20,82 @@
<toolchain>
<type>jdk</type>
<provides>
- <version>1.7</version>
+ <version>1.8</version>
<vendor>sun</vendor>
</provides>
<configuration>
- <jdkHome>F:\jenkins\tools\java\latest1.7</jdkHome>
+ <jdkHome>F:\jenkins\tools\java\latest1.8</jdkHome>
</configuration>
</toolchain>
<toolchain>
<type>jdk</type>
<provides>
- <version>1.8</version>
+ <version>9</version>
<vendor>sun</vendor>
</provides>
<configuration>
- <jdkHome>F:\jenkins\tools\java\latest1.8</jdkHome>
+ <jdkHome>F:\jenkins\tools\java\latest9</jdkHome>
</configuration>
</toolchain>
<toolchain>
<type>jdk</type>
<provides>
- <version>9</version>
+ <version>10</version>
<vendor>sun</vendor>
</provides>
<configuration>
- <jdkHome>F:\jenkins\tools\java\latest9</jdkHome>
+ <jdkHome>F:\jenkins\tools\java\latest10</jdkHome>
</configuration>
</toolchain>
<toolchain>
<type>jdk</type>
<provides>
<version>11</version>
- <vendor>oracle</vendor>
+ <vendor>sun</vendor>
</provides>
<configuration>
<jdkHome>F:\jenkins\tools\java\latest11</jdkHome>
</configuration>
</toolchain>
-
+ <toolchain>
+ <type>jdk</type>
+ <provides>
+ <version>12</version>
+ <vendor>sun</vendor>
+ </provides>
+ <configuration>
+ <jdkHome>F:\jenkins\tools\java\latest12</jdkHome>
+ </configuration>
+ </toolchain>
+ <toolchain>
+ <type>jdk</type>
+ <provides>
+ <version>13</version>
+ <vendor>sun</vendor>
+ </provides>
+ <configuration>
+ <jdkHome>F:\jenkins\tools\java\latest13</jdkHome>
+ </configuration>
+ </toolchain>
+ <toolchain>
+ <type>jdk</type>
+ <provides>
+ <version>14</version>
+ <vendor>sun</vendor>
+ </provides>
+ <configuration>
+ <jdkHome>F:\jenkins\tools\java\latest14</jdkHome>
+ </configuration>
+ </toolchain>
+ <!--toolchain>
+ <type>jdk</type>
+ <provides>
+ <version>15</version>
+ <vendor>sun</vendor>
+ </provides>
+ <configuration>
+ <jdkHome>F:\jenkins\tools\java\latest15</jdkHome>
+ </configuration>
+ </toolchain-->
<!-- other toolchains -->
</toolchains>