From c534aa4060f1fa6beb842876bab78109ae2b9d1e Mon Sep 17 00:00:00 2001 From: roopeshpalankar <45727436+roopeshpalankar@users.noreply.github.com> Date: Tue, 25 Dec 2018 22:07:16 +0530 Subject: [PATCH 1/6] Update Jenkinsfile --- Jenkinsfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 0b265563..501b8cf5 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,10 +17,10 @@ node { } stage('deploy') { - def resourceGroup = '' - def webAppName = '' + def resourceGroup = 'celgroup' + def webAppName = 'celwebapp' // login Azure - withCredentials([azureServicePrincipal('')]) { + withCredentials([azureServicePrincipal('celappserviceplan')]) { 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 635c3e02920b28fe6b745a8b560050e66c9270a8 Mon Sep 17 00:00:00 2001 From: roopeshpalankar <45727436+roopeshpalankar@users.noreply.github.com> Date: Tue, 25 Dec 2018 22:41:32 +0530 Subject: [PATCH 2/6] XXX --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 501b8cf5..91a26f1a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -20,7 +20,7 @@ node { def resourceGroup = 'celgroup' def webAppName = 'celwebapp' // login Azure - withCredentials([azureServicePrincipal('celappserviceplan')]) { + withCredentials([azureServicePrincipal('celappserviceplanXXX')]) { 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 c364c9e5d3f453a8d247d79746482dd0891ffea1 Mon Sep 17 00:00:00 2001 From: roopeshpalankar <45727436+roopeshpalankar@users.noreply.github.com> Date: Tue, 25 Dec 2018 22:43:08 +0530 Subject: [PATCH 3/6] Update Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 91a26f1a..501b8cf5 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -20,7 +20,7 @@ node { def resourceGroup = 'celgroup' def webAppName = 'celwebapp' // login Azure - withCredentials([azureServicePrincipal('celappserviceplanXXX')]) { + withCredentials([azureServicePrincipal('celappserviceplan')]) { 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 c81c9aa38641437243db5bde075a396546cd71d6 Mon Sep 17 00:00:00 2001 From: roopeshpalankar <45727436+roopeshpalankar@users.noreply.github.com> Date: Tue, 25 Dec 2018 22:57:00 +0530 Subject: [PATCH 4/6] 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..27d391ad 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 celstream Java Web App!!! This is updated!\n" + new Date().toString(); } @GET From 41f9065c0d3ccd18b26e0dd1d03bb587bcfb5d2b Mon Sep 17 00:00:00 2001 From: roopesh Date: Tue, 25 Dec 2018 23:13:05 +0530 Subject: [PATCH 5/6] commit to brach hi --- 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 27d391ad..994a70a6 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 celstream Java Web App!!! This is updated!\n" + new Date().toString(); + return "Welcome to celstream Java Web App by Roopesh!!! This is updated!\n" + new Date().toString(); } @GET From dbf34caf65dfd2faeeb0ac018459e762e61b9583 Mon Sep 17 00:00:00 2001 From: roopesh Date: Tue, 25 Dec 2018 23:19:44 +0530 Subject: [PATCH 6/6] commit to brach master --- 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 994a70a6..c1ab31ee 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 celstream Java Web App by Roopesh!!! This is updated!\n" + new Date().toString(); + return "Welcome to celstream Java Web App by Roopesh Palankar!!! This is updated!\n" + new Date().toString(); } @GET