From 32bb4b13ed9be797d99505696d0d9bc51436da76 Mon Sep 17 00:00:00 2001 From: Ashish Gupta Date: Fri, 29 Sep 2023 14:17:33 +0530 Subject: [PATCH 01/31] add jenkinsfile --- Jenkinsfile | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 00000000..463430dd --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,28 @@ +pipeline{ + agent any + + tools{ + maven 'Maven 3.6.3' + } + + stages{ + stage('build'){ + steps{ + echo 'compile maven app' + sh 'mvn compile' + } + } + stage('test'){ + steps{ + echo 'test maven app' + sh 'mvn clean test' + } + } + stage('package'){ + steps{ + echo 'package maven app' + sh 'mvn package -DskipTests' + } + } + } +} \ No newline at end of file From 88a1ce5396e07787dbd42b25ad2223e7bc2bd54d Mon Sep 17 00:00:00 2001 From: Ashish Gupta Date: Fri, 29 Sep 2023 14:25:17 +0530 Subject: [PATCH 02/31] add jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 463430dd..88b45ef0 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -2,7 +2,7 @@ pipeline{ agent any tools{ - maven 'Maven 3.6.3' + maven 'MyMaven' } stages{ From 690e2e9473b385e57238863ea351e2ba37d30aaf Mon Sep 17 00:00:00 2001 From: ietashish Date: Fri, 29 Sep 2023 14:26:10 +0530 Subject: [PATCH 03/31] Added Jenkinsfile --- Jenkinsfile | 47 ++++++++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 88b45ef0..da89f614 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,28 +1,29 @@ -pipeline{ - agent any +pipeline { + agent any + stages { + stage('build') { + steps { + echo 'compile maven app' + sh 'mvn compile' + } + } - tools{ - maven 'MyMaven' + stage('test') { + steps { + echo 'test maven app' + sh 'mvn clean test' + } } - stages{ - stage('build'){ - steps{ - echo 'compile maven app' - sh 'mvn compile' - } - } - stage('test'){ - steps{ - echo 'test maven app' - sh 'mvn clean test' - } - } - stage('package'){ - steps{ - echo 'package maven app' - sh 'mvn package -DskipTests' - } - } + stage('package') { + steps { + echo 'package maven app' + sh 'mvn package -DskipTests' + } } + + } + tools { + maven 'MyMaven' + } } \ No newline at end of file From 170d20524630ce716e863ca86f025d98fbd87729 Mon Sep 17 00:00:00 2001 From: Ashish Gupta Date: Fri, 29 Sep 2023 14:32:39 +0530 Subject: [PATCH 04/31] add jenkinsfile --- Jenkinsfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 88b45ef0..5716b27f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -2,13 +2,14 @@ pipeline{ agent any tools{ - maven 'MyMaven' + maven 'Maven 3.6.3' } - + stages{ stage('build'){ steps{ echo 'compile maven app' + echo 'Ashish' sh 'mvn compile' } } @@ -24,5 +25,5 @@ pipeline{ sh 'mvn package -DskipTests' } } - } +} } \ No newline at end of file From b808791ba74897ccbb80c4fda69ebbf88b5de977 Mon Sep 17 00:00:00 2001 From: Ashish Gupta Date: Fri, 29 Sep 2023 14:35:22 +0530 Subject: [PATCH 05/31] echo my name --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 596ccd02..04212a7d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -4,7 +4,7 @@ pipeline { stage('build') { steps { echo 'compile maven app' - echo "Ashish" + echo "Ashish Gupta" sh 'mvn compile' } } From e0265f3e095c90e8a88c1725c43c6bb2be16a744 Mon Sep 17 00:00:00 2001 From: ietashish Date: Fri, 29 Sep 2023 14:38:29 +0530 Subject: [PATCH 06/31] archiving --- Jenkinsfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 04212a7d..a420568e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -4,7 +4,7 @@ pipeline { stage('build') { steps { echo 'compile maven app' - echo "Ashish Gupta" + echo 'Ashish Gupta' sh 'mvn compile' } } @@ -20,6 +20,7 @@ pipeline { steps { echo 'package maven app' sh 'mvn package -DskipTests' + archiveArtifacts 'target/*.war' } } From 0f6bf7f1e6af5ca19dbdd5452e218680245ef2c6 Mon Sep 17 00:00:00 2001 From: ietashish Date: Fri, 29 Sep 2023 14:40:12 +0530 Subject: [PATCH 07/31] Added Jenkinsfile --- Jenkinsfile | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index a420568e..585b8ec6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -2,17 +2,22 @@ pipeline { agent any stages { stage('build') { - steps { - echo 'compile maven app' - echo 'Ashish Gupta' - sh 'mvn compile' - } - } + parallel { + stage('build') { + steps { + echo 'compile maven app' + echo 'Ashish Gupta' + sh 'mvn compile' + } + } + + stage('test') { + steps { + echo 'Testing....' + sh 'mvn clean test' + } + } - stage('test') { - steps { - echo 'test maven app' - sh 'mvn clean test' } } From 8b36304408f111d6c7bd1ce0d98ff8ce8d846661 Mon Sep 17 00:00:00 2001 From: ietashish Date: Fri, 29 Sep 2023 14:42:30 +0530 Subject: [PATCH 08/31] remove tools movan --- Jenkinsfile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 585b8ec6..c1514538 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -30,7 +30,5 @@ pipeline { } } - tools { - maven 'MyMaven' - } -} \ No newline at end of file + +} From c40ac90c4a993a036d77816494e85e2905482d27 Mon Sep 17 00:00:00 2001 From: ietashish Date: Fri, 29 Sep 2023 14:44:28 +0530 Subject: [PATCH 09/31] add tools mavn --- Jenkinsfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index c1514538..3a9480f1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,5 +1,8 @@ pipeline { agent any + tools { + maven 'MyMaven' + } stages { stage('build') { parallel { From 7329cd3422327d63dc46d10723077d8d1ed6eaa6 Mon Sep 17 00:00:00 2001 From: ietashish Date: Fri, 29 Sep 2023 14:45:54 +0530 Subject: [PATCH 10/31] Update Jenkinsfile --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index 3a9480f1..7996366e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,6 +11,7 @@ pipeline { echo 'compile maven app' echo 'Ashish Gupta' sh 'mvn compile' + sleep 180 } } From 41a0596fbdaeda6748b31faeadafb9a2474a5072 Mon Sep 17 00:00:00 2001 From: ietashish Date: Fri, 29 Sep 2023 14:57:45 +0530 Subject: [PATCH 11/31] agent is docker --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 7996366e..a9b83858 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,5 +1,5 @@ pipeline { - agent any + agent docker tools { maven 'MyMaven' } From 81650607853ea8c4bdcfcaa9cfb0dfc49e4358fe Mon Sep 17 00:00:00 2001 From: ietashish Date: Fri, 29 Sep 2023 15:00:22 +0530 Subject: [PATCH 12/31] update tocker agent --- Jenkinsfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index a9b83858..3b360871 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,5 +1,8 @@ pipeline { - agent docker + docker { + label 'docker' + image 'python:3.7' + } tools { maven 'MyMaven' } From 6c8226eeb4cd00a17697d97c2ac31bbb2a6f0819 Mon Sep 17 00:00:00 2001 From: ietashish Date: Fri, 29 Sep 2023 15:02:21 +0530 Subject: [PATCH 13/31] Update Jenkinsfile --- Jenkinsfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 3b360871..6bed1f78 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,8 +1,10 @@ pipeline { - docker { + agent { + docker { label 'docker' image 'python:3.7' } +} tools { maven 'MyMaven' } From e33efb4f7b6f91d1b479612fb1261f1297d11384 Mon Sep 17 00:00:00 2001 From: ietashish Date: Fri, 29 Sep 2023 15:33:56 +0530 Subject: [PATCH 14/31] Update Jenkinsfile --- Jenkinsfile | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 6bed1f78..7996366e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,10 +1,5 @@ pipeline { - agent { - docker { - label 'docker' - image 'python:3.7' - } -} + agent any tools { maven 'MyMaven' } From 13235a859dc5f7458ebd8765b50ca3cbe8a4720b Mon Sep 17 00:00:00 2001 From: ietashish Date: Fri, 29 Sep 2023 15:36:18 +0530 Subject: [PATCH 15/31] Update Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 7996366e..46b8a3ea 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,7 +11,7 @@ pipeline { echo 'compile maven app' echo 'Ashish Gupta' sh 'mvn compile' - sleep 180 + } } From 7538bf3822c64ce27638032e9a9d076d3aa02c72 Mon Sep 17 00:00:00 2001 From: ietashish Date: Fri, 29 Sep 2023 15:54:09 +0530 Subject: [PATCH 16/31] Update Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 46b8a3ea..50f69b52 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -9,7 +9,7 @@ pipeline { stage('build') { steps { echo 'compile maven app' - echo 'Ashish Gupta' + echo 'Ashish Gupta 2' sh 'mvn compile' } From 020cf37b9d4bfff27b3119f28f8c05ff5e782394 Mon Sep 17 00:00:00 2001 From: Ashish Gupta Date: Fri, 29 Sep 2023 16:36:07 +0530 Subject: [PATCH 17/31] editing jspo --- src/main/webapp/index.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index f441d8d6..68516e91 100755 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -55,7 +55,7 @@

About

-

School of Devops is a leading provider of devops trainings and offers variety of courses which focus on Infrastrucrture as a Code, Container and Docker, Continuous Delivery, Cloud. To learn more visit http://www.schoolofdevops.com.

+

School of Devops 2 is a leading provider of devops trainings and offers variety of courses which focus on Infrastrucrture as a Code, Container and Docker, Continuous Delivery, Cloud. To learn more visit http://www.schoolofdevops.com.

From a34b4241cd647ff5af4fe83c3944814a22dfe1aa Mon Sep 17 00:00:00 2001 From: ietashish Date: Fri, 29 Sep 2023 17:06:01 +0530 Subject: [PATCH 18/31] Update Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 50f69b52..6aaefe7d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -9,7 +9,7 @@ pipeline { stage('build') { steps { echo 'compile maven app' - echo 'Ashish Gupta 2' + echo 'Ashish Gupta 4' sh 'mvn compile' } From 889abad0f8538de19ade6b881f97f92b3b3e5d13 Mon Sep 17 00:00:00 2001 From: ietashish Date: Fri, 29 Sep 2023 17:20:24 +0530 Subject: [PATCH 19/31] updating agent --- Jenkinsfile | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 6aaefe7d..be4e5357 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,7 +1,9 @@ pipeline { - agent any - tools { - maven 'MyMaven' + agent { + docker { + image 'maven:3.6.3-jdk-11-slim' + } + } stages { stage('build') { @@ -11,7 +13,6 @@ pipeline { echo 'compile maven app' echo 'Ashish Gupta 4' sh 'mvn compile' - } } @@ -34,5 +35,7 @@ pipeline { } } - -} + tools { + maven 'MyMaven' + } +} \ No newline at end of file From 38ac9f9d1a4ae708ddf39adba2cdb09c37ead38c Mon Sep 17 00:00:00 2001 From: Ashish Gupta Date: Fri, 29 Sep 2023 17:24:27 +0530 Subject: [PATCH 20/31] sleep --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index be4e5357..a9125917 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -13,6 +13,7 @@ pipeline { echo 'compile maven app' echo 'Ashish Gupta 4' sh 'mvn compile' + sleep 100 } } From 67c6434ebd0ab10e3971fc500d0d3955a9813168 Mon Sep 17 00:00:00 2001 From: Ashish Gupta Date: Wed, 4 Oct 2023 15:39:35 +0530 Subject: [PATCH 21/31] Adding dockerfile --- Dockerfile | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 00000000..8964465d --- /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 \ No newline at end of file From ab290e8bdab6ec3bcd2392e1c1f1081d3d3fdf69 Mon Sep 17 00:00:00 2001 From: ietashish Date: Wed, 4 Oct 2023 15:51:12 +0530 Subject: [PATCH 22/31] Added Jenkinsfile --- Jenkinsfile | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index a9125917..7a1e4473 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -7,29 +7,25 @@ pipeline { } stages { stage('build') { - parallel { - stage('build') { - steps { - echo 'compile maven app' - echo 'Ashish Gupta 4' - sh 'mvn compile' - sleep 100 - } - } - - stage('test') { - steps { - echo 'Testing....' - sh 'mvn clean test' - } - } + steps { + echo 'compile maven app' + echo 'Ashish Gupta 4' + sh 'mvn compile' + sleep 100 + } + } + stage('test') { + steps { + echo 'Testing' + sh 'mvn clean test' + archiveArtifacts 'target/*.war' } } stage('package') { steps { - echo 'package maven app' + echo 'Packaging' sh 'mvn package -DskipTests' archiveArtifacts 'target/*.war' } From 1b4dd9a1c32f3dc5ed4f88ae761df0d6374cc99c Mon Sep 17 00:00:00 2001 From: ietashish Date: Wed, 4 Oct 2023 15:52:10 +0530 Subject: [PATCH 23/31] Update Jenkinsfile --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 7a1e4473..c46e1b3c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,7 +11,7 @@ pipeline { echo 'compile maven app' echo 'Ashish Gupta 4' sh 'mvn compile' - sleep 100 + } } @@ -35,4 +35,4 @@ pipeline { tools { maven 'MyMaven' } -} \ No newline at end of file +} From 34b791b0ff8d57dc23e090a0e2e4651b28213aab Mon Sep 17 00:00:00 2001 From: ietashish Date: Wed, 4 Oct 2023 15:54:53 +0530 Subject: [PATCH 24/31] Update Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index c46e1b3c..fb89cd9d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -19,7 +19,7 @@ pipeline { steps { echo 'Testing' sh 'mvn clean test' - archiveArtifacts 'target/*.war' + } } From 9d5bb717248f82422b3117bc0b32fb826080815c Mon Sep 17 00:00:00 2001 From: ietashish Date: Wed, 4 Oct 2023 16:04:01 +0530 Subject: [PATCH 25/31] Added Jenkinsfile --- Jenkinsfile | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index fb89cd9d..4c107a10 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,7 +11,6 @@ pipeline { echo 'compile maven app' echo 'Ashish Gupta 4' sh 'mvn compile' - } } @@ -19,7 +18,6 @@ pipeline { steps { echo 'Testing' sh 'mvn clean test' - } } @@ -31,8 +29,23 @@ pipeline { } } + stage('Docker BnP') { + agent any + steps { + script { + docker.withRegistry('https://index.docker.io/v1/', 'dockerlogin') { + def dockerImage = docker.build("ietashish/sysfoo:v${env.BUILD_ID}", "./") + dockerImage.push() + dockerImage.push("latest") + dockerImage.push("dev") + } + } + + } + } + } tools { maven 'MyMaven' } -} +} \ No newline at end of file From 691213e13a807eee1aca7af75b34f5d3a6e25648 Mon Sep 17 00:00:00 2001 From: ietashish Date: Wed, 4 Oct 2023 16:24:15 +0530 Subject: [PATCH 26/31] Added Jenkinsfile --- Jenkinsfile | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 4c107a10..8e82c7be 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 maven app' echo 'Ashish Gupta 4' @@ -15,6 +16,12 @@ pipeline { } stage('test') { + agent { + docker { + image 'maven:3.6.3-jdk-11-slim' + } + + } steps { echo 'Testing' sh 'mvn clean test' @@ -22,6 +29,12 @@ pipeline { } stage('package') { + agent { + docker { + image 'maven:3.6.3-jdk-11-slim' + } + + } steps { echo 'Packaging' sh 'mvn package -DskipTests' From 39157e3d4717f398f0bb5085ee28679367110a6f Mon Sep 17 00:00:00 2001 From: ietashish Date: Wed, 4 Oct 2023 16:36:26 +0530 Subject: [PATCH 27/31] Update Jenkinsfile --- Jenkinsfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 8e82c7be..10f685bf 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -2,6 +2,7 @@ pipeline { agent none stages { stage('build') { + agent { docker { image 'maven:3.6.3-jdk-11-slim' @@ -9,6 +10,7 @@ pipeline { } steps { + echo env.BRANCH_NAME echo 'compile maven app' echo 'Ashish Gupta 4' sh 'mvn compile' @@ -61,4 +63,4 @@ pipeline { tools { maven 'MyMaven' } -} \ No newline at end of file +} From 5b707fcf34a2d924505c20ceae3b06a016c4addd Mon Sep 17 00:00:00 2001 From: ietashish Date: Wed, 4 Oct 2023 16:41:26 +0530 Subject: [PATCH 28/31] Update Jenkinsfile --- Jenkinsfile | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 10f685bf..b3a6d484 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,6 +1,6 @@ pipeline { agent none - stages { + stages { stage('build') { agent { @@ -31,6 +31,10 @@ pipeline { } stage('package') { + when { + branch 'master' + } + agent { docker { image 'maven:3.6.3-jdk-11-slim' @@ -45,6 +49,9 @@ pipeline { } stage('Docker BnP') { + when { + branch 'master' + } agent any steps { script { From fd073b5038ed5503343a6bdaa0b2f6115462ab23 Mon Sep 17 00:00:00 2001 From: ietashish Date: Wed, 4 Oct 2023 16:44:10 +0530 Subject: [PATCH 29/31] Update Jenkinsfile --- Jenkinsfile | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index b3a6d484..cabdd5cc 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -29,11 +29,13 @@ pipeline { sh 'mvn clean test' } } - - stage('package') { - when { + parallel { + when { branch 'master' } + + stage('package') { + agent { docker { @@ -65,6 +67,9 @@ pipeline { } } + } + + } tools { From a141a790514d3f9f5b20e40b08128953e4fb8ad8 Mon Sep 17 00:00:00 2001 From: ietashish Date: Wed, 4 Oct 2023 16:49:15 +0530 Subject: [PATCH 30/31] Update Jenkinsfile --- Jenkinsfile | 64 ++++++++++++++++++++++++++--------------------------- 1 file changed, 31 insertions(+), 33 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index cabdd5cc..bacfa124 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -29,48 +29,46 @@ pipeline { sh 'mvn clean test' } } - parallel { + + stage('package war and docker') + { + parallel { when { - branch 'master' - } + branch 'master' + } + stage('package') { + agent { + docker { + image 'maven:3.6.3-jdk-11-slim' + } - stage('package') { - - - agent { - docker { - image 'maven:3.6.3-jdk-11-slim' + } + steps { + echo 'Packaging' + sh 'mvn package -DskipTests' + archiveArtifacts 'target/*.war' + } } - } - steps { - echo 'Packaging' - sh 'mvn package -DskipTests' - archiveArtifacts 'target/*.war' - } - } + stage('Docker BnP') { + when { + branch 'master' + } + agent any + steps { + script { + docker.withRegistry('https://index.docker.io/v1/', 'dockerlogin') { + def dockerImage = docker.build("ietashish/sysfoo:v${env.BUILD_ID}", "./") + dockerImage.push() + dockerImage.push("latest") + dockerImage.push("dev") + } + } - stage('Docker BnP') { - when { - branch 'master' - } - agent any - steps { - script { - docker.withRegistry('https://index.docker.io/v1/', 'dockerlogin') { - def dockerImage = docker.build("ietashish/sysfoo:v${env.BUILD_ID}", "./") - dockerImage.push() - dockerImage.push("latest") - dockerImage.push("dev") } } - } } - } - - - } tools { maven 'MyMaven' From 45ef8a83ef1e9b40e7ea85c7aca0bed857a93727 Mon Sep 17 00:00:00 2001 From: ietashish Date: Wed, 4 Oct 2023 16:51:47 +0530 Subject: [PATCH 31/31] Update Jenkinsfile --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index bacfa124..36d352a4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -32,10 +32,10 @@ pipeline { stage('package war and docker') { - parallel { - when { + when { branch 'master' } + parallel { stage('package') { agent { docker {