diff --git a/Jenkinsfile b/Jenkinsfile index bb4b4b52..f11398a4 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']) { stage('init') { checkout scm } @@ -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 diff --git a/src/main/java/ms/kenchen/Calculator/CalculatorService.java b/src/main/java/ms/kenchen/Calculator/CalculatorService.java index 52ce3d98..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 Java Web App!!! This is updated!\n" + new Date().toString(); + return "Welcome to MyNewSMA Web App!!! This is updated!\n" + new Date().toString(); } @GET