From c7b4fe4298d7ab868b560520aee80da61c34ef92 Mon Sep 17 00:00:00 2001 From: eiximenis Date: Wed, 20 Mar 2019 09:48:37 +0100 Subject: [PATCH] updated builds to use git branch name --- build/azure-devops/apigws/azure-pipelines.yml | 5 ++--- build/azure-devops/basket-api/azure-pipelines.yml | 4 ++-- build/azure-devops/catalog-api/azure-pipelines.yml | 4 ++-- build/azure-devops/identity-api/azure-pipelines.yml | 4 ++-- build/azure-devops/location-api/azure-pipelines.yml | 4 ++-- build/azure-devops/marketing-api/azure-pipelines.yml | 4 ++-- build/azure-devops/mobile-shopping-agg/azure-pipelines.yml | 4 ++-- build/azure-devops/ordering-api/azure-pipelines.yml | 4 ++-- build/azure-devops/payment-api/azure-pipelines.yml | 4 ++-- build/azure-devops/web-shopping-agg/azure-pipelines.yml | 4 ++-- build/azure-devops/webhooks-api/azure-pipelines.yml | 4 ++-- build/azure-devops/webhooks-client/azure-pipelines.yml | 4 ++-- build/azure-devops/webmvc/azure-pipelines.yml | 4 ++-- build/azure-devops/webspa/azure-pipelines.yml | 4 ++-- build/azure-devops/webstatus/azure-pipelines.yml | 4 ++-- 15 files changed, 30 insertions(+), 31 deletions(-) diff --git a/build/azure-devops/apigws/azure-pipelines.yml b/build/azure-devops/apigws/azure-pipelines.yml index a9432c672..2487e7bce 100644 --- a/build/azure-devops/apigws/azure-pipelines.yml +++ b/build/azure-devops/apigws/azure-pipelines.yml @@ -13,7 +13,7 @@ steps: qualifyImageNames: true projectName: "" dockerComposeFileArgs: | - TAG=dev + TAG=$(Build.SourceBranchName) - task: DockerCompose@0 displayName: Compose push apigws inputs: @@ -23,9 +23,8 @@ steps: dockerComposeFile: docker-compose.yml qualifyImageNames: true projectName: "" - additionalImageTags: dockerComposeFileArgs: | - TAG=dev + TAG=$(Build.SourceBranchName) - task: CopyFiles@2 inputs: sourceFolder: $(Build.SourcesDirectory)/k8s/helm diff --git a/build/azure-devops/basket-api/azure-pipelines.yml b/build/azure-devops/basket-api/azure-pipelines.yml index ce0a7b670..5655c1a12 100644 --- a/build/azure-devops/basket-api/azure-pipelines.yml +++ b/build/azure-devops/basket-api/azure-pipelines.yml @@ -13,7 +13,7 @@ steps: qualifyImageNames: true projectName: "" dockerComposeFileArgs: | - TAG=dev + TAG=$(Build.SourceBranchName) - task: DockerCompose@0 displayName: Compose push basket inputs: @@ -24,7 +24,7 @@ steps: qualifyImageNames: true projectName: "" dockerComposeFileArgs: | - TAG=dev + TAG=$(Build.SourceBranchName) - task: CopyFiles@2 inputs: sourceFolder: $(Build.SourcesDirectory)/k8s/helm diff --git a/build/azure-devops/catalog-api/azure-pipelines.yml b/build/azure-devops/catalog-api/azure-pipelines.yml index 90a0d2136..f1881f096 100644 --- a/build/azure-devops/catalog-api/azure-pipelines.yml +++ b/build/azure-devops/catalog-api/azure-pipelines.yml @@ -13,7 +13,7 @@ steps: qualifyImageNames: true projectName: "" dockerComposeFileArgs: | - TAG=dev + TAG=$(Build.SourceBranchName) - task: DockerCompose@0 displayName: Compose push catalog inputs: @@ -24,7 +24,7 @@ steps: qualifyImageNames: true projectName: "" dockerComposeFileArgs: | - TAG=dev + TAG=$(Build.SourceBranchName) - task: CopyFiles@2 inputs: sourceFolder: $(Build.SourcesDirectory)/k8s/helm diff --git a/build/azure-devops/identity-api/azure-pipelines.yml b/build/azure-devops/identity-api/azure-pipelines.yml index 2002ed576..7fc628e1a 100644 --- a/build/azure-devops/identity-api/azure-pipelines.yml +++ b/build/azure-devops/identity-api/azure-pipelines.yml @@ -13,7 +13,7 @@ steps: qualifyImageNames: true projectName: "" dockerComposeFileArgs: | - TAG=dev + TAG=$(Build.SourceBranchName) - task: DockerCompose@0 displayName: Compose push identity inputs: @@ -24,7 +24,7 @@ steps: qualifyImageNames: true projectName: "" dockerComposeFileArgs: | - TAG=dev + TAG=$(Build.SourceBranchName) - task: CopyFiles@2 inputs: sourceFolder: $(Build.SourcesDirectory)/k8s/helm diff --git a/build/azure-devops/location-api/azure-pipelines.yml b/build/azure-devops/location-api/azure-pipelines.yml index 97c1c4ca7..b0868c17c 100644 --- a/build/azure-devops/location-api/azure-pipelines.yml +++ b/build/azure-devops/location-api/azure-pipelines.yml @@ -13,7 +13,7 @@ steps: qualifyImageNames: true projectName: "" dockerComposeFileArgs: | - TAG=dev + TAG=$(Build.SourceBranchName) - task: DockerCompose@0 displayName: Compose push locations inputs: @@ -24,7 +24,7 @@ steps: qualifyImageNames: true projectName: "" dockerComposeFileArgs: | - TAG=dev + TAG=$(Build.SourceBranchName) - task: CopyFiles@2 inputs: sourceFolder: $(Build.SourcesDirectory)/k8s/helm diff --git a/build/azure-devops/marketing-api/azure-pipelines.yml b/build/azure-devops/marketing-api/azure-pipelines.yml index bb56e315d..d979f51cb 100644 --- a/build/azure-devops/marketing-api/azure-pipelines.yml +++ b/build/azure-devops/marketing-api/azure-pipelines.yml @@ -13,7 +13,7 @@ steps: qualifyImageNames: true projectName: "" dockerComposeFileArgs: | - TAG=dev + TAG=$(Build.SourceBranchName) - task: DockerCompose@0 displayName: Compose push marketing inputs: @@ -24,7 +24,7 @@ steps: qualifyImageNames: true projectName: "" dockerComposeFileArgs: | - TAG=dev + TAG=$(Build.SourceBranchName) - task: CopyFiles@2 inputs: sourceFolder: $(Build.SourcesDirectory)/k8s/helm diff --git a/build/azure-devops/mobile-shopping-agg/azure-pipelines.yml b/build/azure-devops/mobile-shopping-agg/azure-pipelines.yml index b79a30055..635a7e13c 100644 --- a/build/azure-devops/mobile-shopping-agg/azure-pipelines.yml +++ b/build/azure-devops/mobile-shopping-agg/azure-pipelines.yml @@ -13,7 +13,7 @@ steps: qualifyImageNames: true projectName: "" dockerComposeFileArgs: | - TAG=dev + TAG=$(Build.SourceBranchName) - task: DockerCompose@0 displayName: Compose push mobileshoppingagg inputs: @@ -24,7 +24,7 @@ steps: qualifyImageNames: true projectName: "" dockerComposeFileArgs: | - TAG=dev + TAG=$(Build.SourceBranchName) - task: CopyFiles@2 inputs: sourceFolder: $(Build.SourcesDirectory)/k8s/helm diff --git a/build/azure-devops/ordering-api/azure-pipelines.yml b/build/azure-devops/ordering-api/azure-pipelines.yml index 5aebfec75..48b1995c6 100644 --- a/build/azure-devops/ordering-api/azure-pipelines.yml +++ b/build/azure-devops/ordering-api/azure-pipelines.yml @@ -13,7 +13,7 @@ steps: qualifyImageNames: true projectName: "" dockerComposeFileArgs: | - TAG=dev + TAG=$(Build.SourceBranchName) - task: DockerCompose@0 displayName: Compose push ordering inputs: @@ -24,7 +24,7 @@ steps: qualifyImageNames: true projectName: "" dockerComposeFileArgs: | - TAG=dev + TAG=$(Build.SourceBranchName) - task: CopyFiles@2 inputs: sourceFolder: $(Build.SourcesDirectory)/k8s/helm diff --git a/build/azure-devops/payment-api/azure-pipelines.yml b/build/azure-devops/payment-api/azure-pipelines.yml index b5c53fafa..b33187ee2 100644 --- a/build/azure-devops/payment-api/azure-pipelines.yml +++ b/build/azure-devops/payment-api/azure-pipelines.yml @@ -13,7 +13,7 @@ steps: qualifyImageNames: true projectName: "" dockerComposeFileArgs: | - TAG=dev + TAG=$(Build.SourceBranchName) - task: DockerCompose@0 displayName: Compose push payment inputs: @@ -24,7 +24,7 @@ steps: qualifyImageNames: true projectName: "" dockerComposeFileArgs: | - TAG=dev + TAG=$(Build.SourceBranchName) - task: CopyFiles@2 inputs: sourceFolder: $(Build.SourcesDirectory)/k8s/helm diff --git a/build/azure-devops/web-shopping-agg/azure-pipelines.yml b/build/azure-devops/web-shopping-agg/azure-pipelines.yml index 8f2bb1143..7ff3f56a5 100644 --- a/build/azure-devops/web-shopping-agg/azure-pipelines.yml +++ b/build/azure-devops/web-shopping-agg/azure-pipelines.yml @@ -13,7 +13,7 @@ steps: qualifyImageNames: true projectName: "" dockerComposeFileArgs: | - TAG=dev + TAG=$(Build.SourceBranchName) - task: DockerCompose@0 displayName: Compose push webshoppingagg inputs: @@ -24,7 +24,7 @@ steps: qualifyImageNames: true projectName: "" dockerComposeFileArgs: | - TAG=dev + TAG=$(Build.SourceBranchName) - task: CopyFiles@2 inputs: sourceFolder: $(Build.SourcesDirectory)/k8s/helm diff --git a/build/azure-devops/webhooks-api/azure-pipelines.yml b/build/azure-devops/webhooks-api/azure-pipelines.yml index 58fbf0c7a..90429da3d 100644 --- a/build/azure-devops/webhooks-api/azure-pipelines.yml +++ b/build/azure-devops/webhooks-api/azure-pipelines.yml @@ -13,7 +13,7 @@ steps: qualifyImageNames: true projectName: "" dockerComposeFileArgs: | - TAG=dev + TAG=$(Build.SourceBranchName) - task: DockerCompose@0 displayName: Compose push webhooks inputs: @@ -24,7 +24,7 @@ steps: qualifyImageNames: true projectName: "" dockerComposeFileArgs: | - TAG=dev + TAG=$(Build.SourceBranchName) - task: CopyFiles@2 inputs: sourceFolder: $(Build.SourcesDirectory)/k8s/helm diff --git a/build/azure-devops/webhooks-client/azure-pipelines.yml b/build/azure-devops/webhooks-client/azure-pipelines.yml index 8d429559f..607fcd8cf 100644 --- a/build/azure-devops/webhooks-client/azure-pipelines.yml +++ b/build/azure-devops/webhooks-client/azure-pipelines.yml @@ -13,7 +13,7 @@ steps: qualifyImageNames: true projectName: "" dockerComposeFileArgs: | - TAG=dev + TAG=$(Build.SourceBranchName) - task: DockerCompose@0 displayName: Compose push webhooks.client inputs: @@ -24,7 +24,7 @@ steps: qualifyImageNames: true projectName: "" dockerComposeFileArgs: | - TAG=dev + TAG=$(Build.SourceBranchName) - task: CopyFiles@2 inputs: sourceFolder: $(Build.SourcesDirectory)/k8s/helm diff --git a/build/azure-devops/webmvc/azure-pipelines.yml b/build/azure-devops/webmvc/azure-pipelines.yml index 63cd13030..76762fcc5 100644 --- a/build/azure-devops/webmvc/azure-pipelines.yml +++ b/build/azure-devops/webmvc/azure-pipelines.yml @@ -13,7 +13,7 @@ steps: qualifyImageNames: true projectName: "" dockerComposeFileArgs: | - TAG=dev + TAG=$(Build.SourceBranchName) - task: DockerCompose@0 displayName: Compose push webmvc inputs: @@ -24,7 +24,7 @@ steps: qualifyImageNames: true projectName: "" dockerComposeFileArgs: | - TAG=dev + TAG=$(Build.SourceBranchName) - task: CopyFiles@2 inputs: sourceFolder: $(Build.SourcesDirectory)/k8s/helm diff --git a/build/azure-devops/webspa/azure-pipelines.yml b/build/azure-devops/webspa/azure-pipelines.yml index b9074da21..2e00d422a 100644 --- a/build/azure-devops/webspa/azure-pipelines.yml +++ b/build/azure-devops/webspa/azure-pipelines.yml @@ -13,7 +13,7 @@ steps: qualifyImageNames: true projectName: "" dockerComposeFileArgs: | - TAG=dev + TAG=$(Build.SourceBranchName) - task: DockerCompose@0 displayName: Compose push webspa inputs: @@ -24,7 +24,7 @@ steps: qualifyImageNames: true projectName: "" dockerComposeFileArgs: | - TAG=dev + TAG=$(Build.SourceBranchName) - task: CopyFiles@2 inputs: sourceFolder: $(Build.SourcesDirectory)/k8s/helm diff --git a/build/azure-devops/webstatus/azure-pipelines.yml b/build/azure-devops/webstatus/azure-pipelines.yml index 3daadf3a6..4dd4b425e 100644 --- a/build/azure-devops/webstatus/azure-pipelines.yml +++ b/build/azure-devops/webstatus/azure-pipelines.yml @@ -13,7 +13,7 @@ steps: qualifyImageNames: true projectName: "" dockerComposeFileArgs: | - TAG=dev + TAG=$(Build.SourceBranchName) - task: DockerCompose@0 displayName: Compose push webstatus inputs: @@ -24,7 +24,7 @@ steps: qualifyImageNames: true projectName: "" dockerComposeFileArgs: | - TAG=dev + TAG=$(Build.SourceBranchName) - task: CopyFiles@2 inputs: sourceFolder: $(Build.SourcesDirectory)/k8s/helm