From 7d567fa62e0934d536c1b153c05135a54b272ab4 Mon Sep 17 00:00:00 2001 From: rranjith406 <52668325+rranjith406@users.noreply.github.com> Date: Tue, 18 Jan 2022 23:37:46 +0530 Subject: [PATCH 01/28] welcome to devops website test --- src/main/webapp/index.jsp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index ead0e510f..52f6c662f 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -5,9 +5,9 @@

Hello World!

- It is now + Today is <%= new java.util.Date() %>

- You are coming from - <%= request.getRemoteAddr() %>

- \ No newline at end of file + welcome to devops website +

+ From d3f4d1d014b52012f99f7750bbfadc1a1d2712ae Mon Sep 17 00:00:00 2001 From: rranjith406 <52668325+rranjith406@users.noreply.github.com> Date: Thu, 20 Jan 2022 00:47:46 +0530 Subject: [PATCH 02/28] replaced website with class --- 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 52f6c662f..ce64d2939 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -8,6 +8,6 @@ Today is <%= new java.util.Date() %>

- welcome to devops website + welcome to devops class

From 31cc2eafb995179f4cf66239a9c6ea282f7b9cad Mon Sep 17 00:00:00 2001 From: rranjith406 <52668325+rranjith406@users.noreply.github.com> Date: Thu, 20 Jan 2022 00:52:38 +0530 Subject: [PATCH 03/28] ci/cd --- src/main/webapp/index.jsp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index ce64d2939..ede19554f 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -3,11 +3,10 @@ Hello World! -

Hello World!

+

CI/CD

Today is <%= new java.util.Date() %>

-

- welcome to devops class -

+

Continuous integration and continuous delivery

+

Continuous delivery is a software development methodology where the release process is automated. ... Continuous integration is a software development practice where members of a team use a version control system and frequently integrate their work to the same location, such as a main branch.

From bb3c56d6a8a459ebc0e386ed18b552be0a3b5229 Mon Sep 17 00:00:00 2001 From: rranjith406 <52668325+rranjith406@users.noreply.github.com> Date: Thu, 20 Jan 2022 08:25:57 +0530 Subject: [PATCH 04/28] DevOps people --- 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 ede19554f..0bcf1d21a 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -1,6 +1,6 @@ -Hello World! +Hello DevOps people!

CI/CD

From 745978671d2ba4a7d8a4951d413cf6a63be2d0c6 Mon Sep 17 00:00:00 2001 From: rranjith406 <52668325+rranjith406@users.noreply.github.com> Date: Thu, 20 Jan 2022 08:28:06 +0530 Subject: [PATCH 05/28] added body --- src/main/webapp/index.jsp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index 0bcf1d21a..9c5cf4b6e 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -3,6 +3,7 @@ Hello DevOps people! +

Hello DevOps people this is Dec 21

CI/CD

Today is From 59cfc6c75457169df1c5cada363d9e4175a9e68d Mon Sep 17 00:00:00 2001 From: rranjith406 <52668325+rranjith406@users.noreply.github.com> Date: Thu, 20 Jan 2022 08:31:55 +0530 Subject: [PATCH 06/28] This is DevOps --- src/main/webapp/index.jsp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index 9c5cf4b6e..9bf5f6a5d 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -4,10 +4,12 @@

Hello DevOps people this is Dec 21

+

This is DevOps class

CI/CD

Today is <%= new java.util.Date() %>

Continuous integration and continuous delivery

-

Continuous delivery is a software development methodology where the release process is automated. ... Continuous integration is a software development practice where members of a team use a version control system and frequently integrate their work to the same location, such as a main branch.

+

Continuous delivery is a software development methodology where the release process is automated....

+

Continuous integration is a software development practice where members of a team use a version control system and frequently integrate their work to the same location, such as a main branch.

From 22bfc60b240e82e384467c7d5badbda63b3358df Mon Sep 17 00:00:00 2001 From: Ranjith Date: Thu, 5 May 2022 16:00:35 +0000 Subject: [PATCH 07/28] Adding Atos --- 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 9bf5f6a5d..86e64ff27 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -1,6 +1,6 @@ -Hello DevOps people! +Hello DevOps people! from Atos

Hello DevOps people this is Dec 21

