From 1c30c340f39237dfb7627cf0033685136f64549d Mon Sep 17 00:00:00 2001
From: Tim McCarthy <tim.mccarthy@perficient.com>
Date: Thu, 20 Feb 2020 20:37:33 -0800
Subject: [PATCH] Changed OpenShiftProjectName to OpenShiftProject; removed
 unnecessary sections

---
 .../aro/azure-devops-templates/variables.yml  | 20 +++++++++----------
 deploy/aro/basket-api/azure-pipelines.yml     |  6 +-----
 deploy/aro/identity-api/azure-pipelines.yml   |  6 +-----
 3 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/deploy/aro/azure-devops-templates/variables.yml b/deploy/aro/azure-devops-templates/variables.yml
index 0c3cc7c64..cb9da4446 100644
--- a/deploy/aro/azure-devops-templates/variables.yml
+++ b/deploy/aro/azure-devops-templates/variables.yml
@@ -1,37 +1,37 @@
 variables:
   RedisHostname: redis.$(OpenShiftProject).svc
   RabbitMqHostname: rabbitmq.$(OpenShiftProject).svc
-  SqlHostName: mssql-server-linux.$(OpenShiftProjectName).svc
+  SqlHostName: mssql-server-linux.$(OpenShiftProject).svc
   PublicHostName: eshop$(EnvironmentName)
   IdentityApiHostName: identityapi.$(OpenShiftProject).svc
   IdentityPublicHostName: identity$(EnvironmentName)
   IdentityUrlExternal: https://$(IdentityPublicHostName)
   IdentityApiUrl: http://$(IdentityApiHostName):8080
-  BasketApiHostName: basketapi.$(OpenShiftProjectName).svc
+  BasketApiHostName: basketapi.$(OpenShiftProject).svc
   BasketApiUrl: http://$(BasketApiHostName):8080
   BasketApiHc: $(BasketApiUrl)/hc
-  CatalogApiHostName: catalogapi.$(OpenShiftProjectName).svc
+  CatalogApiHostName: catalogapi.$(OpenShiftProject).svc
   CatalogApiUrl: http://$(CatalogApiHostName):8080
   CatalogApiUrlExternal: https://$(CatalogPublicHostName)
   CatalogApiHc: $(CatalogApiUrl)/hc
-  LocationsApiHostName: locationsapi.$(OpenShiftProjectName).svc
+  LocationsApiHostName: locationsapi.$(OpenShiftProject).svc
   LocationsApiUrl: http://$(LocationsApiHostName):8080
   LocationsApiHc: $(LocationsApiUrl)/hc
-  MarketingApiHostName: marketingapi.$(OpenShiftProjectName).svc
+  MarketingApiHostName: marketingapi.$(OpenShiftProject).svc
   MarketingApiUrl: http://$(MarketingApiHostName):8080
   MarketingApiHc: $(MarketingApiUrl)/hc
-  OrderingApiHostName: orderingapi.$(OpenShiftProjectName).svc
+  OrderingApiHostName: orderingapi.$(OpenShiftProject).svc
   OrderingApiUrl: http://$(OrderingApiHostName):8080
   OrderingApiHc: $(OrderingApiUrl)/hc
-  MobileShoppingAggregatorHostName: mobileshoppingaggregator.$(OpenShiftProjectName).svc
+  MobileShoppingAggregatorHostName: mobileshoppingaggregator.$(OpenShiftProject).svc
   MobileShoppingAggregatorUrl: http://$(MobileShoppingAggregatorHostName):8080
   MobileShoppingAggregatorHc: $(MobileShoppingAggregatorUrl)/hc
-  WebShoppingAggregatorHostName: webshoppingaggregator.$(OpenShiftProjectName).svc
+  WebShoppingAggregatorHostName: webshoppingaggregator.$(OpenShiftProject).svc
   WebShoppingAggregatorUrl: http://$(WebShoppingAggregatorHostName):8080
   WebShoppingAggregatorHc: $(WebShoppingAggregatorUrl)/hc
-  WebhooksApiHostName: webhooksapi.$(OpenShiftProjectName).svc
+  WebhooksApiHostName: webhooksapi.$(OpenShiftProject).svc
   WebhooksApiUrl: http://$(WebhooksApiHostName):8080
-  WebhooksWebClientHostName: webhookclient.$(OpenShiftProjectName).svc
+  WebhooksWebClientHostName: webhookclient.$(OpenShiftProject).svc
   WebhooksWebClientUrl: http://$(WebhooksWebClientHostName):8080
   WebSpaUrl: https://eshop-spa$(EnvironmentName)
   WebMvcUrl: https://$(PublicHostName)
\ No newline at end of file
diff --git a/deploy/aro/basket-api/azure-pipelines.yml b/deploy/aro/basket-api/azure-pipelines.yml
index dc5206611..16276cbf0 100644
--- a/deploy/aro/basket-api/azure-pipelines.yml
+++ b/deploy/aro/basket-api/azure-pipelines.yml
@@ -9,16 +9,12 @@ trigger:
     include:
     - deploy/aro/basket-api/*
     - deploy/aro/openshift-templates/*
-resources:
-  pipelines:
-    - pipeline: BasketApiBuild
-      source: Basket-API-Build
 stages:
   - stage: development
     displayName: Development
     variables:
       OpenShiftProject: development
-      SourceImageRegistryProjectName: $(OpenShiftProject)
+      SourceImageRegistryProjectName: development
       EnvironmentName: dev
       IdentityPublicHostName: identity$(EnvironmentName)
     jobs:
diff --git a/deploy/aro/identity-api/azure-pipelines.yml b/deploy/aro/identity-api/azure-pipelines.yml
index 8a3e031ab..30170a92e 100644
--- a/deploy/aro/identity-api/azure-pipelines.yml
+++ b/deploy/aro/identity-api/azure-pipelines.yml
@@ -9,16 +9,12 @@ trigger:
     include:
     - deploy/aro/basket-api/*
     - deploy/aro/openshift-templates/*
-resources:
-  pipelines:
-    - pipeline: BasketApiBuild
-      source: Basket-API-Build
 stages:
   - stage: development
     displayName: Development
     variables:
       OpenShiftProject: development
-      SourceImageRegistryProjectName: $(OpenShiftProject)
+      SourceImageRegistryProjectName: development
       EnvironmentName: dev
     jobs:
       - job: Configuration_Deployment