Browse Source

Removed unnecessary variables

pull/1259/head
Tim McCarthy 5 years ago
parent
commit
b2263ec580
7 changed files with 37 additions and 8 deletions
  1. +1
    -1
      build/aro/readme.md
  2. +0
    -1
      deploy/aro/basket-api/azure-pipelines.yml
  3. +1
    -3
      deploy/aro/locations-api/azure-pipelines.yml
  4. +0
    -1
      deploy/aro/marketing-api/azure-pipelines.yml
  5. +0
    -1
      deploy/aro/ordering-api/azure-pipelines.yml
  6. +0
    -1
      deploy/aro/payment-api/azure-pipelines.yml
  7. +35
    -0
      deploy/aro/webhooks-api/azure-pipelines.yml

+ 1
- 1
build/aro/readme.md View File

@ -1,4 +1,4 @@
# OpenShift on ARO build definitions
# Azure Red Hat OpenShift (ARO) build definitions
This folder contains the Azure DevOps build definitions in YAML format targeting container builds in OpenShift on ARO. Each folder contains one `azure-pipelines.yml` that contains the build definition for one microservice. The container images are built inside of the OpenShift cluster from the latest release of the RHEL .NET Core base image. This folder contains the Azure DevOps build definitions in YAML format targeting container builds in OpenShift on ARO. Each folder contains one `azure-pipelines.yml` that contains the build definition for one microservice. The container images are built inside of the OpenShift cluster from the latest release of the RHEL .NET Core base image.

+ 0
- 1
deploy/aro/basket-api/azure-pipelines.yml View File

@ -16,7 +16,6 @@ stages:
OpenShiftProject: development OpenShiftProject: development
SourceImageRegistryProjectName: development SourceImageRegistryProjectName: development
EnvironmentName: dev EnvironmentName: dev
IdentityPublicHostName: identity$(EnvironmentName)
jobs: jobs:
- job: BasketApiDeployment - job: BasketApiDeployment
displayName: 'Basket API Deployment' displayName: 'Basket API Deployment'


+ 1
- 3
deploy/aro/locations-api/azure-pipelines.yml View File

@ -7,7 +7,7 @@ trigger:
- dev - dev
paths: paths:
include: include:
- deploy/aro/basket-api/*
- deploy/aro/locations-api/*
- deploy/aro/openshift-templates/* - deploy/aro/openshift-templates/*
stages: stages:
- stage: development - stage: development
@ -15,8 +15,6 @@ stages:
variables: variables:
OpenShiftProject: development OpenShiftProject: development
SourceImageRegistryProjectName: development SourceImageRegistryProjectName: development
EnvironmentName: dev
IdentityPublicHostName: identity$(EnvironmentName)
jobs: jobs:
- job: LocationsApiDeployment - job: LocationsApiDeployment
displayName: 'Locations API Deployment' displayName: 'Locations API Deployment'


+ 0
- 1
deploy/aro/marketing-api/azure-pipelines.yml View File

@ -15,7 +15,6 @@ stages:
variables: variables:
OpenShiftProject: development OpenShiftProject: development
SourceImageRegistryProjectName: development SourceImageRegistryProjectName: development
EnvironmentName: dev
jobs: jobs:
- job: MarketingApiDeployment - job: MarketingApiDeployment
displayName: 'Marketing API Deployment' displayName: 'Marketing API Deployment'


+ 0
- 1
deploy/aro/ordering-api/azure-pipelines.yml View File

@ -15,7 +15,6 @@ stages:
variables: variables:
OpenShiftProject: development OpenShiftProject: development
SourceImageRegistryProjectName: development SourceImageRegistryProjectName: development
EnvironmentName: dev
jobs: jobs:
- job: OrderingApiDeployment - job: OrderingApiDeployment
displayName: 'Ordering API Deployment' displayName: 'Ordering API Deployment'


+ 0
- 1
deploy/aro/payment-api/azure-pipelines.yml View File

@ -15,7 +15,6 @@ stages:
variables: variables:
OpenShiftProject: development OpenShiftProject: development
SourceImageRegistryProjectName: development SourceImageRegistryProjectName: development
EnvironmentName: dev
jobs: jobs:
- job: PaymentApiDeployment - job: PaymentApiDeployment
displayName: 'Payment API Deployment' displayName: 'Payment API Deployment'


+ 35
- 0
deploy/aro/webhooks-api/azure-pipelines.yml View File

@ -0,0 +1,35 @@
variables:
OpenShiftServiceConnection: 'OpenShift on ARO'
trigger:
branches:
include:
- master
- dev
paths:
include:
- deploy/aro/webhooks-api/*
- deploy/aro/openshift-templates/*
stages:
- stage: development
displayName: Development
variables:
OpenShiftProject: development
SourceImageRegistryProjectName: development
jobs:
- job: WebhooksApiDeployment
displayName: 'Webhooks API Deployment'
variables:
- template: ../azure-devops-templates/variables.yml
pool:
vmImage: 'windows-latest'
steps:
- 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/openshift-templates/webhooksapi-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 Webhooks API OpenShift DeploymentConfig and Service'

Loading…
Cancel
Save