From 60626cd84117b0d2ae1732794d81e26ce69d152c Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Tue, 21 Jan 2025 16:31:34 +0100 Subject: [PATCH] ci(azure-pipelines): move variables decl to main yaml --- .azure-pipelines/templates/build-image.yaml | 5 ----- azure-pipelines.yaml | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.azure-pipelines/templates/build-image.yaml b/.azure-pipelines/templates/build-image.yaml index 1c90a9165..179ca4450 100644 --- a/.azure-pipelines/templates/build-image.yaml +++ b/.azure-pipelines/templates/build-image.yaml @@ -11,11 +11,6 @@ parameters: baseImageTag: baseImageTag extraBuildOptions: '\' -variables: - imageUpstream: devfra.azurecr.io/de.fraport.fradrive.build - onMasterBranch: $[eq(variables['Build.SourceBranch'], 'refs/heads/master')] - onUpdateBranch: $[startsWith(variables['Build.SourceBranch'], 'refs/heads/update')] - jobs: - job: ImageBuild_${{parameters.service.name}} displayName: Build ${{parameters.service.name}} image diff --git a/azure-pipelines.yaml b/azure-pipelines.yaml index 90c465b4d..9e46559cd 100644 --- a/azure-pipelines.yaml +++ b/azure-pipelines.yaml @@ -12,6 +12,11 @@ parameters: extraBuildOptions: | --build-arg NPM_CUSTOM_REGISTRY=https://pkgs.dev.azure.com/fraport/_packaging/packages/npm/registry/ \ +variables: + imageUpstream: devfra.azurecr.io/de.fraport.fradrive.build + onMasterBranch: $[eq(variables['Build.SourceBranch'], 'refs/heads/master')] + onUpdateBranch: $[startsWith(variables['Build.SourceBranch'], 'refs/heads/update')] + pool: 'Prod Private Agent Pool' jobs: