From f00c3d3ffdcb9de919c44cd6b7352c3309836d16 Mon Sep 17 00:00:00 2001 From: Wojciech Thomas Date: Tue, 8 Jan 2019 17:55:17 +0100 Subject: [PATCH 01/18] Cleared Jenkinsfile --- Jenkinsfile | 32 ++++++++++++++------------------ 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index a59602b..6ab926e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,20 +1,16 @@ -node { - def mvnHome - stage('Build') { // for display purposes - // Get some code from a GitHub repository - git 'https://github.com/jglick/simple-maven-project-with-tests.git' - // Get the Maven tool. - // ** NOTE: This 'M3' Maven tool must be configured - // ** in the global configuration. - mvnHome = tool 'M3' - sh "'${mvnHome}/bin/mvn' clean compile" - } - stage('Unit Test') { - sh "'${mvnHome}/bin/mvn' test" - junit '**/target/surefire-reports/TEST-*.xml' - } - stage('Publish') { - sh "'${mvnHome}/bin/mvn' package" - archive 'target/*.jar' +pipeline { + agent none + stages { + stage('Build & TEst') { + agent { + node { + label 'docker' + } + steps { + sh 'mvn -Dmaven.test.failure.ignore clean package' + stash(name: 'build-test-artifacts', includes: '**/target/surefire-reports/TEST-*.xml,target/*.jar') + } + } + } } } From d7b490b6f8b0502d5b4c22bdb9ffa30c9f88020a Mon Sep 17 00:00:00 2001 From: Wojciech Thomas Date: Tue, 8 Jan 2019 18:02:23 +0100 Subject: [PATCH 02/18] Deleted jenkins file --- Jenkinsfile | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index 6ab926e..0000000 --- a/Jenkinsfile +++ /dev/null @@ -1,16 +0,0 @@ -pipeline { - agent none - stages { - stage('Build & TEst') { - agent { - node { - label 'docker' - } - steps { - sh 'mvn -Dmaven.test.failure.ignore clean package' - stash(name: 'build-test-artifacts', includes: '**/target/surefire-reports/TEST-*.xml,target/*.jar') - } - } - } - } -} From 3136609c691170f257b7ff015b81828feadb015c Mon Sep 17 00:00:00 2001 From: Wojciech Thomas Date: Tue, 8 Jan 2019 18:23:30 +0100 Subject: [PATCH 03/18] Pipeline with Build-Test node --- Jenkinsfile | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 0000000..eb627aa --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,16 @@ +pipeline { + agent { + node { + label 'docker' + } + + } + stages { + stage('Build & Test') { + steps { + sh 'mvn -Dmaven.test.failure.ignore clean package' + stash(name: 'build-test-artifacts', includes: '**/target/surefire-reports/TEST-*.xml,target/*.jar') + } + } + } +} \ No newline at end of file From 3309fc7802384b8a378224571a5f4c42c5c5169b Mon Sep 17 00:00:00 2001 From: Wojciech Thomas Date: Tue, 8 Jan 2019 23:31:47 +0100 Subject: [PATCH 04/18] Added Jenkinsfile From 72dcc9b3df00cd6980a52a41752bcf225a92407d Mon Sep 17 00:00:00 2001 From: Wojciech Thomas Date: Wed, 9 Jan 2019 00:42:26 +0100 Subject: [PATCH 05/18] Added step Report&Publish to Pipeline --- Jenkinsfile | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index eb627aa..afb3e37 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -12,5 +12,12 @@ pipeline { stash(name: 'build-test-artifacts', includes: '**/target/surefire-reports/TEST-*.xml,target/*.jar') } } + stage('Report & Publish') { + steps { + unstash 'build-test-artifacts' + junit '**/target/surefire-reports/TEST-*.xml' + archiveArtifacts(artifacts: 'target/*.jar', onlyIfSuccessful: true) + } + } } } \ No newline at end of file From 9a56b3833ff8f6df40867991ea1827da450e06c1 Mon Sep 17 00:00:00 2001 From: Wojciech Thomas Date: Wed, 9 Jan 2019 00:43:51 +0100 Subject: [PATCH 06/18] . From ba724db8045eaca77c0cf2d5a762cc5423418390 Mon Sep 17 00:00:00 2001 From: Wojciech Thomas Date: Wed, 9 Jan 2019 08:31:17 +0100 Subject: [PATCH 07/18] cleared --- Jenkinsfile | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index afb3e37..8b13789 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,23 +1 @@ -pipeline { - agent { - node { - label 'docker' - } - } - stages { - stage('Build & Test') { - steps { - sh 'mvn -Dmaven.test.failure.ignore clean package' - stash(name: 'build-test-artifacts', includes: '**/target/surefire-reports/TEST-*.xml,target/*.jar') - } - } - stage('Report & Publish') { - steps { - unstash 'build-test-artifacts' - junit '**/target/surefire-reports/TEST-*.xml' - archiveArtifacts(artifacts: 'target/*.jar', onlyIfSuccessful: true) - } - } - } -} \ No newline at end of file From 0e2f93055fa60b28299c8dce3cc7d1d9cf93613c Mon Sep 17 00:00:00 2001 From: Wojciech Thomas Date: Wed, 9 Jan 2019 08:35:54 +0100 Subject: [PATCH 08/18] a --- Jenkinsfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 8b13789..9156158 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1 +1,4 @@ +pipeline { + +} From a90a2a737d6497389f078806ea02ff4f5854c2b2 Mon Sep 17 00:00:00 2001 From: Wojciech Thomas Date: Wed, 9 Jan 2019 08:39:34 +0100 Subject: [PATCH 09/18] q --- Jenkinsfile | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index 9156158..0000000 --- a/Jenkinsfile +++ /dev/null @@ -1,4 +0,0 @@ - -pipeline { - -} From 22e32e38d5030a92b9711d8115bc5f72133e3d16 Mon Sep 17 00:00:00 2001 From: Wojciech Thomas Date: Wed, 9 Jan 2019 08:48:37 +0100 Subject: [PATCH 10/18] Added the first build step --- Jenkinsfile | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 0000000..74bbdc2 --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,17 @@ +pipeline { + agent none + stages { + stage('Build') { + agent { + node { + label 'docker' + } + + } + steps { + sh 'mvn -Dmaven.test.failure.ignore clean package' + stash(name: 'build-artifacts', includes: 'target/*.jar') + } + } + } +} \ No newline at end of file From 55928b5feb343893800df93ba30f06832d4d2f7c Mon Sep 17 00:00:00 2001 From: Wojciech Thomas Date: Wed, 9 Jan 2019 08:51:03 +0100 Subject: [PATCH 11/18] a. From c25081f05511e21a6d882d25fe0e804874a66ba9 Mon Sep 17 00:00:00 2001 From: Wojciech Thomas Date: Wed, 9 Jan 2019 12:17:49 +0100 Subject: [PATCH 12/18] Restored stages Build + Report --- Jenkinsfile | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 74bbdc2..fd2f241 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,7 +1,7 @@ pipeline { agent none stages { - stage('Build') { + stage('Build & Test') { agent { node { label 'docker' @@ -10,7 +10,14 @@ pipeline { } steps { sh 'mvn -Dmaven.test.failure.ignore clean package' - stash(name: 'build-artifacts', includes: 'target/*.jar') + stash(name: 'build-test-artifacts', includes: '**/target/surefire-reports/TEST-*.xml,target/*.jar') + } + } + stage('Report & Publish') { + steps { + unstash 'build-test-artifacts' + junit '**/target/surefire-reports/TEST-*.xml' + archiveArtifacts(artifacts: 'target/*.jar', onlyIfSuccessful: true) } } } From 43763020f1d9706860952b6d304ec4b8117b84e0 Mon Sep 17 00:00:00 2001 From: Wojciech Thomas Date: Wed, 9 Jan 2019 12:35:47 +0100 Subject: [PATCH 13/18] Thirt test added --- Jenkinsfile | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index fd2f241..9218d6e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -14,10 +14,24 @@ pipeline { } } stage('Report & Publish') { - steps { - unstash 'build-test-artifacts' - junit '**/target/surefire-reports/TEST-*.xml' - archiveArtifacts(artifacts: 'target/*.jar', onlyIfSuccessful: true) + parallel { + stage('Report & Publish') { + steps { + unstash 'build-test-artifacts' + junit '**/target/surefire-reports/TEST-*.xml' + archiveArtifacts(artifacts: 'target/*.jar', onlyIfSuccessful: true) + } + } + stage('Publish to Artifactory') { + steps { + script { + unstash build-test-artifacts + + + } + + } + } } } } From cf5b724a2934ed6ac7aa8d7bb869db9d01c00844 Mon Sep 17 00:00:00 2001 From: Wojciech Thomas Date: Wed, 9 Jan 2019 12:40:44 +0100 Subject: [PATCH 14/18] Third stage finished --- Jenkinsfile | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 9218d6e..1a6d42d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -23,11 +23,26 @@ pipeline { } } stage('Publish to Artifactory') { + agent { + node { + label 'docker' + } + + } steps { script { - unstash build-test-artifacts - + unstash 'build-test-artifacts' + def server = Artifactory.server 'MyArtifactory1' + def uploadSpec = """{ + "files": [ + { + "pattern": "target/*.jar", + "target": "example-repo-local/${BRANCH_NAME}/${BUILD_NUMBER}/" + } + ] + }""" + server.upload(uploadSpec) } } From 52e041e6e52989721bd37dd123265468215526da Mon Sep 17 00:00:00 2001 From: Wojciech Thomas Date: Wed, 9 Jan 2019 12:42:37 +0100 Subject: [PATCH 15/18] Removed third stage on master --- Jenkinsfile | 37 ++++--------------------------------- 1 file changed, 4 insertions(+), 33 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 1a6d42d..fd2f241 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -14,39 +14,10 @@ pipeline { } } stage('Report & Publish') { - parallel { - stage('Report & Publish') { - steps { - unstash 'build-test-artifacts' - junit '**/target/surefire-reports/TEST-*.xml' - archiveArtifacts(artifacts: 'target/*.jar', onlyIfSuccessful: true) - } - } - stage('Publish to Artifactory') { - agent { - node { - label 'docker' - } - - } - steps { - script { - unstash 'build-test-artifacts' - - def server = Artifactory.server 'MyArtifactory1' - def uploadSpec = """{ - "files": [ - { - "pattern": "target/*.jar", - "target": "example-repo-local/${BRANCH_NAME}/${BUILD_NUMBER}/" - } - ] - }""" - server.upload(uploadSpec) - } - - } - } + steps { + unstash 'build-test-artifacts' + junit '**/target/surefire-reports/TEST-*.xml' + archiveArtifacts(artifacts: 'target/*.jar', onlyIfSuccessful: true) } } } From 688fee8d3d6b3e5fb2f6e4873c8716f8ed5c0a19 Mon Sep 17 00:00:00 2001 From: Wojciech Thomas Date: Wed, 9 Jan 2019 12:46:36 +0100 Subject: [PATCH 16/18] added a scripted pipeline step --- Jenkinsfile | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index fd2f241..11457b2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -14,10 +14,33 @@ pipeline { } } stage('Report & Publish') { - steps { - unstash 'build-test-artifacts' - junit '**/target/surefire-reports/TEST-*.xml' - archiveArtifacts(artifacts: 'target/*.jar', onlyIfSuccessful: true) + parallel { + stage('Report & Publish') { + steps { + unstash 'build-test-artifacts' + junit '**/target/surefire-reports/TEST-*.xml' + archiveArtifacts(artifacts: 'target/*.jar', onlyIfSuccessful: true) + } + } + stage('Publish to Artifactory') { + steps { + script { + unstash 'build-test-artifacts' + + def server = Artifactory.server 'MyArtifactory1' + def uploadSpec = """{ + "files": [ + { + "pattern": "target/*.jar", + "target": "example-repo-local/${BRANCH_NAME}/${BUILD_NUMBER}/" + } + ] + }""" + server.upload(uploadSpec) + } + + } + } } } } From 17691b8b609b0c15e342a515e22b9e66ed8f986c Mon Sep 17 00:00:00 2001 From: Wojciech Thomas Date: Wed, 9 Jan 2019 14:39:46 +0100 Subject: [PATCH 17/18] Added node configuration to stage publish --- Jenkinsfile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 11457b2..1a6d42d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -23,6 +23,12 @@ pipeline { } } stage('Publish to Artifactory') { + agent { + node { + label 'docker' + } + + } steps { script { unstash 'build-test-artifacts' From 108c166a6823af2b4dcbab7f8afd02da7e952e46 Mon Sep 17 00:00:00 2001 From: Wojciech Thomas Date: Wed, 9 Jan 2019 14:49:51 +0100 Subject: [PATCH 18/18] Updated build node configuration for report&publish stage --- Jenkinsfile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 1a6d42d..3d9c0e5 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,6 +16,12 @@ pipeline { stage('Report & Publish') { parallel { stage('Report & Publish') { + agent { + node { + label 'docker' + } + + } steps { unstash 'build-test-artifacts' junit '**/target/surefire-reports/TEST-*.xml'