From 6f361e438b9f7bdf519383b286b53d20f093275c Mon Sep 17 00:00:00 2001 From: Tim McCarthy Date: Mon, 17 Feb 2020 12:58:54 -0800 Subject: [PATCH] Added variables back in --- deploy/aro/infrastructure/azure-pipelines.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/deploy/aro/infrastructure/azure-pipelines.yml b/deploy/aro/infrastructure/azure-pipelines.yml index 1e79003d0..231dd7247 100644 --- a/deploy/aro/infrastructure/azure-pipelines.yml +++ b/deploy/aro/infrastructure/azure-pipelines.yml @@ -19,12 +19,12 @@ stages: - job: Infrastructure_Deployment displayName: 'Infrastructure Deployment' variables: - SqlHostName: $[format('mssql-server-linux.{0}.svc', variables['OpenShiftProject'])] + SqlHostName: mssql-server-linux.$(OpenShiftProject).svc CatalogDbConnection: Server=$(SqlHostName);Database=Microsoft.eShopOnContainers.Services.CatalogDb;User Id=$(SqlUsername);Password=$(SqlPassword) - IdentityDbConnection: $[format('Server={0};Database=Microsoft.eShopOnContainers.Services.IdentityDb;User Id={1};Password={2}', variables['SqlHostName'], variables['SqlUsername'], variables['SqlPassword'])] - MarketingDbConnection: $[format('Server={0};Database=Microsoft.eShopOnContainers.Services.MarketingDb;User Id={1};Password={2}', variables['SqlHostName'], variables['SqlUsername'], variables['SqlPassword'])] - OrderingDbConnection: $[format('Server={0};Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id={1};Password={2}', variables['SqlHostName'], variables['SqlUsername'], variables['SqlPassword'])] - WebhooksDbConnection: $[format('Server={0};Database=Microsoft.eShopOnContainers.Services.WebhooksDb;User Id={1};Password={2}', variables['SqlHostName'], variables['SqlUsername'], variables['SqlPassword'])] + IdentityDbConnection: Server=$(SqlHostName);Database=Microsoft.eShopOnContainers.Service.IdentityDb;User Id=$(SqlUsername);Password=$(SqlPassword) + MarketingDbConnection: Server=$(SqlHostName);Database=Microsoft.eShopOnContainers.Services.MarketingDb;User Id=$(SqlUsername);Password=$(SqlPassword) + OrderingDbConnection: Server=$(SqlHostName);Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=$(SqlUsername);Password=$(SqlPassword) + WebhooksDbConnection: Server=$(SqlHostName);Database=Microsoft.eShopOnContainers.Services.WebhooksDb;User Id=$(SqlUsername);Password=$(SqlPassword) pool: vmImage: 'windows-latest' steps: @@ -40,7 +40,7 @@ stages: - script: 'oc project $(OpenShiftProject)' failOnStderr: true displayName: 'Set OpenShift Project Context' - - script: 'oc process -f ./deploy/aro/openshift-templates/infrastructure/secrets-deploy-template.yml -p CATALOG_DB_CONNECTION_SECRET="$(CatalogDbConnection)" -p IDENTITY_DB_CONNECTION_SECRET=12345 -p MARKETING_DB_CONNECTION_SECRET=12345 -p ORDERING_DB_CONNECTION_SECRET=12345 -p SQL_PASSWORD_SECRET=12345 -p WEBHOOKS_DB_CONNECTION_SECRET=12345 | oc apply -f-' + - script: 'oc process -f ./deploy/aro/openshift-templates/infrastructure/secrets-deploy-template.yml -p CATALOG_DB_CONNECTION_SECRET="$(CatalogDbConnection)" -p IDENTITY_DB_CONNECTION_SECRET="$(IdentityDbConnection)" -p MARKETING_DB_CONNECTION_SECRET="$(MarketingDbConnection)" -p ORDERING_DB_CONNECTION_SECRET="$(OrderingDbConnection)" -p SQL_PASSWORD_SECRET=$(SqlPassword) -p WEBHOOKS_DB_CONNECTION_SECRET="$(WebhooksDbConnection)" | oc apply -f-' failOnStderr: true displayName: 'Secrets Deployment' - script: 'oc process -f ./deploy/aro/openshift-templates/infrastructure/rabbitmq-image-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) | oc apply -f-'