From f7a8e1d96e15ba88e7de847993772fd593e88af5 Mon Sep 17 00:00:00 2001 From: Tarun Chawla Date: Tue, 27 Jun 2023 20:05:27 -0500 Subject: [PATCH 01/24] Update Jenkinsfile --- Jenkinsfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index b992b7c..f628d6a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -2,7 +2,7 @@ pipeline { agent any environment { - function_name = 'java-sample' + function_name = 'test-java-app' } stages { @@ -17,7 +17,7 @@ pipeline { steps { echo 'Push' - sh "aws s3 cp target/sample-1.0.3.jar s3://bermtecbatch31" + sh "aws s3 cp target/sample-1.0.3.jar s3://s3-react-jenkins-pipe" } } @@ -25,7 +25,7 @@ pipeline { steps { echo 'Build' - sh "aws lambda update-function-code --function-name $function_name --region us-east-1 --s3-bucket bermtecbatch31 --s3-key sample-1.0.3.jar" + sh "aws lambda update-function-code --function-name $function_name --region us-east-1 --s3-bucket s3-react-jenkins-pipe --s3-key sample-1.0.3.jar" } } } From 78e87e00b97f641757f279f5d1d3714eb4d67114 Mon Sep 17 00:00:00 2001 From: tcchawla Date: Mon, 3 Jul 2023 23:19:09 -0500 Subject: [PATCH 02/24] added sonar analysis --- Jenkinsfile | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index b992b7c..745827a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,5 +1,5 @@ pipeline { - agent any + agent {label slave} environment { function_name = 'java-sample' @@ -13,6 +13,13 @@ pipeline { } } + stage('Sonar Analysis') { + steps { + echo 'Sonar Analysis' + sh 'mvn sonar:sonar' + } + } + stage('Push') { steps { echo 'Push' From 3d6458c45af9bd36d4eed435f58170984bf8f448 Mon Sep 17 00:00:00 2001 From: tcchawla Date: Mon, 3 Jul 2023 23:33:49 -0500 Subject: [PATCH 03/24] issue fixed --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 745827a..3cc3844 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,7 +16,7 @@ pipeline { stage('Sonar Analysis') { steps { echo 'Sonar Analysis' - sh 'mvn sonar:sonar' + sh "mvn sonar:sonar" } } From 5009e135d564ea67825cf88129466fc459a17100 Mon Sep 17 00:00:00 2001 From: tcchawla Date: Mon, 3 Jul 2023 23:35:07 -0500 Subject: [PATCH 04/24] fixed binding error --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 3cc3844..b395829 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,7 +16,7 @@ pipeline { stage('Sonar Analysis') { steps { echo 'Sonar Analysis' - sh "mvn sonar:sonar" + sh '''mvn sonar:sonar''' } } From 601dd2c619978407f9170da00979d0941d6bef31 Mon Sep 17 00:00:00 2001 From: tcchawla Date: Mon, 3 Jul 2023 23:49:10 -0500 Subject: [PATCH 05/24] fixed the error --- Jenkinsfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index b395829..b83a1f7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,7 +16,9 @@ pipeline { stage('Sonar Analysis') { steps { echo 'Sonar Analysis' - sh '''mvn sonar:sonar''' + withSonarQubeEnv('Sonar') { + sh "mvn sonar:sonar" + } } } From a914d9643234e0b82ff8748308bd630d26bfd3cc Mon Sep 17 00:00:00 2001 From: tcchawla Date: Mon, 3 Jul 2023 23:50:22 -0500 Subject: [PATCH 06/24] error --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index b83a1f7..ef138cf 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,7 +17,7 @@ pipeline { steps { echo 'Sonar Analysis' withSonarQubeEnv('Sonar') { - sh "mvn sonar:sonar" + sh 'mvn sonar:sonar' } } } From f657b409a4c1fe9b63896d2ebb1d8fec91969cf7 Mon Sep 17 00:00:00 2001 From: tcchawla Date: Mon, 3 Jul 2023 23:54:23 -0500 Subject: [PATCH 07/24] test --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index ef138cf..aa90742 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,5 +1,5 @@ pipeline { - agent {label slave} + agent {label 'slave'} environment { function_name = 'java-sample' From bc933aaac83b4c94583b9a40ec655b10abc5e6dc Mon Sep 17 00:00:00 2001 From: tcchawla Date: Mon, 3 Jul 2023 23:58:35 -0500 Subject: [PATCH 08/24] changed pom --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 8f15865..e62816e 100644 --- a/pom.xml +++ b/pom.xml @@ -18,6 +18,7 @@ 1.8 1.8 1.8 + Tarun Chawla From 9c40c5a83ce0d13f687d65cc7b66c341da728f2b Mon Sep 17 00:00:00 2001 From: tcchawla Date: Tue, 4 Jul 2023 00:02:02 -0500 Subject: [PATCH 09/24] fixed pom --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e62816e..3b83806 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ 1.8 1.8 1.8 - Tarun Chawla + Sonar-Test-Git From c774629ccb584ffa3737a439dcfdf41af892b7de Mon Sep 17 00:00:00 2001 From: tcchawla Date: Tue, 4 Jul 2023 00:05:04 -0500 Subject: [PATCH 10/24] fixed pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3b83806..15962b6 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ 1.8 1.8 1.8 - Sonar-Test-Git + bermtec2 From a15fb252a13a71bfbf8669175b7a30905004dea9 Mon Sep 17 00:00:00 2001 From: tcchawla Date: Tue, 4 Jul 2023 00:20:49 -0500 Subject: [PATCH 11/24] fixing pipeline --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 15962b6..34d8d8b 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ 1.8 1.8 1.8 - bermtec2 + bermjava From cda0225b4ab6ea075b729a66c8d9915f5a4c97db Mon Sep 17 00:00:00 2001 From: tcchawla Date: Tue, 4 Jul 2023 00:23:06 -0500 Subject: [PATCH 12/24] fixing pom --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 34d8d8b..3048a61 100644 --- a/pom.xml +++ b/pom.xml @@ -19,6 +19,7 @@ 1.8 1.8 bermjava + bermjava From 1678d13d2eb83d0f83714edb140189d5682ecafe Mon Sep 17 00:00:00 2001 From: tcchawla Date: Tue, 4 Jul 2023 00:29:35 -0500 Subject: [PATCH 13/24] added quality gate --- Jenkinsfile | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index aa90742..56282e6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -14,6 +14,14 @@ pipeline { } stage('Sonar Analysis') { + agent {label 'master'} + when { + anyOf { + branch "feature/*" + branch "main" + } + } + steps { echo 'Sonar Analysis' withSonarQubeEnv('Sonar') { @@ -22,6 +30,14 @@ pipeline { } } + stage('Sonar Quality Gate') { + steps { + timeout(time:10, unit: 'MINUTES') { + waitForQualityGate abortPipeline: true + } + } + } + stage('Push') { steps { echo 'Push' From 2629350eb261cd346b21fcfc0eb98421430208b7 Mon Sep 17 00:00:00 2001 From: tcchawla Date: Tue, 4 Jul 2023 00:34:42 -0500 Subject: [PATCH 14/24] added parallel --- Jenkinsfile | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 56282e6..83ce609 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -6,6 +6,8 @@ pipeline { } stages { + // CI Started + stage('Build') { steps { echo 'Build' @@ -14,7 +16,6 @@ pipeline { } stage('Sonar Analysis') { - agent {label 'master'} when { anyOf { branch "feature/*" @@ -46,12 +47,38 @@ pipeline { } } - stage('Deploy') { + // CI Ended + + // CD Started + + stage('Deployments') { + parallel { + stage('Deploy to Dev') { + steps { + echo 'Build' + + sh "aws lambda update-function-code --function-name $function_name --region us-east-1 --s3-bucket bermtecbatch31 --s3-key sample-1.0.3.jar" + } + } + + stage('Deploy to Test') { + steps { + echo 'Build' + + sh "aws lambda update-function-code --function-name $function_name --region us-east-1 --s3-bucket bermtecbatch31 --s3-key sample-1.0.3.jar" + } + } + } + } + + stage('Deploy to Prod') { steps { echo 'Build' sh "aws lambda update-function-code --function-name $function_name --region us-east-1 --s3-bucket bermtecbatch31 --s3-key sample-1.0.3.jar" } } + + // CD Ended } } From 25ccd8b62d45a216f6d284d4de94bdf6861e2690 Mon Sep 17 00:00:00 2001 From: tcchawla Date: Tue, 4 Jul 2023 00:36:59 -0500 Subject: [PATCH 15/24] added prod when block --- Jenkinsfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 83ce609..dc8eff3 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -72,6 +72,9 @@ pipeline { } stage('Deploy to Prod') { + when { + branch "main" + } steps { echo 'Build' From 4fad1756551616d99d888fd200258370217a3dce Mon Sep 17 00:00:00 2001 From: tcchawla Date: Tue, 4 Jul 2023 00:48:32 -0500 Subject: [PATCH 16/24] modified --- Jenkinsfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index dc8eff3..b7d6652 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -33,7 +33,7 @@ pipeline { stage('Sonar Quality Gate') { steps { - timeout(time:10, unit: 'MINUTES') { + timeout(time: 10, unit: 'MINUTES') { waitForQualityGate abortPipeline: true } } @@ -62,6 +62,9 @@ pipeline { } stage('Deploy to Test') { + when { + branch "main" + } steps { echo 'Build' From 69f2a71d53fb269cc347db997da0c2abc3d2375d Mon Sep 17 00:00:00 2001 From: tcchawla Date: Tue, 4 Jul 2023 01:29:32 -0500 Subject: [PATCH 17/24] new pipeline --- Jenkinsfile | 37 ++++++++++++++++++++++++++++++++----- 1 file changed, 32 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index b7d6652..76440c9 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -43,7 +43,7 @@ pipeline { steps { echo 'Push' - sh "aws s3 cp target/sample-1.0.3.jar s3://bermtecbatch31" + // sh "aws s3 cp target/sample-1.0.3.jar s3://bermtecbatch31" } } @@ -57,7 +57,7 @@ pipeline { steps { echo 'Build' - sh "aws lambda update-function-code --function-name $function_name --region us-east-1 --s3-bucket bermtecbatch31 --s3-key sample-1.0.3.jar" + // sh "aws lambda update-function-code --function-name $function_name --region us-east-1 --s3-bucket bermtecbatch31 --s3-key sample-1.0.3.jar" } } @@ -68,7 +68,7 @@ pipeline { steps { echo 'Build' - sh "aws lambda update-function-code --function-name $function_name --region us-east-1 --s3-bucket bermtecbatch31 --s3-key sample-1.0.3.jar" + // sh "aws lambda update-function-code --function-name $function_name --region us-east-1 --s3-bucket bermtecbatch31 --s3-key sample-1.0.3.jar" } } } @@ -79,12 +79,39 @@ pipeline { branch "main" } steps { - echo 'Build' + echo 'Deploying to Prod' + input ( + message: "Are we good for Prod Deployment?" + ) + } + } - sh "aws lambda update-function-code --function-name $function_name --region us-east-1 --s3-bucket bermtecbatch31 --s3-key sample-1.0.3.jar" + stage ('Release to Prod') { + when { + branch "main" + } + steps { + echo "Release to Prod" + // sh "aws lambda update-function-code --function-name $function_name --region us-east-1 --s3-bucket bermtecbatch31 --s3-key sample-1.0.3.jar" } } // CD Ended + + post { + always { + echo "${env.BUILD_ID}" + echo "${BRANCH_NAME}" + echo "${BUILD_NUMBER}" + echo "${JENKINS_URL}" + } + failue { + echo "Failed to execute" + mail(to:"tc.chawla2000@gmail.com", body:"This build failed. Please try again", subject:"Build Failure") + } + aborted { + echo "Aborted" + } + } } } From 5d82c41bf4c234d7dda3924372a42bcdbe83b792 Mon Sep 17 00:00:00 2001 From: tcchawla Date: Tue, 4 Jul 2023 01:30:25 -0500 Subject: [PATCH 18/24] syntax error fixed --- Jenkinsfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 76440c9..b918b66 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -98,7 +98,9 @@ pipeline { // CD Ended - post { + } + + post { always { echo "${env.BUILD_ID}" echo "${BRANCH_NAME}" @@ -113,5 +115,4 @@ pipeline { echo "Aborted" } } - } } From 1cb3203336ab0101f16fd145f6d70392057965cf Mon Sep 17 00:00:00 2001 From: tcchawla Date: Tue, 4 Jul 2023 01:31:09 -0500 Subject: [PATCH 19/24] syntax --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index b918b66..7e17ebe 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -107,7 +107,7 @@ pipeline { echo "${BUILD_NUMBER}" echo "${JENKINS_URL}" } - failue { + failure { echo "Failed to execute" mail(to:"tc.chawla2000@gmail.com", body:"This build failed. Please try again", subject:"Build Failure") } From d4887d2f275b7b49de18b2b3d80e160cbb1f3ea8 Mon Sep 17 00:00:00 2001 From: tcchawla Date: Tue, 4 Jul 2023 01:55:28 -0500 Subject: [PATCH 20/24] parameterized pipeline --- Jenkinsfile | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 1f49bb0..e66face 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -5,6 +5,15 @@ pipeline { function_name = 'test-java-app' } + parameters { + string(name: RollBackVersion, description: "Please enter rollback version") + choice( + choices: ['Dev', 'Test', 'Prod'] + name: 'Environment', + description: 'Please Select the environment to deploy to' + ) + } + stages { // CI Started @@ -33,8 +42,15 @@ pipeline { stage('Sonar Quality Gate') { steps { - timeout(time: 10, unit: 'MINUTES') { - waitForQualityGate abortPipeline: true + script { + try { + timeout(time: 10, unit: 'MINUTES') { + waitForQualityGate abortPipeline: true + } + } + catch (Exception ex) { + + } } } } @@ -76,7 +92,7 @@ pipeline { stage('Deploy to Prod') { when { - branch "main" + expression { return params.Environment == 'Prod'} } steps { echo 'Deploying to Prod' From b4ef6887c530c54cea17353c0df2a63e7deecfee Mon Sep 17 00:00:00 2001 From: tcchawla Date: Tue, 4 Jul 2023 01:57:17 -0500 Subject: [PATCH 21/24] syntax error --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index e66face..20e9860 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -6,7 +6,7 @@ pipeline { } parameters { - string(name: RollBackVersion, description: "Please enter rollback version") + string(name: RollBackVersion, description: "Please enter rollback version"), choice( choices: ['Dev', 'Test', 'Prod'] name: 'Environment', From 8cd7ea4dc97c8448876b24877c0c663e582189b4 Mon Sep 17 00:00:00 2001 From: tcchawla Date: Tue, 4 Jul 2023 01:58:28 -0500 Subject: [PATCH 22/24] fixed --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 20e9860..e66face 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -6,7 +6,7 @@ pipeline { } parameters { - string(name: RollBackVersion, description: "Please enter rollback version"), + string(name: RollBackVersion, description: "Please enter rollback version") choice( choices: ['Dev', 'Test', 'Prod'] name: 'Environment', From 2ec9457d3b252ac4b72e13156ed96d8389f7ecc5 Mon Sep 17 00:00:00 2001 From: tcchawla Date: Tue, 4 Jul 2023 01:59:52 -0500 Subject: [PATCH 23/24] dumb tarun mistake: solved --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index e66face..b942e7c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -8,7 +8,7 @@ pipeline { parameters { string(name: RollBackVersion, description: "Please enter rollback version") choice( - choices: ['Dev', 'Test', 'Prod'] + choices: ['Dev', 'Test', 'Prod'], name: 'Environment', description: 'Please Select the environment to deploy to' ) From 57f6f99128c72f4af790577395776d100b0af66f Mon Sep 17 00:00:00 2001 From: tcchawla Date: Tue, 4 Jul 2023 02:01:09 -0500 Subject: [PATCH 24/24] test fix --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index b942e7c..327a20f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -6,7 +6,7 @@ pipeline { } parameters { - string(name: RollBackVersion, description: "Please enter rollback version") + string(name: 'RollBackVersion', description: "Please enter rollback version") choice( choices: ['Dev', 'Test', 'Prod'], name: 'Environment',