ayan.poddar/eShopOnContainers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Changed OpenShiftProjectName to OpenShiftProject; removed unnecessary sections

Browse Source
This commit is contained in:
Tim McCarthy 2020-02-20 20:37:33 -08:00
parent e656a2c26b
commit 1c30c340f3
3 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
deploy/aro/azure-devops-templates/variables.yml
View File

@ -1,37 +1,37 @@
variables: variables:
RedisHostname: redis.$(OpenShiftProject).svc RedisHostname: redis.$(OpenShiftProject).svc
RabbitMqHostname: rabbitmq.$(OpenShiftProject).svc RabbitMqHostname: rabbitmq.$(OpenShiftProject).svc
SqlHostName: mssql-server-linux.$(OpenShiftProjectName).svc SqlHostName: mssql-server-linux.$(OpenShiftProject).svc
PublicHostName: eshop$(EnvironmentName) PublicHostName: eshop$(EnvironmentName)
IdentityApiHostName: identityapi.$(OpenShiftProject).svc IdentityApiHostName: identityapi.$(OpenShiftProject).svc
IdentityPublicHostName: identity$(EnvironmentName) IdentityPublicHostName: identity$(EnvironmentName)
IdentityUrlExternal: https://$(IdentityPublicHostName) IdentityUrlExternal: https://$(IdentityPublicHostName)
IdentityApiUrl: http://$(IdentityApiHostName):8080 IdentityApiUrl: http://$(IdentityApiHostName):8080
BasketApiHostName: basketapi.$(OpenShiftProjectName).svc BasketApiHostName: basketapi.$(OpenShiftProject).svc
BasketApiUrl: http://$(BasketApiHostName):8080 BasketApiUrl: http://$(BasketApiHostName):8080
BasketApiHc: $(BasketApiUrl)/hc BasketApiHc: $(BasketApiUrl)/hc
CatalogApiHostName: catalogapi.$(OpenShiftProjectName).svc CatalogApiHostName: catalogapi.$(OpenShiftProject).svc
CatalogApiUrl: http://$(CatalogApiHostName):8080 CatalogApiUrl: http://$(CatalogApiHostName):8080
CatalogApiUrlExternal: https://$(CatalogPublicHostName) CatalogApiUrlExternal: https://$(CatalogPublicHostName)
CatalogApiHc: $(CatalogApiUrl)/hc CatalogApiHc: $(CatalogApiUrl)/hc
LocationsApiHostName: locationsapi.$(OpenShiftProjectName).svc LocationsApiHostName: locationsapi.$(OpenShiftProject).svc
LocationsApiUrl: http://$(LocationsApiHostName):8080 LocationsApiUrl: http://$(LocationsApiHostName):8080
LocationsApiHc: $(LocationsApiUrl)/hc LocationsApiHc: $(LocationsApiUrl)/hc
MarketingApiHostName: marketingapi.$(OpenShiftProjectName).svc MarketingApiHostName: marketingapi.$(OpenShiftProject).svc
MarketingApiUrl: http://$(MarketingApiHostName):8080 MarketingApiUrl: http://$(MarketingApiHostName):8080
MarketingApiHc: $(MarketingApiUrl)/hc MarketingApiHc: $(MarketingApiUrl)/hc
OrderingApiHostName: orderingapi.$(OpenShiftProjectName).svc OrderingApiHostName: orderingapi.$(OpenShiftProject).svc
OrderingApiUrl: http://$(OrderingApiHostName):8080 OrderingApiUrl: http://$(OrderingApiHostName):8080
OrderingApiHc: $(OrderingApiUrl)/hc OrderingApiHc: $(OrderingApiUrl)/hc
MobileShoppingAggregatorHostName: mobileshoppingaggregator.$(OpenShiftProjectName).svc MobileShoppingAggregatorHostName: mobileshoppingaggregator.$(OpenShiftProject).svc
MobileShoppingAggregatorUrl: http://$(MobileShoppingAggregatorHostName):8080 MobileShoppingAggregatorUrl: http://$(MobileShoppingAggregatorHostName):8080
MobileShoppingAggregatorHc: $(MobileShoppingAggregatorUrl)/hc MobileShoppingAggregatorHc: $(MobileShoppingAggregatorUrl)/hc
WebShoppingAggregatorHostName: webshoppingaggregator.$(OpenShiftProjectName).svc WebShoppingAggregatorHostName: webshoppingaggregator.$(OpenShiftProject).svc
WebShoppingAggregatorUrl: http://$(WebShoppingAggregatorHostName):8080 WebShoppingAggregatorUrl: http://$(WebShoppingAggregatorHostName):8080
WebShoppingAggregatorHc: $(WebShoppingAggregatorUrl)/hc WebShoppingAggregatorHc: $(WebShoppingAggregatorUrl)/hc
WebhooksApiHostName: webhooksapi.$(OpenShiftProjectName).svc WebhooksApiHostName: webhooksapi.$(OpenShiftProject).svc
WebhooksApiUrl: http://$(WebhooksApiHostName):8080 WebhooksApiUrl: http://$(WebhooksApiHostName):8080
WebhooksWebClientHostName: webhookclient.$(OpenShiftProjectName).svc WebhooksWebClientHostName: webhookclient.$(OpenShiftProject).svc
WebhooksWebClientUrl: http://$(WebhooksWebClientHostName):8080 WebhooksWebClientUrl: http://$(WebhooksWebClientHostName):8080
WebSpaUrl: https://eshop-spa$(EnvironmentName) WebSpaUrl: https://eshop-spa$(EnvironmentName)
WebMvcUrl: https://$(PublicHostName) WebMvcUrl: https://$(PublicHostName)

6
deploy/aro/basket-api/azure-pipelines.yml
View File

@ -9,16 +9,12 @@ trigger:
include: include:
- deploy/aro/basket-api/* - deploy/aro/basket-api/*
- deploy/aro/openshift-templates/* - deploy/aro/openshift-templates/*
resources:
pipelines:
- pipeline: BasketApiBuild
source: Basket-API-Build
stages: stages:
- stage: development - stage: development
displayName: Development displayName: Development
variables: variables:
OpenShiftProject: development OpenShiftProject: development
SourceImageRegistryProjectName: $(OpenShiftProject) SourceImageRegistryProjectName: development
EnvironmentName: dev EnvironmentName: dev
IdentityPublicHostName: identity$(EnvironmentName) IdentityPublicHostName: identity$(EnvironmentName)
jobs: jobs:

6
deploy/aro/identity-api/azure-pipelines.yml
View File

@ -9,16 +9,12 @@ trigger:
include: include:
- deploy/aro/basket-api/* - deploy/aro/basket-api/*
- deploy/aro/openshift-templates/* - deploy/aro/openshift-templates/*
resources:
pipelines:
- pipeline: BasketApiBuild
source: Basket-API-Build
stages: stages:
- stage: development - stage: development
displayName: Development displayName: Development
variables: variables:
OpenShiftProject: development OpenShiftProject: development
SourceImageRegistryProjectName: $(OpenShiftProject) SourceImageRegistryProjectName: development
EnvironmentName: dev EnvironmentName: dev
jobs: jobs:
- job: Configuration_Deployment - job: Configuration_Deployment