diff --git a/deploy/aro/azure-devops-templates/api-gw-deploy.yml b/deploy/aro/azure-devops-templates/api-gw-deploy.yml new file mode 100644 index 000000000..8d3078061 --- /dev/null +++ b/deploy/aro/azure-devops-templates/api-gw-deploy.yml @@ -0,0 +1,32 @@ +parameters: + AppName: '' + AppTitle: '' +jobs: +- job: ApiGatewayDeployment + displayName: '$(AppTitle) Deployment' + variables: + - template: ./deploy/aro/azure-devops-templates/variables.yml + pool: + vmImage: 'windows-latest' + steps: + - task: colinsalmcorner.colinsalmcorner-buildtasks.replace-tokens-task.ReplaceTokens@1 + displayName: 'Replace tokens in envoy.yaml' + inputs: + sourcePath: ./deploy/aro/$(AppName) + filePattern: envoy.yaml + - task: redhat.openshift-vsts.oc-setup-task.oc-setup@2 + displayName: 'Setup Openshift CLI' + inputs: + openshiftService: $(OpenShiftServiceConnection) + - script: 'oc project $(OpenShiftProject)' + failOnStderr: true + displayName: 'Set OpenShift Project Context' + - script: 'oc delete configmap $(AppName)-config-map' + failOnStderr: false + displayName: 'Delete Envoy ConfigMap' + - script: 'oc create configmap $(AppName)-config-map --from-file=./deploy/aro/$(AppName)/envoy.yaml' + failOnStderr: true + displayName: 'Create Envoy ConfigMap' + - script: 'oc process -f ./deploy/aro/apigw-templates/apigw-deploy-template.yml -p APPLICATION_NAME=$(AppName) -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) | oc apply -f-' + failOnStderr: true + displayName: 'Ensure $(AppTitle) OpenShift Application' \ No newline at end of file diff --git a/deploy/aro/mobilemarketingapigw/azure-pipelines.yml b/deploy/aro/mobilemarketingapigw/azure-pipelines.yml index f6d22b9b5..28e2bdd28 100644 --- a/deploy/aro/mobilemarketingapigw/azure-pipelines.yml +++ b/deploy/aro/mobilemarketingapigw/azure-pipelines.yml @@ -16,31 +16,7 @@ stages: SourceImageRegistryProjectName: development EnvironmentName: -dev.msftnbu.com jobs: - - job: MobileMarketingApiGatewayDeployment - displayName: 'Mobile Marketing API Gateway Deployment' - variables: - - template: ../azure-devops-templates/variables.yml - pool: - vmImage: 'windows-latest' - steps: - - task: colinsalmcorner.colinsalmcorner-buildtasks.replace-tokens-task.ReplaceTokens@1 - displayName: 'Replace tokens in envoy.yaml' - inputs: - sourcePath: ./deploy/aro/mobilemarketingapigw - filePattern: envoy.yaml - - task: redhat.openshift-vsts.oc-setup-task.oc-setup@2 - displayName: 'Setup Openshift CLI' - inputs: - openshiftService: $(OpenShiftServiceConnection) - - script: 'oc project $(OpenShiftProject)' - failOnStderr: true - displayName: 'Set OpenShift Project Context' - - script: 'oc delete configmap mobilemarketingapigw-config-map' - failOnStderr: false - displayName: 'Delete Envoy ConfigMap' - - script: 'oc create configmap mobilemarketingapigw-config-map --from-file=./deploy/aro/mobilemarketingapigw/envoy.yml' - failOnStderr: true - displayName: 'Create Envoy ConfigMap' - - script: 'oc process -f ./deploy/aro/apigw-templates/apigw-deploy-template.yml -p APPLICATION_NAME=mobilemarketingapigw -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) | oc apply -f-' - failOnStderr: true - displayName: 'Ensure Mobile Marketing API Gateway OpenShift DeploymentConfig and Service' \ No newline at end of file + - template: ./deploy/aro/azure-devops-templates/api-gw-deploy.yml + parameters: + AppName: mobilemarketingapigw + AppTitle: 'Mobile Marketing API Gateway' \ No newline at end of file diff --git a/deploy/aro/mobileshoppingapigw/azure-pipelines.yml b/deploy/aro/mobileshoppingapigw/azure-pipelines.yml index 15db38177..06f40f3d0 100644 --- a/deploy/aro/mobileshoppingapigw/azure-pipelines.yml +++ b/deploy/aro/mobileshoppingapigw/azure-pipelines.yml @@ -16,25 +16,7 @@ stages: SourceImageRegistryProjectName: development EnvironmentName: -dev.msftnbu.com jobs: - - job: MobileShoppingApiGatewayDeployment - displayName: 'Mobile Shopping API Gateway Deployment' - variables: - - template: ../azure-devops-templates/variables.yml - pool: - vmImage: 'windows-latest' - steps: - - task: colinsalmcorner.colinsalmcorner-buildtasks.replace-tokens-task.ReplaceTokens@1 - displayName: 'Replace tokens in envoy.yml' - inputs: - sourcePath: ./deploy/aro/mobileshoppingapigw - filePattern: envoy.yml - - task: redhat.openshift-vsts.oc-setup-task.oc-setup@2 - displayName: 'Setup Openshift CLI' - inputs: - openshiftService: $(OpenShiftServiceConnection) - - script: 'oc project $(OpenShiftProject)' - failOnStderr: true - displayName: 'Set OpenShift Project Context' - - script: 'oc process -f ./deploy/aro/apigw-templates/apigw-deploy-template.yml -p APPLICATION_NAME=mobileshoppingapigw -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) | oc apply -f-' - failOnStderr: true - displayName: 'Ensure Mobile Shopping API Gateway OpenShift DeploymentConfig and Service' \ No newline at end of file + - template: ./deploy/aro/azure-devops-templates/api-gw-deploy.yml + parameters: + AppName: mobileshoppingapigw + AppTitle: 'Mobile Shopping API Gateway' \ No newline at end of file diff --git a/deploy/aro/webmarketingapigw/azure-pipelines.yml b/deploy/aro/webmarketingapigw/azure-pipelines.yml index abc3f654c..3d5c7c580 100644 --- a/deploy/aro/webmarketingapigw/azure-pipelines.yml +++ b/deploy/aro/webmarketingapigw/azure-pipelines.yml @@ -16,25 +16,7 @@ stages: SourceImageRegistryProjectName: development EnvironmentName: -dev.msftnbu.com jobs: - - job: WebMarketingApiGatewayDeployment - displayName: 'Web Marketing API Gateway Deployment' - variables: - - template: ../azure-devops-templates/variables.yml - pool: - vmImage: 'windows-latest' - steps: - - task: colinsalmcorner.colinsalmcorner-buildtasks.replace-tokens-task.ReplaceTokens@1 - displayName: 'Replace tokens in envoy.yml' - inputs: - sourcePath: ./deploy/aro/webmarketingapigw - filePattern: envoy.yml - - task: redhat.openshift-vsts.oc-setup-task.oc-setup@2 - displayName: 'Setup Openshift CLI' - inputs: - openshiftService: $(OpenShiftServiceConnection) - - script: 'oc project $(OpenShiftProject)' - failOnStderr: true - displayName: 'Set OpenShift Project Context' - - script: 'oc process -f ./deploy/aro/apigw-templates/apigw-deploy-template.yml -p APPLICATION_NAME=webmarketingapigw -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) | oc apply -f-' - failOnStderr: true - displayName: 'Ensure Web Marketing API Gateway OpenShift DeploymentConfig and Service' \ No newline at end of file + - template: ./deploy/aro/azure-devops-templates/api-gw-deploy.yml + parameters: + AppName: webmarketingapigw + AppTitle: 'Web Marketing API Gateway' \ No newline at end of file diff --git a/deploy/aro/webshoppingapigw/azure-pipelines.yml b/deploy/aro/webshoppingapigw/azure-pipelines.yml index 60c68100e..ebbfb4e66 100644 --- a/deploy/aro/webshoppingapigw/azure-pipelines.yml +++ b/deploy/aro/webshoppingapigw/azure-pipelines.yml @@ -16,25 +16,7 @@ stages: SourceImageRegistryProjectName: development EnvironmentName: -dev.msftnbu.com jobs: - - job: WebShoppingApiGatewayDeployment - displayName: 'Web Shopping API Gateway Deployment' - variables: - - template: ../azure-devops-templates/variables.yml - pool: - vmImage: 'windows-latest' - steps: - - task: colinsalmcorner.colinsalmcorner-buildtasks.replace-tokens-task.ReplaceTokens@1 - displayName: 'Replace tokens in envoy.yml' - inputs: - sourcePath: ./deploy/aro/webshoppingapigw - filePattern: envoy.yml - - task: redhat.openshift-vsts.oc-setup-task.oc-setup@2 - displayName: 'Setup Openshift CLI' - inputs: - openshiftService: $(OpenShiftServiceConnection) - - script: 'oc project $(OpenShiftProject)' - failOnStderr: true - displayName: 'Set OpenShift Project Context' - - script: 'oc process -f ./deploy/aro/apigw-templates/apigw-deploy-template.yml -p APPLICATION_NAME=webshoppingapigw -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) | oc apply -f-' - failOnStderr: true - displayName: 'Ensure Web Shopping API Gateway OpenShift DeploymentConfig and Service' \ No newline at end of file + - template: ./deploy/aro/azure-devops-templates/api-gw-deploy.yml + parameters: + AppName: webshoppingapigw + AppTitle: 'Web Shopping API Gateway'