From 55c6a3b5b9f591fcaa98cb6a90674285e6214d76 Mon Sep 17 00:00:00 2001 From: Sai Date: Sun, 25 Jul 2021 09:23:06 +0000 Subject: [PATCH 1/4] Mofified file --- webapp/src/main/webapp/index.jsp | 1 - 1 file changed, 1 deletion(-) diff --git a/webapp/src/main/webapp/index.jsp b/webapp/src/main/webapp/index.jsp index e9003cc8..20d301c6 100644 --- a/webapp/src/main/webapp/index.jsp +++ b/webapp/src/main/webapp/index.jsp @@ -2,4 +2,3 @@

By Mr.Hari from Saidemy

It's time to start the DevOps Project-2 by Mr.Hari!!

This is what complete End-to-End CI-CD pipeline DevOps Project!!

-

We are done with DevOps Project-2

From a6ee8c7af70058babd016e43c4d98c0f4cc5f062 Mon Sep 17 00:00:00 2001 From: sai Date: Sun, 25 Jul 2021 14:25:14 +0000 Subject: [PATCH 2/4] Modified code for git upload --- webapp/src/main/webapp/index.jsp | 1 + 1 file changed, 1 insertion(+) diff --git a/webapp/src/main/webapp/index.jsp b/webapp/src/main/webapp/index.jsp index 20d301c6..7eb45258 100644 --- a/webapp/src/main/webapp/index.jsp +++ b/webapp/src/main/webapp/index.jsp @@ -2,3 +2,4 @@

By Mr.Hari from Saidemy

It's time to start the DevOps Project-2 by Mr.Hari!!

This is what complete End-to-End CI-CD pipeline DevOps Project!!

+

This is the end to end pipeline of the Jenkins server

From 1fbc274dafea5971ad63d2763e1c6f608abaad79 Mon Sep 17 00:00:00 2001 From: sai Date: Sun, 25 Jul 2021 19:28:54 +0000 Subject: [PATCH 3/4] New lines are added --- webapp/src/main/webapp/index.jsp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/webapp/src/main/webapp/index.jsp b/webapp/src/main/webapp/index.jsp index 7eb45258..32ace6b1 100644 --- a/webapp/src/main/webapp/index.jsp +++ b/webapp/src/main/webapp/index.jsp @@ -1,5 +1,8 @@ -

Hello Dear Students !!, Welcome to DevOps Project-2 !!

-

By Mr.Hari from Saidemy

-

It's time to start the DevOps Project-2 by Mr.Hari!!

-

This is what complete End-to-End CI-CD pipeline DevOps Project!!

-

This is the end to end pipeline of the Jenkins server

+

This project is combination of aws, git, jenkins, maven, tomcat, ansible and docker

+ +

It takes around 5 hours to complete the project from end to end

+ +

Applied Continous Integration and Continous Development/Deployment( CI-CD ) concept

+ +

No need of manual work from end to end in project. As per the instructions mentioned, it will run and deploy in servers

+ From 35ea201fb590fc171d46dfd214924f8e8b4a4e7f Mon Sep 17 00:00:00 2001 From: sai Date: Sun, 25 Jul 2021 19:33:29 +0000 Subject: [PATCH 4/4] many lines are extra added --- webapp/src/main/webapp/index.jsp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/webapp/src/main/webapp/index.jsp b/webapp/src/main/webapp/index.jsp index 32ace6b1..47c4cfad 100644 --- a/webapp/src/main/webapp/index.jsp +++ b/webapp/src/main/webapp/index.jsp @@ -1,4 +1,4 @@ -

This project is combination of aws, git, jenkins, maven, tomcat, ansible and docker

+

This project-2 is combination of aws, git, jenkins, maven, tomcat, ansible and docker

It takes around 5 hours to complete the project from end to end

@@ -6,3 +6,4 @@

No need of manual work from end to end in project. As per the instructions mentioned, it will run and deploy in servers

+
This the sample output which continously developer is pushing the code, jenkins will pull from github and it will do build, test and quality check and crating of .war file. Once .war file is created it will delivered to ansible-server and from ansible-server it will deploy in to docker container