From 94d7c6bda73039833a7c7f11761debc612c159ea Mon Sep 17 00:00:00 2001 From: harendrasp Date: Fri, 29 Sep 2023 14:42:50 +0530 Subject: [PATCH 01/17] Create Jenkinsfile --- Jenkinsfile | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 00000000..4ed37809 --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,32 @@ +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' + } + } + } + + post{ + always{ + echo 'This pipeline is completed..' + } + } +} From 62aee2fcd7bca71db8f5ff2afdb07dfe41e2d6ab Mon Sep 17 00:00:00 2001 From: harendrasp Date: Fri, 29 Sep 2023 14:56:19 +0530 Subject: [PATCH 02/17] save artifact --- Jenkinsfile | 50 +++++++++++++++++++++++++++----------------------- 1 file changed, 27 insertions(+), 23 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 4ed37809..4de9b4ac 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,32 +1,36 @@ pipeline { agent any - tools { - maven 'Maven 3.6.3' - } stages { - stage('build'){ - steps{ - echo 'compile maven app' - sh 'mvn compile' - } + stage('build') { + steps { + echo 'compile maven app' + sh 'mvn compile' } - stage('test'){ - steps{ - echo 'Test maven app' - sh 'mvn clean test' - } + } + + 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' + archiveArtifacts 'target/*war' } - } + } - post{ - always{ - echo 'This pipeline is completed..' + } + tools { + maven 'Maven 3.6.3' + } + post { + always { + echo 'This pipeline is completed..' } + } -} +} \ No newline at end of file From da98c2db8326b5ae4777649aab6276a247b6ca39 Mon Sep 17 00:00:00 2001 From: harendrasp Date: Fri, 29 Sep 2023 16:39:58 +0530 Subject: [PATCH 03/17] Update index.jsp --- 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..6bb33749 100755 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -6,7 +6,7 @@ --> - Sysfoo Demo App by School of Devops + Sysfoo Demo App by School of Devops(Adding change to create diff) From 56afb85128e568b4a5226472aed817a3df279c46 Mon Sep 17 00:00:00 2001 From: harendrasp Date: Fri, 29 Sep 2023 16:53:32 +0530 Subject: [PATCH 04/17] Update index.jsp --- 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..85f0131e 100755 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -6,7 +6,7 @@ --> - Sysfoo Demo App by School of Devops + Sysfoo Demo App by School of Devops(creating change to generate diff) From 64b5bf894b23738d5a8d0e171790e60649c1a100 Mon Sep 17 00:00:00 2001 From: harendrasp Date: Fri, 29 Sep 2023 17:42:59 +0530 Subject: [PATCH 05/17] Added Jenkinsfile --- Jenkinsfile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 4de9b4ac..ce0db68a 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 c8683c23403b6a57e9bf43c25b0df4df5570c276 Mon Sep 17 00:00:00 2001 From: harendrasp Date: Wed, 4 Oct 2023 15:36:29 +0530 Subject: [PATCH 06/17] Update index.jsp --- 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 b5e9d826..fe98ff42 100755 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -6,7 +6,7 @@ --> - Sysfoo Demo App by School of Devops(creating change to generate diff) + Sysfoo Demo App by School of Devops From 4f0b86a36e76081a6d1060668df584f415f0104d Mon Sep 17 00:00:00 2001 From: harendrasp Date: Wed, 4 Oct 2023 15:43:12 +0530 Subject: [PATCH 07/17] Added Jenkinsfile --- Jenkinsfile | 39 +++++++++++++++++++++++++++++++++------ 1 file changed, 33 insertions(+), 6 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index ce0db68a..b10391f7 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' sh 'mvn compile' @@ -14,6 +15,12 @@ pipeline { } stage('test') { + agent { + docker { + image 'maven:3.6.3-jdk-11-slim' + } + + } steps { echo 'Test maven app' sh 'mvn clean test' @@ -21,6 +28,12 @@ pipeline { } stage('package') { + agent { + docker { + image 'maven:3.6.3-jdk-11-slim' + } + + } steps { echo 'package maven app' sh 'mvn package -DskipTests' @@ -28,6 +41,20 @@ pipeline { } } + stage('Docker B&P') { + steps { + script { + docker.withRegistry('https://index.docker.io/v1/', 'dckr_pat_E1P6ElnsQuHyDdSqE7DveqABpgQ') { + def dockerImage = docker.build("letmeplay/sysfoo:v${env.BUILD_ID}", "./") + dockerImage.push() + dockerImage.push("latest") + dockerImage.push("dev") + } + } + + } + } + } tools { maven 'Maven 3.6.3' From fa70a5ac320b15288b6d6f04981ec8cd4307581f Mon Sep 17 00:00:00 2001 From: harendrasp Date: Wed, 4 Oct 2023 15:44:41 +0530 Subject: [PATCH 08/17] Added Jenkinsfile --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index b10391f7..2b5dad12 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -42,6 +42,7 @@ pipeline { } stage('Docker B&P') { + agent any steps { script { docker.withRegistry('https://index.docker.io/v1/', 'dckr_pat_E1P6ElnsQuHyDdSqE7DveqABpgQ') { From ee60c9d4f4e087cea45c90091582810c50c206ba Mon Sep 17 00:00:00 2001 From: harendrasp Date: Wed, 4 Oct 2023 15:47:54 +0530 Subject: [PATCH 09/17] Added Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 2b5dad12..6b2196e5 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -45,7 +45,7 @@ pipeline { agent any steps { script { - docker.withRegistry('https://index.docker.io/v1/', 'dckr_pat_E1P6ElnsQuHyDdSqE7DveqABpgQ') { + docker.withRegistry('https://index.docker.io/v1/', 'dockerlogin') { def dockerImage = docker.build("letmeplay/sysfoo:v${env.BUILD_ID}", "./") dockerImage.push() dockerImage.push("latest") From 2b72950012c9cf8150c5d36c4a1459f624b73bba Mon Sep 17 00:00:00 2001 From: harendrasp Date: Wed, 4 Oct 2023 15:51:42 +0530 Subject: [PATCH 10/17] 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..ad262a19 --- /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 2218c95ffb1b7c991bbc2d682ac6824d2f69f911 Mon Sep 17 00:00:00 2001 From: harendrasp Date: Wed, 4 Oct 2023 16:06:27 +0530 Subject: [PATCH 11/17] Update Jenkinsfile --- Jenkinsfile | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 6b2196e5..38dd8c3e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -6,7 +6,6 @@ pipeline { docker { image 'maven:3.6.3-jdk-11-slim' } - } steps { echo 'compile maven app' @@ -28,6 +27,9 @@ pipeline { } stage('package') { + when { + branch 'master' + } agent { docker { image 'maven:3.6.3-jdk-11-slim' @@ -42,6 +44,9 @@ pipeline { } stage('Docker B&P') { + when { + branch 'master' + } agent any steps { script { @@ -66,4 +71,4 @@ pipeline { } } -} \ No newline at end of file +} From fbc04a17f3c0b618731e59d90cf28dd8134a77f1 Mon Sep 17 00:00:00 2001 From: harendrasp Date: Wed, 4 Oct 2023 16:10:41 +0530 Subject: [PATCH 12/17] Parallel package and jobs --- Jenkinsfile | 42 +++++++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 6b2196e5..b8ac6314 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -28,28 +28,32 @@ pipeline { } stage('package') { - agent { - docker { - image 'maven:3.6.3-jdk-11-slim' + parallel { + stage('package') { + agent { + docker { + image 'maven:3.6.3-jdk-11-slim' + } + + } + steps { + echo 'package maven app' + sh 'mvn package -DskipTests' + archiveArtifacts 'target/*war' + } } - } - steps { - echo 'package maven app' - sh 'mvn package -DskipTests' - archiveArtifacts 'target/*war' - } - } + stage('Docker B&P2') { + steps { + script { + docker.withRegistry('https://index.docker.io/v1/', 'dockerlogin') { + def dockerImage = docker.build("letmeplay/sysfoo:v${env.BUILD_ID}", "./") + dockerImage.push() + dockerImage.push("latest") + dockerImage.push("dev") + } + } - stage('Docker B&P') { - agent any - steps { - script { - docker.withRegistry('https://index.docker.io/v1/', 'dockerlogin') { - def dockerImage = docker.build("letmeplay/sysfoo:v${env.BUILD_ID}", "./") - dockerImage.push() - dockerImage.push("latest") - dockerImage.push("dev") } } From fd22766956b1dd5b10932640991f49d58ef79820 Mon Sep 17 00:00:00 2001 From: harendrasp Date: Wed, 4 Oct 2023 16:17:14 +0530 Subject: [PATCH 13/17] Added Jenkinsfile From e4f8b59f51116c2677ab8f18d02cd740da965ad0 Mon Sep 17 00:00:00 2001 From: harendrasp Date: Wed, 4 Oct 2023 16:30:28 +0530 Subject: [PATCH 14/17] Added Jenkinsfile --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index b8ac6314..9350e76f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -44,6 +44,7 @@ pipeline { } stage('Docker B&P2') { + agent any steps { script { docker.withRegistry('https://index.docker.io/v1/', 'dockerlogin') { From 44b17be555b9b358b1ce5577a75c9e956583a150 Mon Sep 17 00:00:00 2001 From: harendrasp Date: Wed, 4 Oct 2023 17:53:50 +0530 Subject: [PATCH 15/17] Added Jenkinsfile --- Jenkinsfile | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 8722661d..b348ce1c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -6,6 +6,7 @@ pipeline { docker { image 'maven:3.6.3-jdk-11-slim' } + } steps { echo 'compile maven app' @@ -28,7 +29,7 @@ pipeline { stage('package') { when { - branch 'master' + branch 'master' } parallel { stage('package') { @@ -56,12 +57,20 @@ pipeline { dockerImage.push("dev") } } + } } } } + stage('deployToDev') { + agent any + steps { + sh 'docker-compose up -d' + } + } + } tools { maven 'Maven 3.6.3' @@ -72,4 +81,4 @@ pipeline { } } -} +} \ No newline at end of file From 5723354ab32c908891ce995af030b2b6eaf34a79 Mon Sep 17 00:00:00 2001 From: harendrasp Date: Wed, 4 Oct 2023 17:58:42 +0530 Subject: [PATCH 16/17] Create docker-compose.yaml --- docker-compose.yaml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 docker-compose.yaml diff --git a/docker-compose.yaml b/docker-compose.yaml new file mode 100644 index 00000000..5f2c90c0 --- /dev/null +++ b/docker-compose.yaml @@ -0,0 +1,7 @@ +version: "3.8" + +services: + sysfoo: + image: letmeplay/sysfoo:dev + ports: + - 8888:8080 From 11153b29e400b31b970843af7348675dfea8cfda Mon Sep 17 00:00:00 2001 From: harendrasp Date: Wed, 4 Oct 2023 18:03:38 +0530 Subject: [PATCH 17/17] deployToDevOnlyIfMaster --- Jenkinsfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index b348ce1c..4e1256cd 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -65,6 +65,9 @@ pipeline { } stage('deployToDev') { + when { + branch 'master' + } agent any steps { sh 'docker-compose up -d' @@ -81,4 +84,4 @@ pipeline { } } -} \ No newline at end of file +}