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

Added variables template; wired up basketapi and identityapi deploy pipelines to use the new variables template

Browse Source
This commit is contained in:
Tim McCarthy 2020-02-20 17:00:08 -08:00
parent b7c6aeea6d
commit fe4236ee62
3 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
deploy/aro/azure-devops-templates/variables.yml Normal file
View File

@ -0,0 +1,7 @@
variables:
IdentityApiHostName: identityapi.$(OpenShiftProject).svc
RedisHostname: redis.$(OpenShiftProject).svc
RabbitMqHostname: rabbitmq.$(OpenShiftProject).svc
IdentityPublicHostName: identity$(EnvironmentName)
IdentityUrlExternal: https://$(IdentityPublicHostName)
IdentityApiUrl: http://$(IdentityApiHostName):8080

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

@ -23,13 +23,9 @@ stages:
IdentityPublicHostName: identity$(EnvironmentName) IdentityPublicHostName: identity$(EnvironmentName)
jobs: jobs:
- job: BasketApiDeployment - job: BasketApiDeployment
variables:
IdentityApiHostName: identityapi.$(OpenShiftProject).svc
RedisHostname: redis.$(OpenShiftProject).svc
RabbitMqHostname: rabbitmq.$(OpenShiftProject).svc
IdentityUrlExternal: https://$(IdentityPublicHostName)
IdentityApiUrl: http://$(IdentityApiHostName):8080
displayName: 'Basket API Deployment' displayName: 'Basket API Deployment'
variables:
- template: ../azure-devops-templates/variables.yml
pool: pool:
vmImage: 'windows-latest' vmImage: 'windows-latest'
steps: steps:

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

@ -20,15 +20,11 @@ stages:
OpenShiftProject: development OpenShiftProject: development
SourceImageRegistryProjectName: $(OpenShiftProject) SourceImageRegistryProjectName: $(OpenShiftProject)
EnvironmentName: dev EnvironmentName: dev
IdentityApiHostName: identityapi.$(OpenShiftProject).svc
RedisHostname: redis.$(OpenShiftProject).svc
RabbitMqHostname: rabbitmq.$(OpenShiftProject).svc
IdentityPublicHostName: identity$(EnvironmentName)
IdentityUrlExternal: https://$(IdentityPublicHostName)
IdentityApiUrl: http://$(IdentityApiHostName):8080
jobs: jobs:
- job: Configuration_Deployment - job: Configuration_Deployment
displayName: 'Configuration Deployment' displayName: 'Configuration Deployment'
variables:
- template: ../azure-devops-templates/variables.yml
pool: pool:
vmImage: 'windows-latest' vmImage: 'windows-latest'
steps: steps:
@ -39,6 +35,6 @@ stages:
- script: 'oc project $(OpenShiftProject)' - script: 'oc project $(OpenShiftProject)'
failOnStderr: true failOnStderr: true
displayName: 'Set OpenShift Project Context' displayName: 'Set OpenShift Project Context'
- script: 'oc process -f ./deploy/aro/openshift-templates/identityapi-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) | oc apply -f-' - script: 'oc process -f ./deploy/aro/openshift-templates/identityapi-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) -p WEB_SPA_URL= -p WEB_MVC_URL= -p LOCATION_API_URL= -p MARKETING_API_URL= -p BASKET_API_URL= -p ORDERING_API_URL= -p MOBILE_SHOPPING_AGGREGATOR_URL= -p WEB_SHOPPING_AGGREGATOR_URL= -p WEBHOOKS_API_URL= -p WEBHOOKS_WEB_CLIENT_URL= | oc apply -f-'
failOnStderr: true failOnStderr: true
displayName: 'Ensure Identity API OpenShift DeploymentConfig and Service' displayName: 'Ensure Identity API OpenShift DeploymentConfig and Service'