You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by sr...@apache.org on 2018/02/22 11:56:49 UTC
[incubator-plc4x] branch master updated (c45513e -> 2b41b4e)
This is an automated email from the ASF dual-hosted git repository.
sruehl pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git.
from c45513e move upper bound +1 to the real boundary of hex test
new 9b6a682 migrate to declarative jenkins pipeline
new d7bb9d4 scripted steps need to be in script scope
new 2649c97 add surefire reports
new 7854033 added failsafe reports and allow both to be empty
new 6603911 split build into two cases where we are on master and not
new 068a04b only break build on master branch on test failure
new 2b41b4e simplfy build by using tools section instead of environment variables
The 7 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 | 108 +++++++++++++++++++++++++++++++++++++-----------------------
1 file changed, 67 insertions(+), 41 deletions(-)
--
To stop receiving notification emails like this one, please contact
sruehl@apache.org.
[incubator-plc4x] 04/07: added failsafe reports and allow both to
be empty
Posted by sr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sruehl pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit 7854033fd62650313090c8d87e44451903b129eb
Author: Sebastian Rühl <sr...@apache.org>
AuthorDate: Thu Feb 22 12:39:28 2018 +0100
added failsafe reports and allow both to be empty
---
Jenkinsfile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 7313dfe..8ee2794 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -70,7 +70,8 @@ pipeline {
}
post {
always {
- junit '**/target/surefire-reports/*.xml'
+ junit(testResults: '**/surefire-reports/*.xml', allowEmptyResults: true)
+ junit(testResults: '**/failsafe-reports/*.xml', allowEmptyResults: true)
}
}
}
--
To stop receiving notification emails like this one, please contact
sruehl@apache.org.
[incubator-plc4x] 03/07: add surefire reports
Posted by sr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sruehl pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit 2649c970792b00a7d63208e23bef4cf917a34758
Author: Sebastian Rühl <sr...@apache.org>
AuthorDate: Thu Feb 22 12:31:39 2018 +0100
add surefire reports
---
Jenkinsfile | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/Jenkinsfile b/Jenkinsfile
index dd6c81a..7313dfe 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -68,6 +68,11 @@ pipeline {
sh "${MVN_HOME}/bin/mvn -Pjenkins-build ${mavenLocalRepo} clean ${mavenGoal} site:site"
}
}
+ post {
+ always {
+ junit '**/target/surefire-reports/*.xml'
+ }
+ }
}
stage('Stage Site') {
--
To stop receiving notification emails like this one, please contact
sruehl@apache.org.
[incubator-plc4x] 05/07: split build into two cases where we are on
master and not
Posted by sr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sruehl pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit 66039110e91fec838c76abc7e6cc60ce3f13c540
Author: Sebastian Rühl <sr...@apache.org>
AuthorDate: Thu Feb 22 12:45:45 2018 +0100
split build into two cases where we are on master and not
---
Jenkinsfile | 34 ++++++++++++++++++++++++----------
1 file changed, 24 insertions(+), 10 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 8ee2794..5dcd91c 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -54,20 +54,31 @@ pipeline {
}
stage('Build') {
+ when {
+ expression {
+ env.BRANCH_NAME != 'master'
+ }
+ }
steps {
echo 'Building'
- script {
- // Make sure the feature branches don't change the SNAPSHOTS in Nexus.
- def mavenGoal = "install"
- def mavenLocalRepo = ""
- if (env.BRANCH_NAME == 'master') {
- mavenGoal = "deploy sonar:sonar"
- } else {
- mavenLocalRepo = "-Dmaven.repo.local=.repository"
- }
- sh "${MVN_HOME}/bin/mvn -Pjenkins-build ${mavenLocalRepo} clean ${mavenGoal} site:site"
+ sh "${MVN_HOME}/bin/mvn -Pjenkins-build -Dmaven.repo.local=.repository clean install"
+ }
+ post {
+ always {
+ junit(testResults: '**/surefire-reports/*.xml', allowEmptyResults: true)
+ junit(testResults: '**/failsafe-reports/*.xml', allowEmptyResults: true)
}
}
+ }
+
+ stage('Build') {
+ when {
+ branch 'master'
+ }
+ steps {
+ echo 'Building'
+ sh "${MVN_HOME}/bin/mvn -Pjenkins-build clean deploy sonar:sonar site:site"
+ }
post {
always {
junit(testResults: '**/surefire-reports/*.xml', allowEmptyResults: true)
@@ -77,6 +88,9 @@ pipeline {
}
stage('Stage Site') {
+ when {
+ branch 'master'
+ }
steps {
echo 'Staging Site'
sh "${MVN_HOME}/bin/mvn -Pjenkins-build ${mavenLocalRepo} site:stage"
--
To stop receiving notification emails like this one, please contact
sruehl@apache.org.
[incubator-plc4x] 01/07: migrate to declarative jenkins pipeline
Posted by sr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sruehl pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit 9b6a682fc8a6d0a205e66b6c34126670da952a23
Author: Sebastian Rühl <sr...@apache.org>
AuthorDate: Thu Feb 22 12:25:36 2018 +0100
migrate to declarative jenkins pipeline
---
Jenkinsfile | 88 +++++++++++++++++++++++++++++++------------------------------
1 file changed, 45 insertions(+), 43 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 9d02cc8..0738d62 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -18,60 +18,62 @@
* limitations under the License.
*
*/
-// TODO: migrate to declarative pipeline if possible (https://jenkins.io/doc/book/pipeline/jenkinsfile/)
-node('ubuntu && !H33') {
-
- currentBuild.result = "SUCCESS"
-
- echo 'Building Branch: ' + env.BRANCH_NAME
-
- // Setup the required environment variables.
- def mvnHome = "${tool 'Maven 3 (latest)'}"
- env.JAVA_HOME="${tool 'JDK 1.8 (latest)'}"
- env.PATH="${env.JAVA_HOME}/bin:${env.PATH}"
+pipeline {
+ agent {
+ node {
+ label 'ubuntu && !H33'
+ }
+ }
- // Make sure the feature branches don't change the SNAPSHOTS in Nexus.
- def mavenGoal = "install"
- def mavenLocalRepo = ""
- if(env.BRANCH_NAME == 'master') {
- mavenGoal = "deploy sonar:sonar"
- } else {
- mavenLocalRepo = "-Dmaven.repo.local=.repository"
+ environment {
+ CC = 'clang'
+ MVN_HOME = "${tool 'Maven 3 (latest)'}"
+ JAVA_HOME = "${tool 'JDK 1.8 (latest)'}"
+ PATH = "${env.JAVA_HOME}/bin:${env.PATH}"
}
- try {
- stage ('Cleanup') {
- echo 'Cleaning up the workspace'
- deleteDir()
+ stages {
+ stage('Initialization') {
+ steps {
+ echo 'Building Branch: ' + env.BRANCH_NAME
+ }
}
- stage ('Checkout') {
- echo 'Checking out branch ' + env.BRANCH_NAME
- checkout scm
+ stage('Cleanup') {
+ steps {
+ echo 'Cleaning up the workspace'
+ deleteDir()
+ }
}
- stage ('Build') {
- echo 'Building'
- sh "${mvnHome}/bin/mvn -Pjenkins-build ${mavenLocalRepo} clean ${mavenGoal} site:site"
+ stage('Checkout') {
+ steps {
+ echo 'Checking out branch ' + env.BRANCH_NAME
+ checkout scm
+ }
}
- stage ('Stage Site') {
- echo 'Staging Site'
- sh "${mvnHome}/bin/mvn -Pjenkins-build ${mavenLocalRepo} site:stage"
+ stage('Build') {
+ steps {
+ // Make sure the feature branches don't change the SNAPSHOTS in Nexus.
+ def mavenGoal = "install"
+ def mavenLocalRepo = ""
+ if (env.BRANCH_NAME == 'master') {
+ mavenGoal = "deploy sonar:sonar"
+ } else {
+ mavenLocalRepo = "-Dmaven.repo.local=.repository"
+ }
+ echo 'Building'
+ sh "${MVN_HOME}/bin/mvn -Pjenkins-build ${mavenLocalRepo} clean ${mavenGoal} site:site"
+ }
}
- }
-
+ stage('Stage Site') {
+ steps {
+ echo 'Staging Site'
+ sh "${MVN_HOME}/bin/mvn -Pjenkins-build ${mavenLocalRepo} site:stage"
+ }
+ }
- catch (err) {
- currentBuild.result = "FAILURE"
-/* mail body: "project build error is here: ${env.BUILD_URL}" ,
- from: 'xxxx@yyyy.com',
- replyTo: 'dev@plc4x.apache.org',
- subject: 'Autobuild for Branch ' env.BRANCH_NAME
- to: 'commits@plc4x.apache.org'
-*/
- throw err
}
-
}
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
sruehl@apache.org.
[incubator-plc4x] 06/07: only break build on master branch on test
failure
Posted by sr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sruehl pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit 068a04b27617ac100dc1ba5e9ca2af992da11119
Author: Sebastian Rühl <sr...@apache.org>
AuthorDate: Thu Feb 22 12:47:17 2018 +0100
only break build on master branch on test failure
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 5dcd91c..31b6d7a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -61,7 +61,7 @@ pipeline {
}
steps {
echo 'Building'
- sh "${MVN_HOME}/bin/mvn -Pjenkins-build -Dmaven.repo.local=.repository clean install"
+ sh "${MVN_HOME}/bin/mvn -Pjenkins-build -Dmaven.test.failure.ignore=true -Dmaven.repo.local=.repository clean install"
}
post {
always {
--
To stop receiving notification emails like this one, please contact
sruehl@apache.org.
[incubator-plc4x] 07/07: simplfy build by using tools section
instead of environment variables
Posted by sr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sruehl pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit 2b41b4ec02342fcbe9d317afdcc9b1be53f838f7
Author: Sebastian Rühl <sr...@apache.org>
AuthorDate: Thu Feb 22 12:52:08 2018 +0100
simplfy build by using tools section instead of environment variables
---
Jenkinsfile | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 31b6d7a..0508652 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -26,10 +26,12 @@ pipeline {
}
environment {
- CC = 'clang'
- MVN_HOME = "${tool 'Maven 3 (latest)'}"
- JAVA_HOME = "${tool 'JDK 1.8 (latest)'}"
- PATH = "${env.JAVA_HOME}/bin:${env.PATH}"
+ PLC4X_BUILD = true
+ }
+
+ tools {
+ maven 'Maven 3 (latest)'
+ jdk 'JDK 1.8 (latest)'
}
stages {
@@ -61,7 +63,7 @@ pipeline {
}
steps {
echo 'Building'
- sh "${MVN_HOME}/bin/mvn -Pjenkins-build -Dmaven.test.failure.ignore=true -Dmaven.repo.local=.repository clean install"
+ sh "mvn -Pjenkins-build -Dmaven.test.failure.ignore=true -Dmaven.repo.local=.repository clean install"
}
post {
always {
@@ -71,13 +73,13 @@ pipeline {
}
}
- stage('Build') {
+ stage('Build master') {
when {
branch 'master'
}
steps {
echo 'Building'
- sh "${MVN_HOME}/bin/mvn -Pjenkins-build clean deploy sonar:sonar site:site"
+ sh "mvn -Pjenkins-build clean deploy sonar:sonar site:site"
}
post {
always {
@@ -93,7 +95,7 @@ pipeline {
}
steps {
echo 'Staging Site'
- sh "${MVN_HOME}/bin/mvn -Pjenkins-build ${mavenLocalRepo} site:stage"
+ sh "mvn -Pjenkins-build ${mavenLocalRepo} site:stage"
}
}
--
To stop receiving notification emails like this one, please contact
sruehl@apache.org.
[incubator-plc4x] 02/07: scripted steps need to be in script scope
Posted by sr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sruehl pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit d7bb9d4c007d38b351333a862350c041fbad5355
Author: Sebastian Rühl <sr...@apache.org>
AuthorDate: Thu Feb 22 12:28:48 2018 +0100
scripted steps need to be in script scope
---
Jenkinsfile | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 0738d62..dd6c81a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -55,16 +55,18 @@ pipeline {
stage('Build') {
steps {
- // Make sure the feature branches don't change the SNAPSHOTS in Nexus.
- def mavenGoal = "install"
- def mavenLocalRepo = ""
- if (env.BRANCH_NAME == 'master') {
- mavenGoal = "deploy sonar:sonar"
- } else {
- mavenLocalRepo = "-Dmaven.repo.local=.repository"
- }
echo 'Building'
- sh "${MVN_HOME}/bin/mvn -Pjenkins-build ${mavenLocalRepo} clean ${mavenGoal} site:site"
+ script {
+ // Make sure the feature branches don't change the SNAPSHOTS in Nexus.
+ def mavenGoal = "install"
+ def mavenLocalRepo = ""
+ if (env.BRANCH_NAME == 'master') {
+ mavenGoal = "deploy sonar:sonar"
+ } else {
+ mavenLocalRepo = "-Dmaven.repo.local=.repository"
+ }
+ sh "${MVN_HOME}/bin/mvn -Pjenkins-build ${mavenLocalRepo} clean ${mavenGoal} site:site"
+ }
}
}
--
To stop receiving notification emails like this one, please contact
sruehl@apache.org.