From d035a9c1114258456e7ed0cbc8153183f1612893 Mon Sep 17 00:00:00 2001 From: Sonal Mittal <62133890+Sonal0409@users.noreply.github.com> Date: Sun, 23 Jun 2024 10:10:51 +0530 Subject: [PATCH 01/23] Update Newfiletraigger --- Newfiletraigger | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Newfiletraigger b/Newfiletraigger index c0e4993..e2b8719 100644 --- a/Newfiletraigger +++ b/Newfiletraigger @@ -1,4 +1,6 @@ + +A new commit for repo by Sonal A new commit for webhook testing Change on the repo gdfgfdgfh From b1600aaff369fddffb1a781af8347d6df2936a62 Mon Sep 17 00:00:00 2001 From: Sonal Mittal <62133890+Sonal0409@users.noreply.github.com> Date: Sun, 23 Jun 2024 10:45:51 +0530 Subject: [PATCH 02/23] Update Newfiletraigger --- Newfiletraigger | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Newfiletraigger b/Newfiletraigger index e2b8719..0434863 100644 --- a/Newfiletraigger +++ b/Newfiletraigger @@ -1,4 +1,4 @@ - +Change on the repo to test webhooks A new commit for repo by Sonal A new commit for webhook testing From 05a7e4001ad959f81a8fca1803174e05a80d9bd6 Mon Sep 17 00:00:00 2001 From: Sonal Mittal <62133890+Sonal0409@users.noreply.github.com> Date: Fri, 5 Jul 2024 16:55:04 +0530 Subject: [PATCH 03/23] Update Newfiletraigger --- Newfiletraigger | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Newfiletraigger b/Newfiletraigger index 0434863..5f31039 100644 --- a/Newfiletraigger +++ b/Newfiletraigger @@ -1,3 +1,6 @@ +doing a new commit on repo + + Change on the repo to test webhooks A new commit for repo by Sonal From 074b68020513d99936d811d17cda573a455b7ad5 Mon Sep 17 00:00:00 2001 From: Sonal Mittal <62133890+Sonal0409@users.noreply.github.com> Date: Mon, 10 Feb 2025 08:44:36 +0530 Subject: [PATCH 04/23] Update Newfiletraigger --- Newfiletraigger | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Newfiletraigger b/Newfiletraigger index 5f31039..50af910 100644 --- a/Newfiletraigger +++ b/Newfiletraigger @@ -1,13 +1,13 @@ doing a new commit on repo - +new change Change on the repo to test webhooks A new commit for repo by Sonal A new commit for webhook testing Change on the repo gdfgfdgfh -A commit for Poll SCM +A commit for Poll SCM xvbgfdgfdh trigger to check Webhook chnage to see if the job run or not. Webhook trigger From b323c4a9153832b6fb9c75bd4f9dfdc6637d1064 Mon Sep 17 00:00:00 2001 From: Sonal Mittal <62133890+Sonal0409@users.noreply.github.com> Date: Wed, 12 Feb 2025 16:09:21 +0530 Subject: [PATCH 05/23] Update Newfiletraigger --- Newfiletraigger | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Newfiletraigger b/Newfiletraigger index 50af910..7820091 100644 --- a/Newfiletraigger +++ b/Newfiletraigger @@ -6,6 +6,8 @@ Change on the repo to test webhooks A new commit for repo by Sonal A new commit for webhook testing Change on the repo + + a commit for chnage and jenkisn job should run gdfgfdgfh A commit for Poll SCM xvbgfdgfdh trigger to check Webhook chnage to see if the job run or not. From a571eb60ace37324edaedb03cbee27661998bc02 Mon Sep 17 00:00:00 2001 From: Sonal Mittal <62133890+Sonal0409@users.noreply.github.com> Date: Tue, 4 Mar 2025 20:45:31 +0530 Subject: [PATCH 06/23] Update jenkinsfile2 --- jenkinsfile2 | 1 + 1 file changed, 1 insertion(+) diff --git a/jenkinsfile2 b/jenkinsfile2 index 49ff6df..8fa5939 100644 --- a/jenkinsfile2 +++ b/jenkinsfile2 @@ -1,3 +1,4 @@ This is to test poll SCM with Upstreem downstream pipeline new commit +edit for poll scm to trigger the job From 032c7cb3dcce88017310baf84c539cb760ce1af9 Mon Sep 17 00:00:00 2001 From: Sonal Mittal <62133890+Sonal0409@users.noreply.github.com> Date: Sun, 13 Apr 2025 10:48:57 +0530 Subject: [PATCH 07/23] Update Newfiletraigger --- Newfiletraigger | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Newfiletraigger b/Newfiletraigger index 7820091..4f72f87 100644 --- a/Newfiletraigger +++ b/Newfiletraigger @@ -4,6 +4,8 @@ new change Change on the repo to test webhooks A new commit for repo by Sonal + +Commit for a changes A new commit for webhook testing Change on the repo From 061c4d516807986a15996f36aad7e1c610631e4d Mon Sep 17 00:00:00 2001 From: Sonal Mittal <62133890+Sonal0409@users.noreply.github.com> Date: Wed, 16 Apr 2025 17:38:10 +0530 Subject: [PATCH 08/23] Create ApprovalScript --- ApprovalScript | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 ApprovalScript diff --git a/ApprovalScript b/ApprovalScript new file mode 100644 index 0000000..1d4337f --- /dev/null +++ b/ApprovalScript @@ -0,0 +1,50 @@ +pipeline{ + + tools{ + maven 'mymaven' + } + + agent any + stages{ + stage('Clone a Repo'){ + steps{ + git 'https://github.com/Sonal0409/DevOpsCodeDemo.git' + } + } + + stage('Compile the code'){ + steps{ + sh 'mvn compile' + } + } + + stage('CodeReview'){ + steps{ + sh 'mvn pmd:pmd' + } + } + + stage('Unit Test'){ + steps{ + sh 'mvn test' + } + } + + stage('Package'){ + steps{ + sh 'mvn package' + script{ + timeout(time: 10, unit: 'MINUTES'){ + input(id: 'DeployGate', message: 'Continue to Deploy', ok: 'Deploy') + } + } + } + } + + stage('Deploy'){ + steps{ + echo 'Deployment done' + } + } + } +} From 7d75e560ebdf9065d50ca57e80cdb98451a8751f Mon Sep 17 00:00:00 2001 From: Sonal Mittal <62133890+Sonal0409@users.noreply.github.com> Date: Wed, 16 Apr 2025 17:47:10 +0530 Subject: [PATCH 09/23] Create Parallel-Stages --- Parallel-Stages | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 Parallel-Stages diff --git a/Parallel-Stages b/Parallel-Stages new file mode 100644 index 0000000..6e0cf18 --- /dev/null +++ b/Parallel-Stages @@ -0,0 +1,42 @@ +pipeline{ + tools{ + maven 'mymaven' + } + agent any + stages{ + stage('Checkout code') + { + steps{ + git 'https://github.com/Sonal0409/DevOpsCodeDemo.git' + } + } + stage ('Parallel Execution') { + parallel{ + + stage('Code Review') + { + steps{ + sh 'mvn pmd:pmd' + } + post{ + success{ + recordIssues sourceCodeRetention: 'LAST_BUILD', tools: [pmdParser(pattern: '**/pmd.xml')] + } + } + } + stage('Test Code'){ + steps{ + sh 'mvn test' + } + post{ + success{ + junit 'target/surefire-reports/*.xml' + } + } + } + } + + + } + } +} From 0ca2176a7b74691173c3d8a1f173883f0032ef35 Mon Sep 17 00:00:00 2001 From: Sonal Mittal <62133890+Sonal0409@users.noreply.github.com> Date: Wed, 16 Apr 2025 17:49:19 +0530 Subject: [PATCH 10/23] Create Error-Handling --- Error-Handling | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 Error-Handling diff --git a/Error-Handling b/Error-Handling new file mode 100644 index 0000000..4f4cc91 --- /dev/null +++ b/Error-Handling @@ -0,0 +1,36 @@ +pipeline{ + agent any + + tools{ + maven 'mymaven' + } + stages{ + stage('Checkout code'){ + steps{ + git 'https://github.com/Sonal0409/DevOpsCodeDemo.git' + } + } + stage('Compile Code'){ + + steps{ + sh 'mvn compile' + } + } + stage('Test Code'){ + + steps{ + catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE'){ + sh 'mvn te' + } + } + + } + + stage('Package Code'){ + + steps{ + sh 'mvn package' + } + } + } +} From 73e17e5c75a96108c6feddf552d1a97c77535661 Mon Sep 17 00:00:00 2001 From: Sonal Mittal <62133890+Sonal0409@users.noreply.github.com> Date: Sun, 27 Apr 2025 22:23:40 +0530 Subject: [PATCH 11/23] Update Newfiletraigger --- Newfiletraigger | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Newfiletraigger b/Newfiletraigger index 4f72f87..80fbb4d 100644 --- a/Newfiletraigger +++ b/Newfiletraigger @@ -6,6 +6,8 @@ Change on the repo to test webhooks A new commit for repo by Sonal Commit for a changes + +changes for poll SCM A new commit for webhook testing Change on the repo From 8456ed51244e6cf31696c062be074c63b119a246 Mon Sep 17 00:00:00 2001 From: Sonal Mittal <62133890+Sonal0409@users.noreply.github.com> Date: Wed, 28 May 2025 14:45:15 +0530 Subject: [PATCH 12/23] Update Newfiletraigger --- Newfiletraigger | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Newfiletraigger b/Newfiletraigger index 80fbb4d..3ddc1d0 100644 --- a/Newfiletraigger +++ b/Newfiletraigger @@ -1,6 +1,8 @@ doing a new commit on repo new change + +New commit in the repo Change on the repo to test webhooks A new commit for repo by Sonal From 70b7fc32e6828c0ba484bb42fa7459880e462718 Mon Sep 17 00:00:00 2001 From: Sonal Mittal <62133890+Sonal0409@users.noreply.github.com> Date: Tue, 10 Jun 2025 09:04:26 +0530 Subject: [PATCH 13/23] Update jenkinsfile2 --- jenkinsfile2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkinsfile2 b/jenkinsfile2 index 8fa5939..b15649a 100644 --- a/jenkinsfile2 +++ b/jenkinsfile2 @@ -1,4 +1,4 @@ -This is to test poll SCM with Upstreem downstream pipeline +commit for changes on jenkisn job to runThis is to test poll SCM with Upstreem downstream pipeline new commit edit for poll scm to trigger the job From c18dc354597636d384878148b23acc6b016f67da Mon Sep 17 00:00:00 2001 From: Sonal Mittal <62133890+Sonal0409@users.noreply.github.com> Date: Wed, 18 Jun 2025 09:45:33 +0530 Subject: [PATCH 14/23] Create file-18june --- file-18june | 1 + 1 file changed, 1 insertion(+) create mode 100644 file-18june diff --git a/file-18june b/file-18june new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/file-18june @@ -0,0 +1 @@ + From 2432d47687cb6ba677dc5bb723056eedcdd5d9e7 Mon Sep 17 00:00:00 2001 From: Sonal Mittal <62133890+Sonal0409@users.noreply.github.com> Date: Thu, 10 Jul 2025 07:44:47 +0530 Subject: [PATCH 15/23] Update dockerfile --- dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dockerfile b/dockerfile index 0c0ccf4..eeb1393 100644 --- a/dockerfile +++ b/dockerfile @@ -1,4 +1,4 @@ FROM tomcat:9 -ADD addressbook.war /usr/local/tomcat/webapps +ADD target/addressbook.war /usr/local/tomcat/webapps CMD ["catalina.sh", "run"] EXPOSE 8080 From 46ff96d6eb7399d097e3a038431cf7ddd05392fe Mon Sep 17 00:00:00 2001 From: Sonal Mittal <62133890+Sonal0409@users.noreply.github.com> Date: Thu, 10 Jul 2025 08:10:54 +0530 Subject: [PATCH 16/23] Update Newfiletraigger --- Newfiletraigger | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Newfiletraigger b/Newfiletraigger index 3ddc1d0..9644a9b 100644 --- a/Newfiletraigger +++ b/Newfiletraigger @@ -1,6 +1,7 @@ doing a new commit on repo -new change +new change to trigger the pipeline. +this is done for CICD job run New commit in the repo Change on the repo to test webhooks From 1eeee09fadf702b8f13a3af5321e9c170b5e3669 Mon Sep 17 00:00:00 2001 From: Sonal Mittal <62133890+Sonal0409@users.noreply.github.com> Date: Tue, 15 Jul 2025 10:06:12 +0530 Subject: [PATCH 17/23] Update Newfiletraigger --- Newfiletraigger | 1 + 1 file changed, 1 insertion(+) diff --git a/Newfiletraigger b/Newfiletraigger index 9644a9b..16ea4d6 100644 --- a/Newfiletraigger +++ b/Newfiletraigger @@ -1,3 +1,4 @@ +Commit for runnign review doing a new commit on repo new change to trigger the pipeline. From 59ba953cca59b4432d94e476201e2650636eb76c Mon Sep 17 00:00:00 2001 From: Sonal Mittal <62133890+Sonal0409@users.noreply.github.com> Date: Mon, 18 Aug 2025 20:24:27 +0530 Subject: [PATCH 18/23] Update Newfiletraigger --- Newfiletraigger | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Newfiletraigger b/Newfiletraigger index 16ea4d6..f5bf245 100644 --- a/Newfiletraigger +++ b/Newfiletraigger @@ -1,3 +1,5 @@ +Commit on the repo for polling SCM trigger + Commit for runnign review doing a new commit on repo From 3a5336dc85311475a450feb26471961b94b5b9cc Mon Sep 17 00:00:00 2001 From: Sonal Mittal <62133890+Sonal0409@users.noreply.github.com> Date: Tue, 18 Nov 2025 18:04:42 +0530 Subject: [PATCH 19/23] Refine commit message for CI/CD job Updated commit message for CI/CD job and triggered pipeline. --- Newfiletraigger | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Newfiletraigger b/Newfiletraigger index f5bf245..b2ddb07 100644 --- a/Newfiletraigger +++ b/Newfiletraigger @@ -4,7 +4,8 @@ Commit for runnign review doing a new commit on repo new change to trigger the pipeline. -this is done for CICD job run +this is done for CICD job rundsgdfg +upding the code New commit in the repo Change on the repo to test webhooks From 4cbff53d498994d7d3a5b19b32d32cbdf4d70861 Mon Sep 17 00:00:00 2001 From: Sonal Mittal <62133890+Sonal0409@users.noreply.github.com> Date: Tue, 18 Nov 2025 18:06:18 +0530 Subject: [PATCH 20/23] Update Newfiletraigger --- Newfiletraigger | 1 + 1 file changed, 1 insertion(+) diff --git a/Newfiletraigger b/Newfiletraigger index b2ddb07..ae219a9 100644 --- a/Newfiletraigger +++ b/Newfiletraigger @@ -6,6 +6,7 @@ doing a new commit on repo new change to trigger the pipeline. this is done for CICD job rundsgdfg upding the code +khkjhkj New commit in the repo Change on the repo to test webhooks From 1bd99e65af47aaa0b717b109cd30ecf85453eb24 Mon Sep 17 00:00:00 2001 From: Sonal Mittal <62133890+Sonal0409@users.noreply.github.com> Date: Sat, 3 Jan 2026 18:39:57 +0530 Subject: [PATCH 21/23] Update deployment.yml --- deployment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment.yml b/deployment.yml index 5a03556..edac3cf 100644 --- a/deployment.yml +++ b/deployment.yml @@ -15,7 +15,7 @@ spec: spec: containers: - name: app - image: edu123/devopsimage:4 + image: nginx --- kind: Service From 7079e788dce694d63497edcd3d166d4d8920a3d0 Mon Sep 17 00:00:00 2001 From: Sonal Mittal <62133890+Sonal0409@users.noreply.github.com> Date: Sat, 3 Jan 2026 21:21:27 +0530 Subject: [PATCH 22/23] Update deployment.yml --- deployment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment.yml b/deployment.yml index edac3cf..a3f7979 100644 --- a/deployment.yml +++ b/deployment.yml @@ -15,7 +15,7 @@ spec: spec: containers: - name: app - image: nginx + image: sonal04/myappimage01 --- kind: Service From 011a99ebf96cde41723298303e7d34a3edd828a8 Mon Sep 17 00:00:00 2001 From: Sonal Mittal <62133890+Sonal0409@users.noreply.github.com> Date: Sat, 3 Jan 2026 22:49:53 +0530 Subject: [PATCH 23/23] Change container image to nginx --- deployment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment.yml b/deployment.yml index a3f7979..edac3cf 100644 --- a/deployment.yml +++ b/deployment.yml @@ -15,7 +15,7 @@ spec: spec: containers: - name: app - image: sonal04/myappimage01 + image: nginx --- kind: Service