From 76205adb5dd647740bd20825df3cd98e17350ad1 Mon Sep 17 00:00:00 2001 From: gurusaligram <59478619+gurusaligram@users.noreply.github.com> Date: Wed, 8 Dec 2021 12:15:49 +0530 Subject: [PATCH 1/8] Update Jenkinsfile --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index bb4b4b52..2c6382bf 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -8,8 +8,8 @@ def getFtpPublishProfile(def publishProfilesJson) { } node { - withEnv(['AZURE_SUBSCRIPTION_ID=', - 'AZURE_TENANT_ID=']) { + withEnv(['AZURE_SUBSCRIPTION_ID=85d63697-9e8f-44fc-840e-c49c8f578545', + 'AZURE_TENANT_ID=94655c80-98c5-402e-b2a2-ee58e8d2d75b (94655c80-98c5-402e-b2a2-ee58e8d2d75b)']) { stage('init') { checkout scm } From 5e955f2513e4c30eb6515e250923237305827396 Mon Sep 17 00:00:00 2001 From: gurusaligram <59478619+gurusaligram@users.noreply.github.com> Date: Wed, 8 Dec 2021 13:20:31 +0530 Subject: [PATCH 2/8] Update Jenkinsfile --- Jenkinsfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 2c6382bf..84bb165d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -19,10 +19,10 @@ node { } stage('deploy') { - def resourceGroup = '' - def webAppName = '' + def resourceGroup = 'jenkins-get-started-rg' + def webAppName = 'appazjenkins' // login Azure - withCredentials([usernamePassword(credentialsId: '', passwordVariable: 'AZURE_CLIENT_SECRET', usernameVariable: 'AZURE_CLIENT_ID')]) { + withCredentials([usernamePassword(credentialsId: 'AzureServicePrincipal', passwordVariable: 'AZURE_CLIENT_SECRET', usernameVariable: 'AZURE_CLIENT_ID')]) { sh ''' az login --service-principal -u $AZURE_CLIENT_ID -p $AZURE_CLIENT_SECRET -t $AZURE_TENANT_ID az account set -s $AZURE_SUBSCRIPTION_ID From d171a122ce57c49de60e77c44452345091548e63 Mon Sep 17 00:00:00 2001 From: gurusaligram <59478619+gurusaligram@users.noreply.github.com> Date: Wed, 8 Dec 2021 13:26:49 +0530 Subject: [PATCH 3/8] Update Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 84bb165d..e54bb577 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -22,7 +22,7 @@ node { def resourceGroup = 'jenkins-get-started-rg' def webAppName = 'appazjenkins' // login Azure - withCredentials([usernamePassword(credentialsId: 'AzureServicePrincipal', passwordVariable: 'AZURE_CLIENT_SECRET', usernameVariable: 'AZURE_CLIENT_ID')]) { + withCredentials([usernamePassword(credentialsId: 'd4dca534-7cef-4996-9abd-3ffd88b85b37', passwordVariable: 'AZURE_CLIENT_SECRET', usernameVariable: 'AZURE_CLIENT_ID')]) { sh ''' az login --service-principal -u $AZURE_CLIENT_ID -p $AZURE_CLIENT_SECRET -t $AZURE_TENANT_ID az account set -s $AZURE_SUBSCRIPTION_ID From 4c547df19209f093ea5aec51e99c56c76976224e Mon Sep 17 00:00:00 2001 From: gurusaligram <59478619+gurusaligram@users.noreply.github.com> Date: Wed, 8 Dec 2021 13:28:27 +0530 Subject: [PATCH 4/8] Update Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index e54bb577..84bb165d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -22,7 +22,7 @@ node { def resourceGroup = 'jenkins-get-started-rg' def webAppName = 'appazjenkins' // login Azure - withCredentials([usernamePassword(credentialsId: 'd4dca534-7cef-4996-9abd-3ffd88b85b37', passwordVariable: 'AZURE_CLIENT_SECRET', usernameVariable: 'AZURE_CLIENT_ID')]) { + withCredentials([usernamePassword(credentialsId: 'AzureServicePrincipal', passwordVariable: 'AZURE_CLIENT_SECRET', usernameVariable: 'AZURE_CLIENT_ID')]) { sh ''' az login --service-principal -u $AZURE_CLIENT_ID -p $AZURE_CLIENT_SECRET -t $AZURE_TENANT_ID az account set -s $AZURE_SUBSCRIPTION_ID From dc15288e2a5aab6740d8e248534bd8b304096267 Mon Sep 17 00:00:00 2001 From: gurusaligram <59478619+gurusaligram@users.noreply.github.com> Date: Wed, 8 Dec 2021 13:34:41 +0530 Subject: [PATCH 5/8] Update Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 84bb165d..f11398a4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -9,7 +9,7 @@ def getFtpPublishProfile(def publishProfilesJson) { node { withEnv(['AZURE_SUBSCRIPTION_ID=85d63697-9e8f-44fc-840e-c49c8f578545', - 'AZURE_TENANT_ID=94655c80-98c5-402e-b2a2-ee58e8d2d75b (94655c80-98c5-402e-b2a2-ee58e8d2d75b)']) { + 'AZURE_TENANT_ID=94655c80-98c5-402e-b2a2-ee58e8d2d75b']) { stage('init') { checkout scm } From 23fe020c9af08fdb69a7f6b0664598c743c1a252 Mon Sep 17 00:00:00 2001 From: gurusaligram <59478619+gurusaligram@users.noreply.github.com> Date: Wed, 8 Dec 2021 13:50:18 +0530 Subject: [PATCH 6/8] Update CalculatorService.java --- src/main/java/ms/kenchen/Calculator/CalculatorService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/ms/kenchen/Calculator/CalculatorService.java b/src/main/java/ms/kenchen/Calculator/CalculatorService.java index 52ce3d98..a46fb986 100644 --- a/src/main/java/ms/kenchen/Calculator/CalculatorService.java +++ b/src/main/java/ms/kenchen/Calculator/CalculatorService.java @@ -13,7 +13,7 @@ public class CalculatorService { @Path("ping") @Produces(MediaType.TEXT_PLAIN) public String ping() { - return "Welcome to Java Web App!!! This is updated!\n" + new Date().toString(); + return "Welcome to SMA Web App!!! This is updated!\n" + new Date().toString(); } @GET From 36de3d6e2fa9fee27a157640a62dbe1aa1f2fe6e Mon Sep 17 00:00:00 2001 From: "Pandian, Guru" Date: Wed, 8 Dec 2021 18:52:08 +0530 Subject: [PATCH 7/8] code update --- src/main/java/ms/kenchen/Calculator/CalculatorService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/ms/kenchen/Calculator/CalculatorService.java b/src/main/java/ms/kenchen/Calculator/CalculatorService.java index a46fb986..2fed9c69 100644 --- a/src/main/java/ms/kenchen/Calculator/CalculatorService.java +++ b/src/main/java/ms/kenchen/Calculator/CalculatorService.java @@ -13,7 +13,7 @@ public class CalculatorService { @Path("ping") @Produces(MediaType.TEXT_PLAIN) public String ping() { - return "Welcome to SMA Web App!!! This is updated!\n" + new Date().toString(); + return "Welcome to MySMA Web App!!! This is updated!\n" + new Date().toString(); } @GET From 627675d496e3b29d72cad2b72b3363e5d2c91d31 Mon Sep 17 00:00:00 2001 From: "Pandian, Guru" Date: Wed, 8 Dec 2021 20:32:48 +0530 Subject: [PATCH 8/8] code update --- src/main/java/ms/kenchen/Calculator/CalculatorService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/ms/kenchen/Calculator/CalculatorService.java b/src/main/java/ms/kenchen/Calculator/CalculatorService.java index 2fed9c69..137b41ea 100644 --- a/src/main/java/ms/kenchen/Calculator/CalculatorService.java +++ b/src/main/java/ms/kenchen/Calculator/CalculatorService.java @@ -13,7 +13,7 @@ public class CalculatorService { @Path("ping") @Produces(MediaType.TEXT_PLAIN) public String ping() { - return "Welcome to MySMA Web App!!! This is updated!\n" + new Date().toString(); + return "Welcome to MyNewSMA Web App!!! This is updated!\n" + new Date().toString(); } @GET