From e66c816b118f108296aee5e9dd00bb346f17cf2f Mon Sep 17 00:00:00 2001 From: pdahiya Date: Tue, 19 Apr 2022 13:08:09 +0530 Subject: [PATCH 01/14] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 38a78cde..292d60b9 100644 --- a/README.md +++ b/README.md @@ -1 +1,2 @@ This is a Sample Maven App. +trigger build From 605a09b5173bdd6e6cccbcd245d00d8e3c4482fd Mon Sep 17 00:00:00 2001 From: pdahiya Date: Tue, 19 Apr 2022 13:18:20 +0530 Subject: [PATCH 02/14] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 292d60b9..ca4cb4a8 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,3 @@ This is a Sample Maven App. trigger build +trigger2 From 0ffe8807234296240604cd37d0380d02e1a920ae Mon Sep 17 00:00:00 2001 From: pdahiya Date: Tue, 19 Apr 2022 13:22:42 +0530 Subject: [PATCH 03/14] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index ca4cb4a8..98266c41 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ This is a Sample Maven App. trigger build trigger2 +t3 From 91ab2de29cedac76b04eaa5eab04621f409d04f2 Mon Sep 17 00:00:00 2001 From: pdahiya Date: Wed, 20 Apr 2022 10:26:54 +0530 Subject: [PATCH 04/14] jenkinsfile --- Jenkinsfile | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 00000000..5f6cdca0 --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,35 @@ +pipeline { + agent any + tools { + maven "Maven 3.6.3" + } + stages{ + stage("build"){ + steps{ + echo "compile" + sh 'mvn compile' + sleep 1 + } + } + stage("test"){ + steps{ + echo "test" + sh 'mvn clean test' + sleep 1 + } + } + stage("package"){ + steps{ + echo "package" + sh 'mvn package -DskipTests' + sleep 1 + } + } + } + + post{ + always{ + echo 'This pipeline is completed..' + } + } +} From 10040838547273d88766d245e87553d4fc134171 Mon Sep 17 00:00:00 2001 From: pdahiya Date: Wed, 20 Apr 2022 10:29:54 +0530 Subject: [PATCH 05/14] Update Jenkinsfile --- Jenkinsfile | 3 --- 1 file changed, 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 5f6cdca0..0208c19e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -8,21 +8,18 @@ pipeline { steps{ echo "compile" sh 'mvn compile' - sleep 1 } } stage("test"){ steps{ echo "test" sh 'mvn clean test' - sleep 1 } } stage("package"){ steps{ echo "package" sh 'mvn package -DskipTests' - sleep 1 } } } From 339dde3495947dfe0a79626922c339986d4e3f3d Mon Sep 17 00:00:00 2001 From: pdahiya Date: Wed, 20 Apr 2022 11:17:33 +0530 Subject: [PATCH 06/14] archive step added --- Jenkinsfile | 57 +++++++++++++++++++++++++++++++---------------------- 1 file changed, 33 insertions(+), 24 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 0208c19e..f6d34e7a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,32 +1,41 @@ pipeline { agent any - tools { - maven "Maven 3.6.3" - } - stages{ - stage("build"){ - steps{ - echo "compile" - sh 'mvn compile' - } + stages { + stage('build') { + steps { + echo 'compile' + sh 'mvn compile' } - stage("test"){ - steps{ - echo "test" - sh 'mvn clean test' - } + } + + stage('test') { + steps { + echo 'test' + sh 'mvn clean test' } - stage("package"){ - steps{ - echo "package" - sh 'mvn package -DskipTests' - } + } + + stage('package') { + steps { + echo 'package' + sh 'mvn package -DskipTests' } - } + } - post{ - always{ - echo 'This pipeline is completed..' + stage('') { + steps { + archiveArtifacts 'target/*.war' + } } + + } + tools { + maven 'Maven 3.6.3' + } + post { + always { + echo 'This pipeline is completed..' + } + } -} +} \ No newline at end of file From fd2b1eb169390d7011590c03777734c735a4a80c Mon Sep 17 00:00:00 2001 From: pdahiya Date: Wed, 20 Apr 2022 11:18:40 +0530 Subject: [PATCH 07/14] renamed step --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index f6d34e7a..a4fa7b7b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -22,7 +22,7 @@ pipeline { } } - stage('') { + stage('archive') { steps { archiveArtifacts 'target/*.war' } From 6313727b121bedc05298926d07f5e944b67bd8ef Mon Sep 17 00:00:00 2001 From: pdahiya Date: Wed, 20 Apr 2022 12:45:33 +0530 Subject: [PATCH 08/14] Create test --- test | 1 + 1 file changed, 1 insertion(+) create mode 100644 test diff --git a/test b/test new file mode 100644 index 00000000..95bdb1aa --- /dev/null +++ b/test @@ -0,0 +1 @@ +test rules From cdc405817b0b965c88076522eb0d62ea64b9dec6 Mon Sep 17 00:00:00 2001 From: pdahiya Date: Thu, 21 Apr 2022 10:12:54 +0530 Subject: [PATCH 09/14] docker agent --- Jenkinsfile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index a4fa7b7b..6d3371ea 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,5 +1,10 @@ pipeline { - agent any + agent { + docker { + image 'maven:3.6.3-jdk-11-slim' + } + + } stages { stage('build') { steps { From 33af34c640198505c7d386d2fb8822aeaa52594b Mon Sep 17 00:00:00 2001 From: pdahiya Date: Fri, 22 Apr 2022 10:58:48 +0530 Subject: [PATCH 10/14] BnP --- Jenkinsfile | 45 +++++++++++++++++++++++++++++++++++++++------ 1 file changed, 39 insertions(+), 6 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 6d3371ea..00d4c8c0 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,12 +1,13 @@ pipeline { - agent { - docker { - image 'maven:3.6.3-jdk-11-slim' - } - - } + agent none stages { stage('build') { + agent { + docker { + image 'maven:3.6.3-jdk-11-slim' + } + + } steps { echo 'compile' sh 'mvn compile' @@ -14,6 +15,12 @@ pipeline { } stage('test') { + agent { + docker { + image 'maven:3.6.3-jdk-11-slim' + } + + } steps { echo 'test' sh 'mvn clean test' @@ -21,6 +28,12 @@ pipeline { } stage('package') { + agent { + docker { + image 'maven:3.6.3-jdk-11-slim' + } + + } steps { echo 'package' sh 'mvn package -DskipTests' @@ -33,6 +46,26 @@ pipeline { } } + stage('Docker BnP') { + agent { + docker { + image 'any' + } + + } + steps { + script { + docker.withRegistry('https://index.docker.io/v1/', 'dockerlogin') { + def dockerImage = docker.build("pdahiyaer/sysfoo:v${env.BUILD_ID}", "./") + dockerImage.push() + dockerImage.push("latest") + dockerImage.push("dev") + } + } + + } + } + } tools { maven 'Maven 3.6.3' From 9b4dac702b90240aadf5ba1a2c844f2ea5055489 Mon Sep 17 00:00:00 2001 From: pdahiya Date: Fri, 22 Apr 2022 11:20:55 +0530 Subject: [PATCH 11/14] removed archive --- Jenkinsfile | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 00d4c8c0..3030677e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -40,12 +40,6 @@ pipeline { } } - stage('archive') { - steps { - archiveArtifacts 'target/*.war' - } - } - stage('Docker BnP') { agent { docker { From 5cdcd88536581428bf444c5c4aff8a88439c48f4 Mon Sep 17 00:00:00 2001 From: pdahiya Date: Fri, 22 Apr 2022 12:00:35 +0530 Subject: [PATCH 12/14] Create Dockerfile --- Dockerfile | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 00000000..05386ac0 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,8 @@ +FROM maven:3.6.3-jdk-11-slim as build +WORKDIR /opt/demo +COPY . /opt/demo +RUN mvn package -DskipTests + +FROM tomcat:jre8-openjdk-slim-buster as run +WORKDIR /usr/local/tomcat +COPY --from=build /opt/demo/target/sysfoo.war webapps/root.war From 9e97ba854e2007d34806405a0d58bff0a0479226 Mon Sep 17 00:00:00 2001 From: pdahiya Date: Fri, 22 Apr 2022 12:37:28 +0530 Subject: [PATCH 13/14] removed docker agent --- Jenkinsfile | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 3030677e..a594c9b0 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -41,12 +41,7 @@ pipeline { } stage('Docker BnP') { - agent { - docker { - image 'any' - } - - } + agent any steps { script { docker.withRegistry('https://index.docker.io/v1/', 'dockerlogin') { From f80f05dfd614efb05182aec51986f974397b024b Mon Sep 17 00:00:00 2001 From: pdahiya Date: Fri, 22 Apr 2022 12:50:57 +0530 Subject: [PATCH 14/14] package,BnP only master and run in parallel --- Jenkinsfile | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index a594c9b0..06c45700 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -26,7 +26,12 @@ pipeline { sh 'mvn clean test' } } - + stage('Parallel Stage') { + when { + branch 'master' + } + failFast true + parallel { stage('package') { agent { docker { @@ -54,7 +59,7 @@ pipeline { } } - + }} } tools { maven 'Maven 3.6.3' @@ -65,4 +70,4 @@ pipeline { } } -} \ No newline at end of file +}