From 4481cc34ed43d6f65f27b0f095d6cc1902a7093e Mon Sep 17 00:00:00 2001 From: Miguel Veloso Date: Tue, 3 Dec 2019 16:17:57 +0000 Subject: [PATCH 1/2] Fix paths for moved folders --- build/azure-devops/apigws/azure-pipelines.yml | 34 +++++++++---------- .../basket-api/azure-pipelines.yml | 6 ++-- .../catalog-api/azure-pipelines.yml | 6 ++-- .../identity-api/azure-pipelines.yml | 6 ++-- .../infrastructure/azure-pipelines.yml | 16 ++++----- .../location-api/azure-pipelines.yml | 6 ++-- .../marketing-api/azure-pipelines.yml | 6 ++-- .../mobile-shopping-agg/azure-pipelines.yml | 6 ++-- .../ordering-api/azure-pipelines.yml | 10 +++--- .../payment-api/azure-pipelines.yml | 6 ++-- build/azure-devops/readme.md | 6 ++-- .../web-shopping-agg/azure-pipelines.yml | 6 ++-- .../webhooks-api/azure-pipelines.yml | 6 ++-- .../webhooks-client/azure-pipelines.yml | 6 ++-- build/azure-devops/webmvc/azure-pipelines.yml | 6 ++-- build/azure-devops/webspa/azure-pipelines.yml | 6 ++-- .../webstatus/azure-pipelines.yml | 6 ++-- 17 files changed, 72 insertions(+), 72 deletions(-) diff --git a/build/azure-devops/apigws/azure-pipelines.yml b/build/azure-devops/apigws/azure-pipelines.yml index 857355673..e0dacc800 100644 --- a/build/azure-devops/apigws/azure-pipelines.yml +++ b/build/azure-devops/apigws/azure-pipelines.yml @@ -1,5 +1,3 @@ -variables: - registryEndpoint: eshop-registry trigger: branches: include: @@ -8,22 +6,24 @@ trigger: paths: include: - src/ApiGateways/* - - k8s/helm/apigwmm/* - - k8s/helm/apigwms/* - - k8s/helm/apigwwm/* - - k8s/helm/apigwws/* + - deploy/k8s/helm/apigwmm/* + - deploy/k8s/helm/apigwms/* + - deploy/k8s/helm/apigwwm/* + - deploy/k8s/helm/apigwws/* exclude: - src/ApiGateways/Mobile.Bff.Shopping/aggregator/* - src/ApiGateways/Web.Bff.Shopping/aggregator/* jobs: -- template: ../buildimages.yaml - parameters: - services: mobileshoppingapigw mobilemarketingapigw webshoppingapigw webmarketingapigw - registryEndpoint: $(registryEndpoint) - helmfrom: $(Build.SourcesDirectory)/k8s/helm - helmto: $(Build.ArtifactStagingDirectory)/k8s/helm -- template: ../multiarch.yaml - parameters: - image: ocelotapigw - branch: $(Build.SourceBranchName) - registryEndpoint: $(registryEndpoint) +- job: PublishCharts + condition: ne('$(Build.Reason)', 'PullRequest') + pool: + vmImage: 'ubuntu-16.04' + steps: + - task: CopyFiles@2 + inputs: + sourceFolder: $(Build.SourcesDirectory)/deploy/k8s/helm + targetFolder: $(Build.ArtifactStagingDirectory)/deploy/k8s/helm + - task: PublishBuildArtifacts@1 + inputs: + pathtoPublish: $(Build.ArtifactStagingDirectory)/deploy/k8s/helm + artifactName: helm diff --git a/build/azure-devops/basket-api/azure-pipelines.yml b/build/azure-devops/basket-api/azure-pipelines.yml index 730680ad9..b6900b1a8 100644 --- a/build/azure-devops/basket-api/azure-pipelines.yml +++ b/build/azure-devops/basket-api/azure-pipelines.yml @@ -9,14 +9,14 @@ trigger: include: - src/BuildingBlocks/* - src/Services/Basket/* - - k8s/helm/basket-api/* + - deploy/k8s/helm/basket-api/* jobs: - template: ../buildimages.yaml parameters: services: basket.api registryEndpoint: $(registryEndpoint) - helmfrom: $(Build.SourcesDirectory)/k8s/helm - helmto: $(Build.ArtifactStagingDirectory)/k8s/helm + helmfrom: $(Build.SourcesDirectory)/deploy/k8s/helm + helmto: $(Build.ArtifactStagingDirectory)/deploy/k8s/helm - template: ../multiarch.yaml parameters: image: basket.api diff --git a/build/azure-devops/catalog-api/azure-pipelines.yml b/build/azure-devops/catalog-api/azure-pipelines.yml index 032d1dd2f..e254efbdf 100644 --- a/build/azure-devops/catalog-api/azure-pipelines.yml +++ b/build/azure-devops/catalog-api/azure-pipelines.yml @@ -9,14 +9,14 @@ trigger: include: - src/BuildingBlocks/* - src/Services/Catalog/* - - k8s/helm/catalog-api/* + - deploy/k8s/helm/catalog-api/* jobs: - template: ../buildimages.yaml parameters: services: catalog.api registryEndpoint: $(registryEndpoint) - helmfrom: $(Build.SourcesDirectory)/k8s/helm - helmto: $(Build.ArtifactStagingDirectory)/k8s/helm + helmfrom: $(Build.SourcesDirectory)/deploy/k8s/helm + helmto: $(Build.ArtifactStagingDirectory)/deploy/k8s/helm - template: ../multiarch.yaml parameters: image: catalog.api diff --git a/build/azure-devops/identity-api/azure-pipelines.yml b/build/azure-devops/identity-api/azure-pipelines.yml index 07891f32b..5405c3453 100644 --- a/build/azure-devops/identity-api/azure-pipelines.yml +++ b/build/azure-devops/identity-api/azure-pipelines.yml @@ -9,14 +9,14 @@ trigger: include: - src/BuildingBlocks/* - src/Services/Identity/* - - k8s/helm/identity-api/* + - deploy/k8s/helm/identity-api/* jobs: - template: ../buildimages.yaml parameters: services: identity.api registryEndpoint: $(registryEndpoint) - helmfrom: $(Build.SourcesDirectory)/k8s/helm - helmto: $(Build.ArtifactStagingDirectory)/k8s/helm + helmfrom: $(Build.SourcesDirectory)/deploy/k8s/helm + helmto: $(Build.ArtifactStagingDirectory)/deploy/k8s/helm - template: ../multiarch.yaml parameters: image: identity.api diff --git a/build/azure-devops/infrastructure/azure-pipelines.yml b/build/azure-devops/infrastructure/azure-pipelines.yml index 50296d457..4c19cecb2 100644 --- a/build/azure-devops/infrastructure/azure-pipelines.yml +++ b/build/azure-devops/infrastructure/azure-pipelines.yml @@ -9,17 +9,17 @@ trigger: - dev paths: include: - - k8s/helm/basket-data/* - - k8s/helm/keystore-data/* - - k8s/helm/nosql-data/* - - k8s/helm/rabbitmq/* - - k8s/helm/sql-data/* + - deploy/k8s/helm/basket-data/* + - deploy/k8s/helm/keystore-data/* + - deploy/k8s/helm/nosql-data/* + - deploy/k8s/helm/rabbitmq/* + - deploy/k8s/helm/sql-data/* steps: - task: CopyFiles@2 inputs: - sourceFolder: $(Build.SourcesDirectory)/k8s/helm - targetFolder: $(Build.ArtifactStagingDirectory)/k8s/helm + sourceFolder: $(Build.SourcesDirectory)/deploy/k8s/helm + targetFolder: $(Build.ArtifactStagingDirectory)/deploy/k8s/helm - task: PublishBuildArtifacts@1 inputs: - pathtoPublish: $(Build.ArtifactStagingDirectory)/k8s/helm + pathtoPublish: $(Build.ArtifactStagingDirectory)/deploy/k8s/helm artifactName: helm diff --git a/build/azure-devops/location-api/azure-pipelines.yml b/build/azure-devops/location-api/azure-pipelines.yml index c926d71ac..9d1b3ed3a 100644 --- a/build/azure-devops/location-api/azure-pipelines.yml +++ b/build/azure-devops/location-api/azure-pipelines.yml @@ -9,14 +9,14 @@ trigger: include: - src/BuildingBlocks/* - src/Services/Location/* - - k8s/helm/locations-api/* + - deploy/k8s/helm/locations-api/* jobs: - template: ../buildimages.yaml parameters: services: locations.api registryEndpoint: $(registryEndpoint) - helmfrom: $(Build.SourcesDirectory)/k8s/helm - helmto: $(Build.ArtifactStagingDirectory)/k8s/helm + helmfrom: $(Build.SourcesDirectory)/deploy/k8s/helm + helmto: $(Build.ArtifactStagingDirectory)/deploy/k8s/helm - template: ../multiarch.yaml parameters: image: locations.api diff --git a/build/azure-devops/marketing-api/azure-pipelines.yml b/build/azure-devops/marketing-api/azure-pipelines.yml index c215ecb90..430fb3f3c 100644 --- a/build/azure-devops/marketing-api/azure-pipelines.yml +++ b/build/azure-devops/marketing-api/azure-pipelines.yml @@ -9,14 +9,14 @@ trigger: include: - src/BuildingBlocks/* - src/Services/Marketing/* - - k8s/helm/marketing-api/* + - deploy/k8s/helm/marketing-api/* jobs: - template: ../buildimages.yaml parameters: services: marketing.api registryEndpoint: $(registryEndpoint) - helmfrom: $(Build.SourcesDirectory)/k8s/helm - helmto: $(Build.ArtifactStagingDirectory)/k8s/helm + helmfrom: $(Build.SourcesDirectory)/deploy/k8s/helm + helmto: $(Build.ArtifactStagingDirectory)/deploy/k8s/helm - template: ../multiarch.yaml parameters: image: marketing.api diff --git a/build/azure-devops/mobile-shopping-agg/azure-pipelines.yml b/build/azure-devops/mobile-shopping-agg/azure-pipelines.yml index 749a589b2..58efa9da4 100644 --- a/build/azure-devops/mobile-shopping-agg/azure-pipelines.yml +++ b/build/azure-devops/mobile-shopping-agg/azure-pipelines.yml @@ -8,14 +8,14 @@ trigger: paths: include: - src/ApiGateways/Mobile.Bff.Shopping/aggregator/* - - k8s/helm/mobileshoppingagg/* + - deploy/k8s/helm/mobileshoppingagg/* jobs: - template: ../buildimages.yaml parameters: services: mobileshoppingagg registryEndpoint: $(registryEndpoint) - helmfrom: $(Build.SourcesDirectory)/k8s/helm - helmto: $(Build.ArtifactStagingDirectory)/k8s/helm + helmfrom: $(Build.SourcesDirectory)/deploy/k8s/helm + helmto: $(Build.ArtifactStagingDirectory)/deploy/k8s/helm - template: ../multiarch.yaml parameters: image: mobileshoppingagg diff --git a/build/azure-devops/ordering-api/azure-pipelines.yml b/build/azure-devops/ordering-api/azure-pipelines.yml index 4d688c7dc..539f026b2 100644 --- a/build/azure-devops/ordering-api/azure-pipelines.yml +++ b/build/azure-devops/ordering-api/azure-pipelines.yml @@ -9,16 +9,16 @@ trigger: include: - src/BuildingBlocks/* - src/Services/Ordering/* - - k8s/helm/ordering-api/* - - k8s/helm/ordering-backgroundtasks/* - - k8s/helm/ordering-signalrhub/* + - deploy/k8s/helm/ordering-api/* + - deploy/k8s/helm/ordering-backgroundtasks/* + - deploy/k8s/helm/ordering-signalrhub/* jobs: - template: ../buildimages.yaml parameters: services: ordering.api registryEndpoint: $(registryEndpoint) - helmfrom: $(Build.SourcesDirectory)/k8s/helm - helmto: $(Build.ArtifactStagingDirectory)/k8s/helm + helmfrom: $(Build.SourcesDirectory)/deploy/k8s/helm + helmto: $(Build.ArtifactStagingDirectory)/deploy/k8s/helm - template: ../multiarch.yaml parameters: image: ordering.api diff --git a/build/azure-devops/payment-api/azure-pipelines.yml b/build/azure-devops/payment-api/azure-pipelines.yml index 0fed2db92..24fe42b4d 100644 --- a/build/azure-devops/payment-api/azure-pipelines.yml +++ b/build/azure-devops/payment-api/azure-pipelines.yml @@ -9,14 +9,14 @@ trigger: include: - src/BuildingBlocks/* - src/Services/Payment/* - - k8s/helm/payment-api/* + - deploy/k8s/helm/payment-api/* jobs: - template: ../buildimages.yaml parameters: services: payment.api registryEndpoint: $(registryEndpoint) - helmfrom: $(Build.SourcesDirectory)/k8s/helm - helmto: $(Build.ArtifactStagingDirectory)/k8s/helm + helmfrom: $(Build.SourcesDirectory)/deploy/k8s/helm + helmto: $(Build.ArtifactStagingDirectory)/deploy/k8s/helm - template: ../multiarch.yaml parameters: image: payment.api diff --git a/build/azure-devops/readme.md b/build/azure-devops/readme.md index b7216d4de..03680be34 100644 --- a/build/azure-devops/readme.md +++ b/build/azure-devops/readme.md @@ -1,5 +1,5 @@ -# Azure Devops build definitions +# Azure DevOps build definitions -This folder contains the Azure Devops build definitions in YAML format. Each folder contains one `azure-pipelines.yml` that contains the build definition for one microservice (usually a Docker image, but some microservices generates more than one Docker image). +This folder contains the Azure DevOps build definitions in YAML format. Each folder contains one `azure-pipelines.yml` that contains the build definition for one microservice (usually a Docker image, but some microservices generates more than one Docker image). -For more information about YAML builds read the [Azure DevOps documentation](https://docs.microsoft.com/en-us/azure/devops/pipelines/get-started-yaml?view=azure-devops). \ No newline at end of file +For more information about YAML builds read the [Azure DevOps documentation](https://docs.microsoft.com/azure/devops/pipelines/get-started-yaml?view=azure-devops). \ No newline at end of file diff --git a/build/azure-devops/web-shopping-agg/azure-pipelines.yml b/build/azure-devops/web-shopping-agg/azure-pipelines.yml index 9e907d2ce..8c00702c7 100644 --- a/build/azure-devops/web-shopping-agg/azure-pipelines.yml +++ b/build/azure-devops/web-shopping-agg/azure-pipelines.yml @@ -8,14 +8,14 @@ trigger: paths: include: - src/ApiGateways/Web.Bff.Shopping/aggregator/* - - k8s/helm/webshoppingagg/* + - deploy/k8s/helm/webshoppingagg/* jobs: - template: ../buildimages.yaml parameters: services: webshoppingagg registryEndpoint: $(registryEndpoint) - helmfrom: $(Build.SourcesDirectory)/k8s/helm - helmto: $(Build.ArtifactStagingDirectory)/k8s/helm + helmfrom: $(Build.SourcesDirectory)/deploy/k8s/helm + helmto: $(Build.ArtifactStagingDirectory)/deploy/k8s/helm - template: ../multiarch.yaml parameters: image: webshoppingagg diff --git a/build/azure-devops/webhooks-api/azure-pipelines.yml b/build/azure-devops/webhooks-api/azure-pipelines.yml index d7fc14ef6..258bbc999 100644 --- a/build/azure-devops/webhooks-api/azure-pipelines.yml +++ b/build/azure-devops/webhooks-api/azure-pipelines.yml @@ -9,14 +9,14 @@ trigger: include: - src/BuildingBlocks/* - src/Services/Webhooks/* - - k8s/helm/webhooks-api/* + - deploy/k8s/helm/webhooks-api/* jobs: - template: ../buildimages.yaml parameters: services: webhooks.api registryEndpoint: $(registryEndpoint) - helmfrom: $(Build.SourcesDirectory)/k8s/helm - helmto: $(Build.ArtifactStagingDirectory)/k8s/helm + helmfrom: $(Build.SourcesDirectory)/deploy/k8s/helm + helmto: $(Build.ArtifactStagingDirectory)/deploy/k8s/helm - template: ../multiarch.yaml parameters: image: webhooks.api diff --git a/build/azure-devops/webhooks-client/azure-pipelines.yml b/build/azure-devops/webhooks-client/azure-pipelines.yml index 76b3b63c9..c8d69055e 100644 --- a/build/azure-devops/webhooks-client/azure-pipelines.yml +++ b/build/azure-devops/webhooks-client/azure-pipelines.yml @@ -9,14 +9,14 @@ trigger: include: - src/BuildingBlocks/* - src/Web/WebhookClient/* - - k8s/helm/webhooks-web/* + - deploy/k8s/helm/webhooks-web/* jobs: - template: ../buildimages.yaml parameters: services: webhooks.client registryEndpoint: $(registryEndpoint) - helmfrom: $(Build.SourcesDirectory)/k8s/helm - helmto: $(Build.ArtifactStagingDirectory)/k8s/helm + helmfrom: $(Build.SourcesDirectory)/deploy/k8s/helm + helmto: $(Build.ArtifactStagingDirectory)/deploy/k8s/helm - template: ../multiarch.yaml parameters: image: webhooks.client diff --git a/build/azure-devops/webmvc/azure-pipelines.yml b/build/azure-devops/webmvc/azure-pipelines.yml index fd637b260..024e20eb3 100644 --- a/build/azure-devops/webmvc/azure-pipelines.yml +++ b/build/azure-devops/webmvc/azure-pipelines.yml @@ -9,14 +9,14 @@ trigger: include: - src/BuildingBlocks/* - src/Web/WebMVC/* - - k8s/helm/webmvc/* + - deploy/k8s/helm/webmvc/* jobs: - template: ../buildimages.yaml parameters: services: webmvc registryEndpoint: $(registryEndpoint) - helmfrom: $(Build.SourcesDirectory)/k8s/helm - helmto: $(Build.ArtifactStagingDirectory)/k8s/helm + helmfrom: $(Build.SourcesDirectory)/deploy/k8s/helm + helmto: $(Build.ArtifactStagingDirectory)/deploy/k8s/helm - template: ../multiarch.yaml parameters: image: webmvc diff --git a/build/azure-devops/webspa/azure-pipelines.yml b/build/azure-devops/webspa/azure-pipelines.yml index 99d8d2daf..a19ba86c3 100644 --- a/build/azure-devops/webspa/azure-pipelines.yml +++ b/build/azure-devops/webspa/azure-pipelines.yml @@ -9,14 +9,14 @@ trigger: include: - src/BuildingBlocks/* - src/Web/WebSPA/* - - k8s/helm/webspa/* + - deploy/k8s/helm/webspa/* jobs: - template: ../buildimages.yaml parameters: services: webspa registryEndpoint: $(registryEndpoint) - helmfrom: $(Build.SourcesDirectory)/k8s/helm - helmto: $(Build.ArtifactStagingDirectory)/k8s/helm + helmfrom: $(Build.SourcesDirectory)/deploy/k8s/helm + helmto: $(Build.ArtifactStagingDirectory)/deploy/k8s/helm - template: ../multiarch.yaml parameters: image: webspa diff --git a/build/azure-devops/webstatus/azure-pipelines.yml b/build/azure-devops/webstatus/azure-pipelines.yml index f361370e6..dc24131f7 100644 --- a/build/azure-devops/webstatus/azure-pipelines.yml +++ b/build/azure-devops/webstatus/azure-pipelines.yml @@ -9,14 +9,14 @@ trigger: include: - src/BuildingBlocks/* - src/Web/WebStatus/* - - k8s/helm/webstatus/* + - deploy/k8s/helm/webstatus/* jobs: - template: ../buildimages.yaml parameters: services: webstatus registryEndpoint: $(registryEndpoint) - helmfrom: $(Build.SourcesDirectory)/k8s/helm - helmto: $(Build.ArtifactStagingDirectory)/k8s/helm + helmfrom: $(Build.SourcesDirectory)/deploy/k8s/helm + helmto: $(Build.ArtifactStagingDirectory)/deploy/k8s/helm - template: ../multiarch.yaml parameters: image: webstatus From 01c7dd082d7bbc5c7f6f7d10353f7c37a9f14fcf Mon Sep 17 00:00:00 2001 From: Miguel Veloso Date: Tue, 3 Dec 2019 18:18:47 +0000 Subject: [PATCH 2/2] Comment out windows jobs --- build/azure-devops/basket-api/azure-pipelines.yml | 2 +- build/azure-devops/buildimages.yaml | 14 ++++++++------ build/azure-devops/catalog-api/azure-pipelines.yml | 2 +- .../azure-devops/identity-api/azure-pipelines.yml | 4 ++-- .../infrastructure/azure-pipelines.yml | 2 +- .../azure-devops/location-api/azure-pipelines.yml | 4 ++-- .../azure-devops/marketing-api/azure-pipelines.yml | 4 ++-- .../mobile-shopping-agg/azure-pipelines.yml | 4 ++-- .../azure-devops/ordering-api/azure-pipelines.yml | 4 ++-- build/azure-devops/payment-api/azure-pipelines.yml | 6 +++--- .../web-shopping-agg/azure-pipelines.yml | 6 +++--- .../azure-devops/webhooks-api/azure-pipelines.yml | 4 ++-- .../webhooks-client/azure-pipelines.yml | 6 +++--- build/azure-devops/webmvc/azure-pipelines.yml | 6 +++--- build/azure-devops/webspa/azure-pipelines.yml | 6 +++--- build/azure-devops/webstatus/azure-pipelines.yml | 6 +++--- 16 files changed, 41 insertions(+), 39 deletions(-) diff --git a/build/azure-devops/basket-api/azure-pipelines.yml b/build/azure-devops/basket-api/azure-pipelines.yml index b6900b1a8..399b682ec 100644 --- a/build/azure-devops/basket-api/azure-pipelines.yml +++ b/build/azure-devops/basket-api/azure-pipelines.yml @@ -16,7 +16,7 @@ jobs: services: basket.api registryEndpoint: $(registryEndpoint) helmfrom: $(Build.SourcesDirectory)/deploy/k8s/helm - helmto: $(Build.ArtifactStagingDirectory)/deploy/k8s/helm + helmto: $(Build.ArtifactStagingDirectory)/deploy/k8s/helm - template: ../multiarch.yaml parameters: image: basket.api diff --git a/build/azure-devops/buildimages.yaml b/build/azure-devops/buildimages.yaml index cf6457513..bdd326de1 100644 --- a/build/azure-devops/buildimages.yaml +++ b/build/azure-devops/buildimages.yaml @@ -13,16 +13,17 @@ jobs: - bash: docker-compose build ${{ parameters.services }} displayName: Create multiarch manifest env: - TAG: ${{ variables['Build.SourceBranchName'] }} + TAG: ${{ variables['Build.SourceBranchName'] }} - job: BuildContainersForPR_Windows - condition: eq('${{ variables['Build.Reason'] }}', 'PullRequest') + condition: False + # condition: eq('${{ variables['Build.Reason'] }}', 'PullRequest') pool: vmImage: 'windows-2019' steps: - bash: docker-compose build ${{ parameters.services }} displayName: Create multiarch manifest env: - TAG: ${{ variables['Build.SourceBranchName'] }} + TAG: ${{ variables['Build.SourceBranchName'] }} PLATFORM: win NODE_IMAGE: stefanscherer/node-windows:10 - job: BuildLinux @@ -51,7 +52,7 @@ jobs: qualifyImageNames: true projectName: "" dockerComposeFileArgs: | - TAG=${{ variables['Build.SourceBranchName'] }} + TAG=${{ variables['Build.SourceBranchName'] }} - task: CopyFiles@2 inputs: sourceFolder: ${{ parameters.helmfrom }} @@ -61,7 +62,8 @@ jobs: pathtoPublish: ${{ parameters.helmto }} artifactName: helm - job: BuildWindows - condition: ne('${{ variables['Build.Reason'] }}', 'PullRequest') + condition: False + # condition: ne('${{ variables['Build.Reason'] }}', 'PullRequest') pool: vmImage: 'windows-2019' steps: @@ -89,4 +91,4 @@ jobs: projectName: "" dockerComposeFileArgs: | TAG=${{ variables['Build.SourceBranchName'] }} - PLATFORM=win + PLATFORM=win diff --git a/build/azure-devops/catalog-api/azure-pipelines.yml b/build/azure-devops/catalog-api/azure-pipelines.yml index e254efbdf..a9ae16e39 100644 --- a/build/azure-devops/catalog-api/azure-pipelines.yml +++ b/build/azure-devops/catalog-api/azure-pipelines.yml @@ -9,7 +9,7 @@ trigger: include: - src/BuildingBlocks/* - src/Services/Catalog/* - - deploy/k8s/helm/catalog-api/* + - deploy/k8s/helm/catalog-api/* jobs: - template: ../buildimages.yaml parameters: diff --git a/build/azure-devops/identity-api/azure-pipelines.yml b/build/azure-devops/identity-api/azure-pipelines.yml index 5405c3453..a3074e526 100644 --- a/build/azure-devops/identity-api/azure-pipelines.yml +++ b/build/azure-devops/identity-api/azure-pipelines.yml @@ -9,14 +9,14 @@ trigger: include: - src/BuildingBlocks/* - src/Services/Identity/* - - deploy/k8s/helm/identity-api/* + - deploy/k8s/helm/identity-api/* jobs: - template: ../buildimages.yaml parameters: services: identity.api registryEndpoint: $(registryEndpoint) helmfrom: $(Build.SourcesDirectory)/deploy/k8s/helm - helmto: $(Build.ArtifactStagingDirectory)/deploy/k8s/helm + helmto: $(Build.ArtifactStagingDirectory)/deploy/k8s/helm - template: ../multiarch.yaml parameters: image: identity.api diff --git a/build/azure-devops/infrastructure/azure-pipelines.yml b/build/azure-devops/infrastructure/azure-pipelines.yml index 4c19cecb2..444c84c1f 100644 --- a/build/azure-devops/infrastructure/azure-pipelines.yml +++ b/build/azure-devops/infrastructure/azure-pipelines.yml @@ -17,7 +17,7 @@ trigger: steps: - task: CopyFiles@2 inputs: - sourceFolder: $(Build.SourcesDirectory)/deploy/k8s/helm + sourceFolder: $(Build.SourcesDirectory)/deploy/k8s/helm targetFolder: $(Build.ArtifactStagingDirectory)/deploy/k8s/helm - task: PublishBuildArtifacts@1 inputs: diff --git a/build/azure-devops/location-api/azure-pipelines.yml b/build/azure-devops/location-api/azure-pipelines.yml index 9d1b3ed3a..33653811b 100644 --- a/build/azure-devops/location-api/azure-pipelines.yml +++ b/build/azure-devops/location-api/azure-pipelines.yml @@ -9,14 +9,14 @@ trigger: include: - src/BuildingBlocks/* - src/Services/Location/* - - deploy/k8s/helm/locations-api/* + - deploy/k8s/helm/locations-api/* jobs: - template: ../buildimages.yaml parameters: services: locations.api registryEndpoint: $(registryEndpoint) helmfrom: $(Build.SourcesDirectory)/deploy/k8s/helm - helmto: $(Build.ArtifactStagingDirectory)/deploy/k8s/helm + helmto: $(Build.ArtifactStagingDirectory)/deploy/k8s/helm - template: ../multiarch.yaml parameters: image: locations.api diff --git a/build/azure-devops/marketing-api/azure-pipelines.yml b/build/azure-devops/marketing-api/azure-pipelines.yml index 430fb3f3c..ed1fcae37 100644 --- a/build/azure-devops/marketing-api/azure-pipelines.yml +++ b/build/azure-devops/marketing-api/azure-pipelines.yml @@ -9,14 +9,14 @@ trigger: include: - src/BuildingBlocks/* - src/Services/Marketing/* - - deploy/k8s/helm/marketing-api/* + - deploy/k8s/helm/marketing-api/* jobs: - template: ../buildimages.yaml parameters: services: marketing.api registryEndpoint: $(registryEndpoint) helmfrom: $(Build.SourcesDirectory)/deploy/k8s/helm - helmto: $(Build.ArtifactStagingDirectory)/deploy/k8s/helm + helmto: $(Build.ArtifactStagingDirectory)/deploy/k8s/helm - template: ../multiarch.yaml parameters: image: marketing.api diff --git a/build/azure-devops/mobile-shopping-agg/azure-pipelines.yml b/build/azure-devops/mobile-shopping-agg/azure-pipelines.yml index 58efa9da4..a66c602c2 100644 --- a/build/azure-devops/mobile-shopping-agg/azure-pipelines.yml +++ b/build/azure-devops/mobile-shopping-agg/azure-pipelines.yml @@ -8,14 +8,14 @@ trigger: paths: include: - src/ApiGateways/Mobile.Bff.Shopping/aggregator/* - - deploy/k8s/helm/mobileshoppingagg/* + - deploy/k8s/helm/mobileshoppingagg/* jobs: - template: ../buildimages.yaml parameters: services: mobileshoppingagg registryEndpoint: $(registryEndpoint) helmfrom: $(Build.SourcesDirectory)/deploy/k8s/helm - helmto: $(Build.ArtifactStagingDirectory)/deploy/k8s/helm + helmto: $(Build.ArtifactStagingDirectory)/deploy/k8s/helm - template: ../multiarch.yaml parameters: image: mobileshoppingagg diff --git a/build/azure-devops/ordering-api/azure-pipelines.yml b/build/azure-devops/ordering-api/azure-pipelines.yml index 539f026b2..fe0712c1e 100644 --- a/build/azure-devops/ordering-api/azure-pipelines.yml +++ b/build/azure-devops/ordering-api/azure-pipelines.yml @@ -9,7 +9,7 @@ trigger: include: - src/BuildingBlocks/* - src/Services/Ordering/* - - deploy/k8s/helm/ordering-api/* + - deploy/k8s/helm/ordering-api/* - deploy/k8s/helm/ordering-backgroundtasks/* - deploy/k8s/helm/ordering-signalrhub/* jobs: @@ -18,7 +18,7 @@ jobs: services: ordering.api registryEndpoint: $(registryEndpoint) helmfrom: $(Build.SourcesDirectory)/deploy/k8s/helm - helmto: $(Build.ArtifactStagingDirectory)/deploy/k8s/helm + helmto: $(Build.ArtifactStagingDirectory)/deploy/k8s/helm - template: ../multiarch.yaml parameters: image: ordering.api diff --git a/build/azure-devops/payment-api/azure-pipelines.yml b/build/azure-devops/payment-api/azure-pipelines.yml index 24fe42b4d..6be46f3ee 100644 --- a/build/azure-devops/payment-api/azure-pipelines.yml +++ b/build/azure-devops/payment-api/azure-pipelines.yml @@ -9,14 +9,14 @@ trigger: include: - src/BuildingBlocks/* - src/Services/Payment/* - - deploy/k8s/helm/payment-api/* + - deploy/k8s/helm/payment-api/* jobs: - template: ../buildimages.yaml parameters: services: payment.api - registryEndpoint: $(registryEndpoint) + registryEndpoint: $(registryEndpoint) helmfrom: $(Build.SourcesDirectory)/deploy/k8s/helm - helmto: $(Build.ArtifactStagingDirectory)/deploy/k8s/helm + helmto: $(Build.ArtifactStagingDirectory)/deploy/k8s/helm - template: ../multiarch.yaml parameters: image: payment.api diff --git a/build/azure-devops/web-shopping-agg/azure-pipelines.yml b/build/azure-devops/web-shopping-agg/azure-pipelines.yml index 8c00702c7..e112390c0 100644 --- a/build/azure-devops/web-shopping-agg/azure-pipelines.yml +++ b/build/azure-devops/web-shopping-agg/azure-pipelines.yml @@ -8,14 +8,14 @@ trigger: paths: include: - src/ApiGateways/Web.Bff.Shopping/aggregator/* - - deploy/k8s/helm/webshoppingagg/* + - deploy/k8s/helm/webshoppingagg/* jobs: - template: ../buildimages.yaml parameters: services: webshoppingagg - registryEndpoint: $(registryEndpoint) + registryEndpoint: $(registryEndpoint) helmfrom: $(Build.SourcesDirectory)/deploy/k8s/helm - helmto: $(Build.ArtifactStagingDirectory)/deploy/k8s/helm + helmto: $(Build.ArtifactStagingDirectory)/deploy/k8s/helm - template: ../multiarch.yaml parameters: image: webshoppingagg diff --git a/build/azure-devops/webhooks-api/azure-pipelines.yml b/build/azure-devops/webhooks-api/azure-pipelines.yml index 258bbc999..8a8f7818f 100644 --- a/build/azure-devops/webhooks-api/azure-pipelines.yml +++ b/build/azure-devops/webhooks-api/azure-pipelines.yml @@ -14,9 +14,9 @@ jobs: - template: ../buildimages.yaml parameters: services: webhooks.api - registryEndpoint: $(registryEndpoint) + registryEndpoint: $(registryEndpoint) helmfrom: $(Build.SourcesDirectory)/deploy/k8s/helm - helmto: $(Build.ArtifactStagingDirectory)/deploy/k8s/helm + helmto: $(Build.ArtifactStagingDirectory)/deploy/k8s/helm - template: ../multiarch.yaml parameters: image: webhooks.api diff --git a/build/azure-devops/webhooks-client/azure-pipelines.yml b/build/azure-devops/webhooks-client/azure-pipelines.yml index c8d69055e..ace77d5a0 100644 --- a/build/azure-devops/webhooks-client/azure-pipelines.yml +++ b/build/azure-devops/webhooks-client/azure-pipelines.yml @@ -9,14 +9,14 @@ trigger: include: - src/BuildingBlocks/* - src/Web/WebhookClient/* - - deploy/k8s/helm/webhooks-web/* + - deploy/k8s/helm/webhooks-web/* jobs: - template: ../buildimages.yaml parameters: services: webhooks.client - registryEndpoint: $(registryEndpoint) + registryEndpoint: $(registryEndpoint) helmfrom: $(Build.SourcesDirectory)/deploy/k8s/helm - helmto: $(Build.ArtifactStagingDirectory)/deploy/k8s/helm + helmto: $(Build.ArtifactStagingDirectory)/deploy/k8s/helm - template: ../multiarch.yaml parameters: image: webhooks.client diff --git a/build/azure-devops/webmvc/azure-pipelines.yml b/build/azure-devops/webmvc/azure-pipelines.yml index 024e20eb3..8067daa7f 100644 --- a/build/azure-devops/webmvc/azure-pipelines.yml +++ b/build/azure-devops/webmvc/azure-pipelines.yml @@ -9,14 +9,14 @@ trigger: include: - src/BuildingBlocks/* - src/Web/WebMVC/* - - deploy/k8s/helm/webmvc/* + - deploy/k8s/helm/webmvc/* jobs: - template: ../buildimages.yaml parameters: services: webmvc - registryEndpoint: $(registryEndpoint) + registryEndpoint: $(registryEndpoint) helmfrom: $(Build.SourcesDirectory)/deploy/k8s/helm - helmto: $(Build.ArtifactStagingDirectory)/deploy/k8s/helm + helmto: $(Build.ArtifactStagingDirectory)/deploy/k8s/helm - template: ../multiarch.yaml parameters: image: webmvc diff --git a/build/azure-devops/webspa/azure-pipelines.yml b/build/azure-devops/webspa/azure-pipelines.yml index a19ba86c3..0b635e296 100644 --- a/build/azure-devops/webspa/azure-pipelines.yml +++ b/build/azure-devops/webspa/azure-pipelines.yml @@ -9,14 +9,14 @@ trigger: include: - src/BuildingBlocks/* - src/Web/WebSPA/* - - deploy/k8s/helm/webspa/* + - deploy/k8s/helm/webspa/* jobs: - template: ../buildimages.yaml parameters: services: webspa - registryEndpoint: $(registryEndpoint) + registryEndpoint: $(registryEndpoint) helmfrom: $(Build.SourcesDirectory)/deploy/k8s/helm - helmto: $(Build.ArtifactStagingDirectory)/deploy/k8s/helm + helmto: $(Build.ArtifactStagingDirectory)/deploy/k8s/helm - template: ../multiarch.yaml parameters: image: webspa diff --git a/build/azure-devops/webstatus/azure-pipelines.yml b/build/azure-devops/webstatus/azure-pipelines.yml index dc24131f7..b1871f4ae 100644 --- a/build/azure-devops/webstatus/azure-pipelines.yml +++ b/build/azure-devops/webstatus/azure-pipelines.yml @@ -9,14 +9,14 @@ trigger: include: - src/BuildingBlocks/* - src/Web/WebStatus/* - - deploy/k8s/helm/webstatus/* + - deploy/k8s/helm/webstatus/* jobs: - template: ../buildimages.yaml parameters: services: webstatus - registryEndpoint: $(registryEndpoint) + registryEndpoint: $(registryEndpoint) helmfrom: $(Build.SourcesDirectory)/deploy/k8s/helm - helmto: $(Build.ArtifactStagingDirectory)/deploy/k8s/helm + helmto: $(Build.ArtifactStagingDirectory)/deploy/k8s/helm - template: ../multiarch.yaml parameters: image: webstatus