Refactored the folders under deploy/aro

deploy/aro/basket-api/azure-pipelines.yml

@@ -8,7 +8,6 @@ trigger:
   paths:
     include:
     - deploy/aro/basket-api/*
-    - deploy/aro/openshift-templates/*
 stages:
   - stage: development
     displayName: Development
@@ -31,6 +30,6 @@ stages:
         - script: 'oc project $(OpenShiftProject)'
           failOnStderr: true
           displayName: 'Set OpenShift Project Context'
-        - script: 'oc process -f ./deploy/aro/openshift-templates/basketapi-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) -p IDENTITY_URL_EXTERNAL=$(IdentityUrlExternal) -p IDENTITY_URL=$(IdentityApiUrl) -p REDIS_HOSTNAME=$(RedisHostname) -p RABBITMQ_HOSTNAME=$(RabbitMqHostname) | oc apply -f-'
+        - script: 'oc process -f ./deploy/aro/basket-api/basketapi-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) -p IDENTITY_URL_EXTERNAL=$(IdentityUrlExternal) -p IDENTITY_URL=$(IdentityApiUrl) -p REDIS_HOSTNAME=$(RedisHostname) -p RABBITMQ_HOSTNAME=$(RabbitMqHostname) | oc apply -f-'
           failOnStderr: true
           displayName: 'Ensure Basket API OpenShift DeploymentConfig and Service'

deploy/aro/catalog-api/azure-pipelines.yml

@@ -8,7 +8,6 @@ trigger:
   paths:
     include:
     - deploy/aro/catalog-api/*
-    - deploy/aro/openshift-templates/*
 stages:
   - stage: development
     displayName: Development
@@ -41,7 +40,7 @@ stages:
         - script: 'oc project $(OpenShiftProject)'
           failOnStderr: true
           displayName: 'Set OpenShift Project Context'
-        - script: 'oc process -f ./deploy/aro/openshift-templates/catalogapi-deploy-template.yml 
+        - script: 'oc process -f ./deploy/aro/catalog-api/catalogapi-deploy-template.yml 
             -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) 
             -p PIC_BASE_URL=$(PicBaseUrl) 
             -p RABBITMQ_HOSTNAME=$(RabbitMqHostname) 

deploy/aro/identity-api/azure-pipelines.yml

@@ -8,7 +8,6 @@ trigger:
   paths:
     include:
     - deploy/aro/identity-api/*
-    - deploy/aro/openshift-templates/*
 stages:
   - stage: development
     displayName: Development
@@ -41,7 +40,7 @@ stages:
         - script: 'oc project $(OpenShiftProject)'
           failOnStderr: true
           displayName: 'Set OpenShift Project Context'
-        - script: 'oc process -f ./deploy/aro/openshift-templates/identityapi-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) -p WEB_SPA_URL=$(WebSpaUrl) -p WEB_MVC_URL=$(WebMvcUrl) -p LOCATION_API_URL=$(LocationsApiUrl) -p MARKETING_API_URL=$(MarketingApiUrl) -p BASKET_API_URL=$(BasketApiUrl) -p ORDERING_API_URL=$(OrderingApiUrl) -p MOBILE_SHOPPING_AGGREGATOR_URL=$(MobileShoppingAggregatorUrl) -p WEB_SHOPPING_AGGREGATOR_URL=$(WebShoppingAggregatorUrl) -p WEBHOOKS_API_URL=$(WebhooksApiUrl) -p WEBHOOKS_WEB_CLIENT_URL=$(WebhooksWebClientUrl) | oc apply -f-'
+        - script: 'oc process -f ./deploy/aro/identity-api/identityapi-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) -p WEB_SPA_URL=$(WebSpaUrl) -p WEB_MVC_URL=$(WebMvcUrl) -p LOCATION_API_URL=$(LocationsApiUrl) -p MARKETING_API_URL=$(MarketingApiUrl) -p BASKET_API_URL=$(BasketApiUrl) -p ORDERING_API_URL=$(OrderingApiUrl) -p MOBILE_SHOPPING_AGGREGATOR_URL=$(MobileShoppingAggregatorUrl) -p WEB_SHOPPING_AGGREGATOR_URL=$(WebShoppingAggregatorUrl) -p WEBHOOKS_API_URL=$(WebhooksApiUrl) -p WEBHOOKS_WEB_CLIENT_URL=$(WebhooksWebClientUrl) | oc apply -f-'
           failOnStderr: true
           displayName: 'Ensure Identity API OpenShift DeploymentConfig and Service'
         - script: 'oc apply -f ./deploy/aro/identity-api/identity-public-route.json'

deploy/aro/infrastructure/azure-pipelines.yml

@@ -8,7 +8,6 @@ trigger:
   paths:
     include:
     - deploy/aro/infrastructure/*
-    - deploy/aro/openshift-templates/infrastructure/*
 stages:
   - stage: development
     displayName: Development
@@ -40,21 +39,21 @@ 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="$(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-'
+          - script: 'oc process -f ./deploy/aro/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-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) | oc apply -f-'
+          - script: 'oc process -f ./deploy/aro/infrastructure/rabbitmq-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) | oc apply -f-'
             failOnStderr: true
             displayName: 'RabbitMQ Deployment'
-          - script: 'oc process -f ./deploy/aro/openshift-templates/infrastructure/redis-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) | oc apply -f-'
+          - script: 'oc process -f ./deploy/aro/infrastructure/redis-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) | oc apply -f-'
             failOnStderr: true
             displayName: 'Redis Deployment'
-          - script: 'oc process -f ./deploy/aro/openshift-templates/infrastructure/seq-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) | oc apply -f-'
+          - script: 'oc process -f ./deploy/aro/infrastructure/seq-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) | oc apply -f-'
             failOnStderr: true
             displayName: 'Seq Deployment'
-          - script: 'oc process -f ./deploy/aro/openshift-templates/infrastructure/mssql-server-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) | oc apply -f-'
+          - script: 'oc process -f ./deploy/aro/infrastructure/mssql-server-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) | oc apply -f-'
             failOnStderr: true
             displayName: 'SQL Server Deployment'
-          - script: 'oc process -f ./deploy/aro/openshift-templates/infrastructure/mongo-db-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) | oc apply -f-'
+          - script: 'oc process -f ./deploy/aro/infrastructure/mongo-db-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) | oc apply -f-'
             failOnStderr: true
             displayName: 'MongoDB Deployment'

deploy/aro/locations-api/azure-pipelines.yml

@@ -8,7 +8,6 @@ trigger:
   paths:
     include:
     - deploy/aro/locations-api/*
-    - deploy/aro/openshift-templates/*
 stages:
   - stage: development
     displayName: Development
@@ -30,6 +29,6 @@ stages:
         - script: 'oc project $(OpenShiftProject)'
           failOnStderr: true
           displayName: 'Set OpenShift Project Context'
-        - script: 'oc process -f ./deploy/aro/openshift-templates/locationsapi-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) -p MONGO_DB_CONNECTION_STRING=$(MongoConnectionString) -p LOCATIONS_DB_NAME=$(LocationsDbName) -p IDENTITY_URL_EXTERNAL=$(IdentityUrlExternal) -p IDENTITY_URL=$(IdentityApiUrl) -p RABBITMQ_HOSTNAME=$(RabbitMqHostname) | oc apply -f-'
+        - script: 'oc process -f ./deploy/aro/locations-api/locationsapi-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) -p MONGO_DB_CONNECTION_STRING=$(MongoConnectionString) -p LOCATIONS_DB_NAME=$(LocationsDbName) -p IDENTITY_URL_EXTERNAL=$(IdentityUrlExternal) -p IDENTITY_URL=$(IdentityApiUrl) -p RABBITMQ_HOSTNAME=$(RabbitMqHostname) | oc apply -f-'
           failOnStderr: true
           displayName: 'Ensure Locations API OpenShift DeploymentConfig and Service'

deploy/aro/marketing-api/azure-pipelines.yml

@@ -8,7 +8,6 @@ trigger:
   paths:
     include:
     - deploy/aro/marketing-api/*
-    - deploy/aro/openshift-templates/*
 stages:
   - stage: development
     displayName: Development
@@ -30,6 +29,6 @@ stages:
         - script: 'oc project $(OpenShiftProject)'
           failOnStderr: true
           displayName: 'Set OpenShift Project Context'
-        - script: 'oc process -f ./deploy/aro/openshift-templates/marketingapi-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) -p MONGO_DB_CONNECTION_STRING=$(MongoConnectionString) -p MARKETING_DB_NAME=$(MarketingDbName) -p RABBITMQ_HOSTNAME=$(RabbitMqHostname) -p IDENTITY_URL=$(IdentityApiUrl) -p IDENTITY_URL_EXTERNAL=$(IdentityUrlExternal) -p PIC_BASE_URL=$(PicBaseUrl) | oc apply -f-'
+        - script: 'oc process -f ./deploy/aro/marketing-api/marketingapi-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) -p MONGO_DB_CONNECTION_STRING=$(MongoConnectionString) -p MARKETING_DB_NAME=$(MarketingDbName) -p RABBITMQ_HOSTNAME=$(RabbitMqHostname) -p IDENTITY_URL=$(IdentityApiUrl) -p IDENTITY_URL_EXTERNAL=$(IdentityUrlExternal) -p PIC_BASE_URL=$(PicBaseUrl) | oc apply -f-'
           failOnStderr: true
           displayName: 'Ensure Marketing API OpenShift DeploymentConfig and Service'

deploy/aro/mobileshoppingagg/azure-pipelines.yml

@@ -8,7 +8,6 @@ trigger:
   paths:
     include:
     - deploy/aro/mobileshoppingagg/*
-    - deploy/aro/openshift-templates/*
 stages:
   - stage: development
     displayName: Development
@@ -31,6 +30,6 @@ stages:
         - script: 'oc project $(OpenShiftProject)'
           failOnStderr: true
           displayName: 'Set OpenShift Project Context'
-        - script: 'oc process -f ./deploy/aro/openshift-templates/mobileshoppingagg-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) -p BASKET_API_URL=$(BasketApiUrl) -p CATALOG_API_URL=$(CatalogApiUrl) -p ORDERING_API_URL=$(OrderingApiUrl) -p IDENTITY_API_URL=$(IdentityApiUrl) -p BASKET_API_GRPC_URL=$(BasketApiGrpcUrl) -p CATALOG_API_GRPC_URL=$(CatalogApiGrpcUrl) -p ORDERING_API_GRPC_URL=$(OrderingApiGrpcUrl) -p CATALOG_API_HC_URL=$(CatalogApiHc) -p ORDERING_API_HC_URL=$(OrderingApiHc) -p IDENTITY_API_HC_URL=$(IdentityApiHc) -p BASKET_API_HC_URL=$(BasketApiHc) -p MARKETING_API_HC_URL=$(MarketingApiHc) -p PAYMENT_API_HC_URL=$(PaymentApiHc) -p LOCATION_API_HC_URL=$(LocationsApiHc) -p IDENTITY_URL_EXTERNAL=$(IdentityUrlExternal) | oc apply -f-'
+        - script: 'oc process -f ./deploy/aro/mobileshoppingagg/mobileshoppingagg-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) -p BASKET_API_URL=$(BasketApiUrl) -p CATALOG_API_URL=$(CatalogApiUrl) -p ORDERING_API_URL=$(OrderingApiUrl) -p IDENTITY_API_URL=$(IdentityApiUrl) -p BASKET_API_GRPC_URL=$(BasketApiGrpcUrl) -p CATALOG_API_GRPC_URL=$(CatalogApiGrpcUrl) -p ORDERING_API_GRPC_URL=$(OrderingApiGrpcUrl) -p CATALOG_API_HC_URL=$(CatalogApiHc) -p ORDERING_API_HC_URL=$(OrderingApiHc) -p IDENTITY_API_HC_URL=$(IdentityApiHc) -p BASKET_API_HC_URL=$(BasketApiHc) -p MARKETING_API_HC_URL=$(MarketingApiHc) -p PAYMENT_API_HC_URL=$(PaymentApiHc) -p LOCATION_API_HC_URL=$(LocationsApiHc) -p IDENTITY_URL_EXTERNAL=$(IdentityUrlExternal) | oc apply -f-'
           failOnStderr: true
           displayName: 'Ensure Mobile Shopping Aggregator OpenShift DeploymentConfig and Service'

deploy/aro/ordering-api/azure-pipelines.yml

@@ -8,7 +8,6 @@ trigger:
   paths:
     include:
     - deploy/aro/ordering-api/*
-    - deploy/aro/openshift-templates/*
 stages:
   - stage: development
     displayName: Development
@@ -31,6 +30,6 @@ stages:
         - script: 'oc project $(OpenShiftProject)'
           failOnStderr: true
           displayName: 'Set OpenShift Project Context'
-        - script: 'oc process -f ./deploy/aro/openshift-templates/orderingapi-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) -p RABBITMQ_HOSTNAME=$(RabbitMqHostname) -p IDENTITY_URL_EXTERNAL=$(IdentityUrlExternal) -p IDENTITY_URL=$(IdentityApiUrl) | oc apply -f-'
+        - script: 'oc process -f ./deploy/aro/ordering-api/orderingapi-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) -p RABBITMQ_HOSTNAME=$(RabbitMqHostname) -p IDENTITY_URL_EXTERNAL=$(IdentityUrlExternal) -p IDENTITY_URL=$(IdentityApiUrl) | oc apply -f-'
           failOnStderr: true
           displayName: 'Ensure Ordering API OpenShift DeploymentConfig and Service'

deploy/aro/ordering-backgroundtasks/azure-pipelines.yml

@@ -8,7 +8,6 @@ trigger:
   paths:
     include:
     - deploy/aro/ordering-backgroundtasks/*
-    - deploy/aro/openshift-templates/*
 stages:
   - stage: development
     displayName: Development
@@ -30,6 +29,6 @@ stages:
         - script: 'oc project $(OpenShiftProject)'
           failOnStderr: true
           displayName: 'Set OpenShift Project Context'
-        - script: 'oc process -f ./deploy/aro/openshift-templates/ordering-backgroundtasks-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) -p RABBITMQ_HOSTNAME=$(RabbitMqHostname) | oc apply -f-'
+        - script: 'oc process -f ./deploy/aro/ordering-backgroundtasks/ordering-backgroundtasks-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) -p RABBITMQ_HOSTNAME=$(RabbitMqHostname) | oc apply -f-'
           failOnStderr: true
           displayName: 'Ensure Ordering Background Tasks OpenShift DeploymentConfig and Service'

deploy/aro/ordering-signalrhub/azure-pipelines.yml

@@ -8,7 +8,6 @@ trigger:
   paths:
     include:
     - deploy/aro/ordering-signalrhub/*
-    - deploy/aro/openshift-templates/*
 stages:
   - stage: development
     displayName: Development
@@ -31,6 +30,6 @@ stages:
         - script: 'oc project $(OpenShiftProject)'
           failOnStderr: true
           displayName: 'Set OpenShift Project Context'
-        - script: 'oc process -f ./deploy/aro/openshift-templates/ordering-signalrhub-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) -p RABBITMQ_HOSTNAME=$(RabbitMqHostname) -p IDENTITY_URL=$(IdentityApiUrl) | oc apply -f-'
+        - script: 'oc process -f ./deploy/aro/ordering-signalrhub/ordering-signalrhub-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) -p RABBITMQ_HOSTNAME=$(RabbitMqHostname) -p IDENTITY_URL=$(IdentityApiUrl) | oc apply -f-'
           failOnStderr: true
           displayName: 'Ensure Catalog API OpenShift DeploymentConfig and Service'

deploy/aro/payment-api/azure-pipelines.yml

@@ -8,7 +8,6 @@ trigger:
   paths:
     include:
     - deploy/aro/payment-api/*
-    - deploy/aro/openshift-templates/*
 stages:
   - stage: development
     displayName: Development
@@ -30,6 +29,6 @@ stages:
         - script: 'oc project $(OpenShiftProject)'
           failOnStderr: true
           displayName: 'Set OpenShift Project Context'
-        - script: 'oc process -f ./deploy/aro/openshift-templates/paymentapi-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) -p RABBITMQ_HOSTNAME=$(RabbitMqHostname) | oc apply -f-'
+        - script: 'oc process -f ./deploy/aro/payment-api/paymentapi-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) -p RABBITMQ_HOSTNAME=$(RabbitMqHostname) | oc apply -f-'
           failOnStderr: true
           displayName: 'Ensure Payment API OpenShift DeploymentConfig and Service'

deploy/aro/web-mvc/azure-pipelines.yml

@@ -8,7 +8,6 @@ trigger:
   paths:
     include:
     - deploy/aro/web-mvc/*
-    - deploy/aro/openshift-templates/*
 stages:
   - stage: development
     displayName: Development
@@ -41,7 +40,7 @@ stages:
         - script: 'oc project $(OpenShiftProject)'
           failOnStderr: true
           displayName: 'Set OpenShift Project Context'
-        - script: 'oc process -f ./deploy/aro/openshift-templates/webmvc-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) -p IDENTITY_API_URL=$(IdentityApiUrl) -p WEB_SHOPPING_API_GATEWAY_URL=$(WebShoppingApiGatewayUrl) -p MARKETING_API_URL=$(MarketingApiUrl) -p IDENTITY_API_HC_URL=$(IdentityApiHc) -p ORDERING_SIGNALR_HUB_URL=$(OrderingSignalRHubUrl) | oc apply -f-'
+        - script: 'oc process -f ./deploy/aro/web-mvc/webmvc-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) -p IDENTITY_API_URL=$(IdentityApiUrl) -p WEB_SHOPPING_API_GATEWAY_URL=$(WebShoppingApiGatewayUrl) -p MARKETING_API_URL=$(MarketingApiUrl) -p IDENTITY_API_HC_URL=$(IdentityApiHc) -p ORDERING_SIGNALR_HUB_URL=$(OrderingSignalRHubUrl) | oc apply -f-'
           failOnStderr: true
           displayName: 'Ensure Web MVC OpenShift DeploymentConfig and Service'
         - script: 'oc apply -f ./deploy/aro/web-mvc/webmvc-public-route.json'

deploy/aro/web-spa/azure-pipelines.yml

@@ -8,7 +8,6 @@ trigger:
   paths:
     include:
     - deploy/aro/web-spa/*
-    - deploy/aro/openshift-templates/*
 stages:
   - stage: development
     displayName: Development
@@ -31,6 +30,6 @@ stages:
         - script: 'oc project $(OpenShiftProject)'
           failOnStderr: true
           displayName: 'Set OpenShift Project Context'
-        - script: 'oc process -f ./deploy/aro/openshift-templates/webspa-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) -p IDENTITY_API_URL=$(IdentityApiUrl) -p WEB_SHOPPING_API_GATEWAY_URL=$(WebShoppingApiGatewayUrl) -p MARKETING_API_URL=$(MarketingApiUrl) -p IDENTITY_API_HC_URL=$(IdentityApiHc) -p ORDERING_SIGNALR_HUB_URL=$(OrderingSignalRHubUrl) | oc apply -f-'
+        - script: 'oc process -f ./deploy/aro/web-spa/webspa-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) -p IDENTITY_API_URL=$(IdentityApiUrl) -p WEB_SHOPPING_API_GATEWAY_URL=$(WebShoppingApiGatewayUrl) -p MARKETING_API_URL=$(MarketingApiUrl) -p IDENTITY_API_HC_URL=$(IdentityApiHc) -p ORDERING_SIGNALR_HUB_URL=$(OrderingSignalRHubUrl) | oc apply -f-'
           failOnStderr: true
           displayName: 'Ensure Web SPA OpenShift DeploymentConfig and Service'

deploy/aro/webhooks-api/azure-pipelines.yml

@@ -8,7 +8,6 @@ trigger:
   paths:
     include:
     - deploy/aro/webhooks-api/*
-    - deploy/aro/openshift-templates/*
 stages:
   - stage: development
     displayName: Development
@@ -30,6 +29,6 @@ stages:
         - script: 'oc project $(OpenShiftProject)'
           failOnStderr: true
           displayName: 'Set OpenShift Project Context'
-        - script: 'oc process -f ./deploy/aro/openshift-templates/webhooksapi-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) -p RABBITMQ_HOSTNAME=$(RabbitMqHostname) -p IDENTITY_URL=$(IdentityApiUrl) -p IDENTITY_URL_EXTERNAL=$(IdentityUrlExternal) | oc apply -f-'
+        - script: 'oc process -f ./deploy/aro/webhooks-api/webhooksapi-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) -p RABBITMQ_HOSTNAME=$(RabbitMqHostname) -p IDENTITY_URL=$(IdentityApiUrl) -p IDENTITY_URL_EXTERNAL=$(IdentityUrlExternal) | oc apply -f-'
           failOnStderr: true
           displayName: 'Ensure Webhooks API OpenShift DeploymentConfig and Service'

deploy/aro/webhooks-client/azure-pipelines.yml

@@ -7,8 +7,7 @@ trigger:
     - dev
   paths:
     include:
-    - deploy/aro/web-mvc/*
-    - deploy/aro/openshift-templates/*
+    - deploy/aro/webhooks-client/*
 stages:
   - stage: development
     displayName: Development
@@ -31,6 +30,6 @@ stages:
         - script: 'oc project $(OpenShiftProject)'
           failOnStderr: true
           displayName: 'Set OpenShift Project Context'
-        - script: 'oc process -f ./deploy/aro/openshift-templates/webhooks-client-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) -p WEBHOOKS_TOKEN=$(WebhooksToken) -p IDENTITY_API_URL=$(IdentityApiUrl) -p WEBHOOKS_WEB_CLIENT_URL=$(WebhooksWebClientUrl) -p WEBHOOKS_API_URL=$(WebhooksApiUrl) | oc apply -f-'
+        - script: 'oc process -f ./deploy/aro/webhooks-client/webhooks-client-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) -p WEBHOOKS_TOKEN=$(WebhooksToken) -p IDENTITY_API_URL=$(IdentityApiUrl) -p WEBHOOKS_WEB_CLIENT_URL=$(WebhooksWebClientUrl) -p WEBHOOKS_API_URL=$(WebhooksApiUrl) | oc apply -f-'
           failOnStderr: true
           displayName: 'Ensure Webhooks Client OpenShift DeploymentConfig and Service'

deploy/aro/webshoppingagg/azure-pipelines.yml

@@ -8,7 +8,6 @@ trigger:
   paths:
     include:
     - deploy/aro/webshoppingagg/*
-    - deploy/aro/openshift-templates/*
 stages:
   - stage: development
     displayName: Development
@@ -31,6 +30,6 @@ stages:
         - script: 'oc project $(OpenShiftProject)'
           failOnStderr: true
           displayName: 'Set OpenShift Project Context'
-        - script: 'oc process -f ./deploy/aro/openshift-templates/webshoppingagg-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) -p BASKET_API_URL=$(BasketApiUrl) -p CATALOG_API_URL=$(CatalogApiUrl) -p ORDERING_API_URL=$(OrderingApiUrl) -p IDENTITY_API_URL=$(IdentityApiUrl) -p BASKET_API_GRPC_URL=$(BasketApiGrpcUrl) -p CATALOG_API_GRPC_URL=$(CatalogApiGrpcUrl) -p ORDERING_API_GRPC_URL=$(OrderingApiGrpcUrl) -p CATALOG_API_HC_URL=$(CatalogApiHc) -p ORDERING_API_HC_URL=$(OrderingApiHc) -p IDENTITY_API_HC_URL=$(IdentityApiHc) -p BASKET_API_HC_URL=$(BasketApiHc) -p MARKETING_API_HC_URL=$(MarketingApiHc) -p PAYMENT_API_HC_URL=$(PaymentApiHc) -p LOCATION_API_HC_URL=$(LocationsApiHc) -p IDENTITY_URL_EXTERNAL=$(IdentityUrlExternal) | oc apply -f-'
+        - script: 'oc process -f ./deploy/aro/webshoppingagg/webshoppingagg-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) -p BASKET_API_URL=$(BasketApiUrl) -p CATALOG_API_URL=$(CatalogApiUrl) -p ORDERING_API_URL=$(OrderingApiUrl) -p IDENTITY_API_URL=$(IdentityApiUrl) -p BASKET_API_GRPC_URL=$(BasketApiGrpcUrl) -p CATALOG_API_GRPC_URL=$(CatalogApiGrpcUrl) -p ORDERING_API_GRPC_URL=$(OrderingApiGrpcUrl) -p CATALOG_API_HC_URL=$(CatalogApiHc) -p ORDERING_API_HC_URL=$(OrderingApiHc) -p IDENTITY_API_HC_URL=$(IdentityApiHc) -p BASKET_API_HC_URL=$(BasketApiHc) -p MARKETING_API_HC_URL=$(MarketingApiHc) -p PAYMENT_API_HC_URL=$(PaymentApiHc) -p LOCATION_API_HC_URL=$(LocationsApiHc) -p IDENTITY_URL_EXTERNAL=$(IdentityUrlExternal) | oc apply -f-'
           failOnStderr: true
           displayName: 'Ensure Web Shopping Aggregator OpenShift DeploymentConfig and Service'

deploy/aro/webstatus/azure-pipelines.yml

@@ -8,7 +8,6 @@ trigger:
   paths:
     include:
     - deploy/aro/webstatus/*
-    - deploy/aro/openshift-templates/*
 stages:
   - stage: development
     displayName: Development
@@ -31,6 +30,6 @@ stages:
         - script: 'oc project $(OpenShiftProject)'
           failOnStderr: true
           displayName: 'Set OpenShift Project Context'
-        - script: 'oc process -f ./deploy/aro/openshift-templates/webstatus-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) -p WEB_MVC_HC_URL=$(WebMvcHc) -p WEB_SPA_HC_URL=$(WebSpaHc) -p WEB_SHOPPING_AGGREGATOR_HC_URL=$(WebShoppingAggregatorHc) -p MOBILE_SHOPPING_AGGREGATOR_HC_URL=$(MobileShoppingAggregatorHc) -p ORDERING_API_HC_URL=$(OrderingApiHc) -p BASKET_API_HC_URL=$(BasketApiHc) -p CATALOG_API_HC_URL=$(CatalogApiHc) -p IDENTITY_API_HC_URL=$(IdentityApiHc) -p MARKETING_API_HC_URL=$(MarketingApiHc) -p LOCATIONS_API_HC_URL=$(LocationsApiHc) -p PAYMENT_API_HC_URL=$(PaymentApiHc) -p ORDERING_SIGNALR_HUB_HC_URL=$(OrderingSignalRHubHc) -p ORDERING_BACKGROUND_TASKS_HC_URL=$(OrderingBackgroundTasksHc) | oc apply -f-'
+        - script: 'oc process -f ./deploy/aro/webstatus/webstatus-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) -p WEB_MVC_HC_URL=$(WebMvcHc) -p WEB_SPA_HC_URL=$(WebSpaHc) -p WEB_SHOPPING_AGGREGATOR_HC_URL=$(WebShoppingAggregatorHc) -p MOBILE_SHOPPING_AGGREGATOR_HC_URL=$(MobileShoppingAggregatorHc) -p ORDERING_API_HC_URL=$(OrderingApiHc) -p BASKET_API_HC_URL=$(BasketApiHc) -p CATALOG_API_HC_URL=$(CatalogApiHc) -p IDENTITY_API_HC_URL=$(IdentityApiHc) -p MARKETING_API_HC_URL=$(MarketingApiHc) -p LOCATIONS_API_HC_URL=$(LocationsApiHc) -p PAYMENT_API_HC_URL=$(PaymentApiHc) -p ORDERING_SIGNALR_HUB_HC_URL=$(OrderingSignalRHubHc) -p ORDERING_BACKGROUND_TASKS_HC_URL=$(OrderingBackgroundTasksHc) | oc apply -f-'
           failOnStderr: true
           displayName: 'Ensure Web Status OpenShift DeploymentConfig and Service'