From fcb1c2327ffb3a8341412891e43a2b8e18992306 Mon Sep 17 00:00:00 2001 From: Ranjith Date: Thu, 5 May 2022 16:03:28 +0000 Subject: [PATCH 08/28] L&D program --- 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 86e64ff27..6aee7e290 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -3,7 +3,7 @@ Hello DevOps people! from Atos -

Hello DevOps people this is Dec 21

+

Hello DevOps people this is L&D program

This is DevOps class

CI/CD

From 516327bfbe26fc53796b331108c7e787bcc1a6a6 Mon Sep 17 00:00:00 2001 From: rranjith406 <52668325+rranjith406@users.noreply.github.com> Date: Mon, 9 May 2022 11:28:35 +0530 Subject: [PATCH 09/28] Updated 'CI/CD test Ranjith from Bhai' --- src/main/webapp/index.jsp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index 6aee7e290..6abd23f0a 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -12,4 +12,5 @@

Continuous integration and continuous delivery

Continuous delivery is a software development methodology where the release process is automated....

Continuous integration is a software development practice where members of a team use a version control system and frequently integrate their work to the same location, such as a main branch.

+

CI/CD test Ranjith from Bhai

From 6a6d28401fb7e9da33cce5c5620ca509196584af Mon Sep 17 00:00:00 2001 From: rranjith406 <52668325+rranjith406@users.noreply.github.com> Date: Mon, 9 May 2022 11:44:32 +0530 Subject: [PATCH 10/28] test2 --- src/main/webapp/index.jsp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index 6abd23f0a..5b82b8981 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -13,4 +13,5 @@

Continuous delivery is a software development methodology where the release process is automated....

Continuous integration is a software development practice where members of a team use a version control system and frequently integrate their work to the same location, such as a main branch.

CI/CD test Ranjith from Bhai

+

TEST 2

From 3529b54356587830ab994e4a5ce5474d22a01761 Mon Sep 17 00:00:00 2001 From: rranjith406 <52668325+rranjith406@users.noreply.github.com> Date: Mon, 9 May 2022 11:48:43 +0530 Subject: [PATCH 11/28] TEST 3 --- src/main/webapp/index.jsp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index 5b82b8981..a69eeeeb0 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -14,4 +14,5 @@

Continuous integration is a software development practice where members of a team use a version control system and frequently integrate their work to the same location, such as a main branch.

CI/CD test Ranjith from Bhai

TEST 2

+

TEST 3

From e5d74e1a30068ba145586d44b06d6537a2b123cb Mon Sep 17 00:00:00 2001 From: rranjith406 <52668325+rranjith406@users.noreply.github.com> Date: Mon, 9 May 2022 11:55:24 +0530 Subject: [PATCH 12/28] Java_Freestyle_Project - downstream job --- src/main/webapp/index.jsp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index a69eeeeb0..f14f4f731 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -15,4 +15,5 @@

CI/CD test Ranjith from Bhai

TEST 2

TEST 3

+

Java_Freestyle_Project

From acc64301c552ea16db3563b3c7738a5558532517 Mon Sep 17 00:00:00 2001 From: rranjith406 <52668325+rranjith406@users.noreply.github.com> Date: Mon, 9 May 2022 11:58:21 +0530 Subject: [PATCH 13/28] Test 4 --- src/main/webapp/index.jsp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index f14f4f731..e9f415905 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -16,4 +16,5 @@

TEST 2

TEST 3

Java_Freestyle_Project

+

TEST 4

From 7c890f87064182edb14db4c116929006adcf19de Mon Sep 17 00:00:00 2001 From: rranjith406 <52668325+rranjith406@users.noreply.github.com> Date: Mon, 9 May 2022 12:01:52 +0530 Subject: [PATCH 14/28] Test 5 --- src/main/webapp/index.jsp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index e9f415905..3fcede523 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -17,4 +17,5 @@

TEST 3

Java_Freestyle_Project

TEST 4

+

TEST 5

From 6217d1de60dd1a02a2b6e0ab16ccfbb4a24a1fbe Mon Sep 17 00:00:00 2001 From: rranjith406 <52668325+rranjith406@users.noreply.github.com> Date: Mon, 9 May 2022 12:32:22 +0530 Subject: [PATCH 15/28] Test 6 --- src/main/webapp/index.jsp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index 3fcede523..6b079821c 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -17,5 +17,6 @@

TEST 3

Java_Freestyle_Project

TEST 4

-

TEST 5

+

TEST 5

+

