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 2018/04/07 01:49:25 UTC
logging-log4j2 git commit: Add Windows Jenkins pipeline
Repository: logging-log4j2
Updated Branches:
refs/heads/master 22280cbeb -> 2b3656fe9
Add Windows Jenkins pipeline
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/2b3656fe
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/2b3656fe
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/2b3656fe
Branch: refs/heads/master
Commit: 2b3656fe9c18e51488e784b3c23c44f1320cfe1f
Parents: 22280cb
Author: Matt Sicker <bo...@gmail.com>
Authored: Fri Apr 6 20:49:20 2018 -0500
Committer: Matt Sicker <bo...@gmail.com>
Committed: Fri Apr 6 20:49:20 2018 -0500
----------------------------------------------------------------------
Jenkinsfile | 17 +++++++----
jenkins-toolchains.xml | 62 --------------------------------------
toolchains-jenkins-ubuntu.xml | 62 ++++++++++++++++++++++++++++++++++++++
toolchains-jenkins-win.xml | 52 ++++++++++++++++++++++++++++++++
4 files changed, 125 insertions(+), 68 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/2b3656fe/Jenkinsfile
----------------------------------------------------------------------
diff --git a/Jenkinsfile b/Jenkinsfile
index 04562e3..4cb4a41 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -17,26 +17,31 @@
*/
pipeline {
- agent {
- label 'ubuntu&&!H20'
- }
tools {
jdk 'JDK 1.8 (latest)'
maven 'Maven 3 (latest)'
}
stages {
- stage('Build') {
+ stage('Build (Ubuntu)') {
+ agent { label 'ubuntu&&!H20' }
steps {
ansiColor('xterm') {
- sh 'mvn -t jenkins-toolchains.xml -Djenkins -DskipTests=true -Dmaven.javadoc.skip=true -V install'
- sh 'mvn -t jenkins-toolchains.xml -Djenkins -V install'
+ sh 'mvn -t toolchains-jenkins-ubuntu.xml -Djenkins -V install'
+ stash includes: 'target/**', name: 'target'
}
}
}
+ stage('Build (Windows)') {
+ agent { label 'Windows' }
+ steps {
+ bat 'mvn -t toolchains-jenkins-win.xml -Djenkins -V install'
+ }
+ }
stage('Deploy') {
when { branch 'master' }
steps {
ansiColor('xterm') {
+ unstash 'target'
sh 'mvn -t jenkins-toolchains.xml -Djenkins -V deploy'
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/2b3656fe/jenkins-toolchains.xml
----------------------------------------------------------------------
diff --git a/jenkins-toolchains.xml b/jenkins-toolchains.xml
deleted file mode 100644
index 5821ce6..0000000
--- a/jenkins-toolchains.xml
+++ /dev/null
@@ -1,62 +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>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>
- <configuration>
- <jdkHome>/home/jenkins/tools/java/latest1.8</jdkHome>
- </configuration>
- </toolchain>
- <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>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/2b3656fe/toolchains-jenkins-ubuntu.xml
----------------------------------------------------------------------
diff --git a/toolchains-jenkins-ubuntu.xml b/toolchains-jenkins-ubuntu.xml
new file mode 100644
index 0000000..5821ce6
--- /dev/null
+++ b/toolchains-jenkins-ubuntu.xml
@@ -0,0 +1,62 @@
+<?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>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>
+ <configuration>
+ <jdkHome>/home/jenkins/tools/java/latest1.8</jdkHome>
+ </configuration>
+ </toolchain>
+ <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>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/2b3656fe/toolchains-jenkins-win.xml
----------------------------------------------------------------------
diff --git a/toolchains-jenkins-win.xml b/toolchains-jenkins-win.xml
new file mode 100644
index 0000000..2017b0b
--- /dev/null
+++ b/toolchains-jenkins-win.xml
@@ -0,0 +1,52 @@
+<?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
+ ~
+ ~ https://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>sun</vendor>
+ </provides>
+ <configuration>
+ <jdkHome>F:\hudson\tools\java\jdk1.7.0_79</jdkHome>
+ </configuration>
+ </toolchain>
+ <toolchain>
+ <type>jdk</type>
+ <provides>
+ <version>1.8</version>
+ <vendor>sun</vendor>
+ </provides>
+ <configuration>
+ <jdkHome>F:\jenkins\tools\java\jdk1.8.0_152</jdkHome>
+ </configuration>
+ </toolchain>
+ <toolchain>
+ <type>jdk</type>
+ <provides>
+ <version>9</version>
+ <vendor>sun</vendor>
+ </provides>
+ <configuration>
+ <jdkHome>F:\jenkins\tools\java\jdk9.0.1</jdkHome>
+ </configuration>
+ </toolchain>
+
+ <!-- other toolchains -->
+</toolchains>