From 87953eb3e703da58ce668b26908632b466cf0b4e Mon Sep 17 00:00:00 2001 From: Deekshith SN Date: Sat, 18 Feb 2023 09:21:42 +0530 Subject: [PATCH 01/15] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 78662a2a..a88d2d73 100644 --- a/README.md +++ b/README.md @@ -12,3 +12,5 @@ and build the instruction . Deploy ```target/WebApp.war``` on Tomcat properly for better experience. + + From 25b367b7d9954b16da9d92a584a214d374ff7fd3 Mon Sep 17 00:00:00 2001 From: Deekshith SN Date: Sat, 18 Feb 2023 12:56:04 +0530 Subject: [PATCH 02/15] Delete test --- test | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 test diff --git a/test b/test deleted file mode 100644 index 03e0cd9a..00000000 --- a/test +++ /dev/null @@ -1,3 +0,0 @@ -My changes -A B -githubtrigger From 078fff063f78a13ae5954a37eecc6304a6e70feb Mon Sep 17 00:00:00 2001 From: Deekshith SN Date: Sat, 18 Feb 2023 13:03:17 +0530 Subject: [PATCH 03/15] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9b43cb6e..8491d28a 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ lu.amazon.aws.demo WebApp war - 2.0 + 2.0-SNAPSHOT WebApp Maven Webapp http://maven.apache.org From 95c70f57fbd7cdcdb84ee747644674e9b7904b71 Mon Sep 17 00:00:00 2001 From: DeekshithSN Date: Sat, 18 Feb 2023 13:25:26 +0530 Subject: [PATCH 04/15] mvn deploy --- Jenkinsfile | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 4265b450..f1e7f0c0 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -38,6 +38,15 @@ pipeline{ } } + stage('docker login and build'){ + steps{ + script{ + sh "docker login -u admin -p admin 34.125.26.221:8083" + } + } + } + + } post { From 52c088043bcefc179cbba10260a89f38fd1a2986 Mon Sep 17 00:00:00 2001 From: Deekshith SN Date: Sat, 18 Feb 2023 14:13:53 +0530 Subject: [PATCH 05/15] Update README.md --- README.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/README.md b/README.md index a88d2d73..94ba7cd3 100644 --- a/README.md +++ b/README.md @@ -11,6 +11,3 @@ and build the instruction . # Deploy instruction Deploy ```target/WebApp.war``` on Tomcat properly for better experience. - - - From 9fc1adc26f01eba84e438d3ba7df8115ddf25f24 Mon Sep 17 00:00:00 2001 From: DeekshithSN Date: Sat, 18 Feb 2023 14:27:43 +0530 Subject: [PATCH 06/15] mvn deploy --- Jenkinsfile | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index f1e7f0c0..4260f191 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,5 +1,13 @@ +def getDockerTag(){ + def tag = sh script: 'git rev-parse --short HEAD', returnStdout: true + return tag + } + pipeline{ agent any + environment{ + Docker_tag = getDockerTag() + } stages{ stage("Sonar scan"){ agent { @@ -41,7 +49,11 @@ pipeline{ stage('docker login and build'){ steps{ script{ - sh "docker login -u admin -p admin 34.125.26.221:8083" + sh """ + docker login -u admin -p admin 34.125.26.221:8083 + docker build -t 34.125.26.221:8083/sample-app:$Docker_tag + """ + } } } From f80556e7fa2918e6fdf076828c88f127d2122816 Mon Sep 17 00:00:00 2001 From: DeekshithSN Date: Sat, 18 Feb 2023 14:29:54 +0530 Subject: [PATCH 07/15] mvn deploy --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 4260f191..9896b21a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -51,7 +51,7 @@ pipeline{ script{ sh """ docker login -u admin -p admin 34.125.26.221:8083 - docker build -t 34.125.26.221:8083/sample-app:$Docker_tag + docker build -t 34.125.26.221:8083/sample-app:$Docker_tag . """ } From 6b985012aa2dcf3d67a10d7e1f74e04df0431909 Mon Sep 17 00:00:00 2001 From: DeekshithSN Date: Sat, 18 Feb 2023 14:33:29 +0530 Subject: [PATCH 08/15] mvn deploy --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 9896b21a..23f1639d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -51,7 +51,7 @@ pipeline{ script{ sh """ docker login -u admin -p admin 34.125.26.221:8083 - docker build -t 34.125.26.221:8083/sample-app:$Docker_tag . + docker build -t 34.125.26.221:8083/sample-web-app:$Docker_tag . """ } From a599620d01f62794a6829934fda2e7d7159fd9cd Mon Sep 17 00:00:00 2001 From: DeekshithSN Date: Sat, 18 Feb 2023 14:35:46 +0530 Subject: [PATCH 09/15] mvn deploy --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 23f1639d..3e4f412d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -51,7 +51,7 @@ pipeline{ script{ sh """ docker login -u admin -p admin 34.125.26.221:8083 - docker build -t 34.125.26.221:8083/sample-web-app:$Docker_tag . + docker build . -t 34.125.26.221:8083/sample-web-app:$Docker_tag """ } From 3f00589f389eade4e3ba5d18a91e74f5e1e17960 Mon Sep 17 00:00:00 2001 From: DeekshithSN Date: Sat, 18 Feb 2023 14:38:24 +0530 Subject: [PATCH 10/15] mvn deploy --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index 3e4f412d..ebcca675 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -51,6 +51,7 @@ pipeline{ script{ sh """ docker login -u admin -p admin 34.125.26.221:8083 + cp -r ../backend-app@2/target . docker build . -t 34.125.26.221:8083/sample-web-app:$Docker_tag """ From 40efcd56009de0971c518f3da538cd92d4316aa9 Mon Sep 17 00:00:00 2001 From: DeekshithSN Date: Sat, 18 Feb 2023 14:42:13 +0530 Subject: [PATCH 11/15] mvn deploy --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index ebcca675..5fcf1145 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -51,7 +51,7 @@ pipeline{ script{ sh """ docker login -u admin -p admin 34.125.26.221:8083 - cp -r ../backend-app@2/target . + cp -r ../ci-pull-request@2/target . docker build . -t 34.125.26.221:8083/sample-web-app:$Docker_tag """ From 088a04223587be3c43b4d709bb986abe347ff786 Mon Sep 17 00:00:00 2001 From: DeekshithSN Date: Sat, 18 Feb 2023 14:44:39 +0530 Subject: [PATCH 12/15] mvn deploy --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index 5fcf1145..8bcd3438 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -53,6 +53,7 @@ pipeline{ docker login -u admin -p admin 34.125.26.221:8083 cp -r ../ci-pull-request@2/target . docker build . -t 34.125.26.221:8083/sample-web-app:$Docker_tag + docker push 34.125.26.221:8083/sample-web-app:$Docker_tag """ } From eb57572e367db1f14379d1c5cdc9dbcc3c75c747 Mon Sep 17 00:00:00 2001 From: DeekshithSN Date: Sat, 18 Feb 2023 16:48:19 +0530 Subject: [PATCH 13/15] mvn deploy --- Jenkinsfile | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 8bcd3438..fe658350 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -60,6 +60,17 @@ pipeline{ } } + stage('connect k8s cluster'){ + steps{ + script{ + configFileProvider( + [configFile(fileId: 'kube-config-file', variable: 'KUBECONFIG')]) { + sh 'kubectl get po' + } + } + } + } + } From 91529fafbea72ffcc5a871f2e1efac42e28aee5d Mon Sep 17 00:00:00 2001 From: DeekshithSN Date: Sat, 18 Feb 2023 16:57:27 +0530 Subject: [PATCH 14/15] mvn deploy --- Jenkinsfile | 16 +++++++++++++++- deployment.yaml | 2 +- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index fe658350..482b5557 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -60,12 +60,26 @@ pipeline{ } } + stage('prepare deplyment file'){ + steps{ + script{ + sh ''' + final_tag=$(echo $Docker_tag | tr -d ' ') + sed -i "s|TAG|$final_tag|" deployment.yaml + cat deployment.yaml + ''' + } + } + } stage('connect k8s cluster'){ steps{ script{ configFileProvider( [configFile(fileId: 'kube-config-file', variable: 'KUBECONFIG')]) { - sh 'kubectl get po' + sh """ + kubectl get po + kubectl apply -f deployment.yaml + """ } } } diff --git a/deployment.yaml b/deployment.yaml index 08bfdcc7..ac7d9566 100644 --- a/deployment.yaml +++ b/deployment.yaml @@ -13,7 +13,7 @@ spec: spec: containers: - name: devops-training - image: deekshithsn/webapp:TAG + image: 34.125.26.221/sample-web-app:TAG command: ["/bin/sh"] args: ["-c","sh /usr/local/tomcat/bin/startup.sh;while true; do echo hello; sleep 10;done"] ports: From 0f2ea5d83445c185fac6560c250a0b773f6b906a Mon Sep 17 00:00:00 2001 From: DeekshithSN Date: Sat, 18 Feb 2023 17:04:16 +0530 Subject: [PATCH 15/15] mvn deploy --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index 482b5557..0cc85334 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -91,6 +91,7 @@ pipeline{ post { always{ cleanWs() + sh 'kubectl delete -f deployment.yaml' } } } \ No newline at end of file