TEST 6

From 36dec2d7695164173a7ff3921037cc5ae42284ec Mon Sep 17 00:00:00 2001 From: rranjith406 <52668325+rranjith406@users.noreply.github.com> Date: Mon, 9 May 2022 20:20:41 +0530 Subject: [PATCH 16/28] removed test lines --- src/main/webapp/index.jsp | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index 6b079821c..6aee7e290 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -12,11 +12,4 @@

Continuous integration and continuous delivery

Continuous delivery is a software development methodology where the release process is automated....

Continuous integration is a software development practice where members of a team use a version control system and frequently integrate their work to the same location, such as a main branch.

-

CI/CD test Ranjith from Bhai

-

TEST 2

-

TEST 3

-

Java_Freestyle_Project

-

TEST 4

-

TEST 5

-

TEST 6

From b772937c6e6914f60d782dbd0a241db318271a77 Mon Sep 17 00:00:00 2001 From: Ranjith Date: Mon, 9 May 2022 15:23:55 +0000 Subject: [PATCH 17/28] Added new line for CICD test --- src/main/webapp/index.jsp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index 6aee7e290..70235963f 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -12,4 +12,5 @@

Continuous integration and continuous delivery

Continuous delivery is a software development methodology where the release process is automated....

Continuous integration is a software development practice where members of a team use a version control system and frequently integrate their work to the same location, such as a main branch.

+

This is testing line for CICD

From 2236e18467063ba1faf272d6f2b1f4e3201e567e Mon Sep 17 00:00:00 2001 From: rranjith406 <52668325+rranjith406@users.noreply.github.com> Date: Mon, 9 May 2022 20:58:03 +0530 Subject: [PATCH 18/28] test 2 --- src/main/webapp/index.jsp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index 70235963f..0f8155c76 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -13,4 +13,5 @@

Continuous delivery is a software development methodology where the release process is automated....

Continuous integration is a software development practice where members of a team use a version control system and frequently integrate their work to the same location, such as a main branch.

This is testing line for CICD

+

Test 2

From fb8d97366bfed894cceb612304b9f497bb49783d Mon Sep 17 00:00:00 2001 From: Ranjith Date: Mon, 9 May 2022 15:32:29 +0000 Subject: [PATCH 19/28] DevSecOps --- src/main/webapp/index.jsp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index 0f8155c76..ea585f6f3 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -14,4 +14,5 @@

Continuous integration is a software development practice where members of a team use a version control system and frequently integrate their work to the same location, such as a main branch.

This is testing line for CICD

Test 2

+

This is testing line for DevSecOps

From 94dc4001e98dbe3c8905d722ea9a7ed78fdebd8c Mon Sep 17 00:00:00 2001 From: rranjith406 <52668325+rranjith406@users.noreply.github.com> Date: Mon, 9 May 2022 21:19:02 +0530 Subject: [PATCH 20/28] DevSecOps team --- 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 ea585f6f3..0063c68c5 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -1,6 +1,6 @@ -Hello DevOps people! from Atos +Hello DevOps people! from Atos_DevSecOps team

Hello DevOps people this is L&D program

From f4d438142a8999974d9c09af37db455bdd8c9b94 Mon Sep 17 00:00:00 2001 From: rranjith406 <52668325+rranjith406@users.noreply.github.com> Date: Tue, 10 May 2022 16:29:57 +0530 Subject: [PATCH 21/28] Test 3 --- src/main/webapp/index.jsp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index 0063c68c5..a0cd22ef3 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -15,4 +15,5 @@

This is testing line for CICD

Test 2

This is testing line for DevSecOps

+

Test 3

From b2ff850747bfd657556bfe9591541961d55f59aa Mon Sep 17 00:00:00 2001 From: rranjith406 <52668325+rranjith406@users.noreply.github.com> Date: Wed, 18 May 2022 17:02:32 +0530 Subject: [PATCH 22/28] delivery to Nexus artifact repository --- src/main/webapp/index.jsp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index a0cd22ef3..7bf88fc54 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -16,4 +16,8 @@

Test 2

This is testing line for DevSecOps

Test 3

+

+ Today is + <%= new java.util.Date() %>

+

Continuous integration and continuous delivery to Nexus artifact repository

From c93a6dd66a2b050c7d925987bc34a38414c8690d Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Wed, 18 May 2022 11:59:06 +0000 Subject: [PATCH 23/28] stage branch with nexus deploy --- pom.xml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 85f2e2e2a..0179ff371 100644 --- a/pom.xml +++ b/pom.xml @@ -1,9 +1,10 @@ 4.0.0 - com.efsavage + + com.helloworld.app hello-world-war - 1.0.0 + 1.0-SNAPSHOT war Hello World Web Application Repository Simplest possible Java Webapp @@ -26,4 +27,4 @@ - \ No newline at end of file + From 9db4c8abac08e0d85de5ec52919c9c66cc8df274 Mon Sep 17 00:00:00 2001 From: Ranjith R <52668325+rranjith406@users.noreply.github.com> Date: Thu, 1 Sep 2022 10:09:53 +0530 Subject: [PATCH 24/28] Create Jenkinsfile --- Jenkinsfile | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 000000000..32e22879f --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,37 @@ +pipeline { + agent any + + stages { + stage('Checkout src') { + steps { + echo 'Java-Maven-war-project ' + echo "Branch_Name: ${env.GIT_BRANCH}" + //echo "${env.BRANCH_NAME}" + //echo "${env.GIT_BRANCH}"//This will give me the Branch name + git 'https://github.com/rranjith406/hello-world-war.git' + sh 'ls -lrt' + dir('dist') { + //sh 'mvn clean install -DskipTests' + echo 'cd to dist folder' + sh 'ls -lrt' + } + } + } + stage('Build Stage') { + steps { + sh 'mvn clean install' + } + } + stage('Test Stage') { + steps { + sh 'mvn clean test' + } + } + stage('Deploy Stage') { + steps { + echo 'This is Deploy stage (TBD)' + sh 'echo Build ${BUILD_NUMBER}' + } + } + } +} From 4a7cf53498202196d531e12afeeff90500ae83a7 Mon Sep 17 00:00:00 2001 From: Ranjith R <52668325+rranjith406@users.noreply.github.com> Date: Fri, 28 Apr 2023 09:42:33 +0530 Subject: [PATCH 25/28] Update Jenkinsfile Added syntax for the Deploy stage --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index 32e22879f..3b8be902d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -31,6 +31,7 @@ pipeline { steps { echo 'This is Deploy stage (TBD)' sh 'echo Build ${BUILD_NUMBER}' + deploy adapters: [tomcat9(credentialsId: 'Tomcat_ID', path: '', url: 'http://15.206.151.178:8090/')], contextPath: 'HelloWorld_Pipeline', war: '**/*.war' } } } From 11f8f2d00a7600205b3ca159fdc88c62e6666c8f Mon Sep 17 00:00:00 2001 From: Ranjith R <52668325+rranjith406@users.noreply.github.com> Date: Fri, 28 Apr 2023 09:53:09 +0530 Subject: [PATCH 26/28] Update README.md test CICD for Jenkins Pipeline job --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 2d4e291f5..5957c6071 100644 --- a/README.md +++ b/README.md @@ -2,3 +2,5 @@ Hello World! (WAR-style) =============== This is the simplest possible Java webapp for testing servlet container deployments. It should work on any container and requires no other dependencies or configuration. + +test CICD for Jenkins Pipeline job From e878bc2c830400e2c3177fa96e73d11017b7ba2e Mon Sep 17 00:00:00 2001 From: Ranjith R <52668325+rranjith406@users.noreply.github.com> Date: Tue, 2 May 2023 05:29:42 +0530 Subject: [PATCH 27/28] New commit in new branch --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index 5957c6071..0cbad24d7 100644 --- a/README.md +++ b/README.md @@ -4,3 +4,8 @@ Hello World! (WAR-style) This is the simplest possible Java webapp for testing servlet container deployments. It should work on any container and requires no other dependencies or configuration. test CICD for Jenkins Pipeline job + + + + +New commit in new branch From 0c6f6ee292d120c1acd82fe88e4d889cdecc0eca Mon Sep 17 00:00:00 2001 From: Ranjith R <52668325+rranjith406@users.noreply.github.com> Date: Tue, 2 May 2023 05:48:12 +0530 Subject: [PATCH 28/28] Issure fix commit --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index 0cbad24d7..5167b41ae 100644 --- a/README.md +++ b/README.md @@ -9,3 +9,9 @@ test CICD for Jenkins Pipeline job New commit in new branch + + + + + +Issure fix commit