Skip to content

Commit

Permalink
Use variables
Browse files Browse the repository at this point in the history
  • Loading branch information
bebound committed Oct 18, 2022
1 parent cd91cde commit 80eedec
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 11 deletions.
3 changes: 2 additions & 1 deletion .azure-pipelines/templates/variables.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
variables:
ubuntu_pool: 'pool-ubuntu-2004'
windows_pool: 'pool-windows-2019'
windows_pool: 'pool-windows-2019'
ubuntu_arm64_pool: 'ubuntu-arm64-2004-pool'
15 changes: 5 additions & 10 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -838,8 +838,7 @@ jobs:
displayName: Build Rpm Package Mariner ARM64
condition: and(succeeded(), in(variables['Build.Reason'], 'IndividualCI', 'BatchedCI', 'Manual', 'Schedule'))
pool:
name: 'ubuntu-arm64-2004-pool'
vmImage: 'ubuntu-20.04'
name: ${{ variables.ubuntu_arm64_pool }}
variables:
# Disable Component Detection on ARM64
skipComponentGovernanceDetection: true
Expand Down Expand Up @@ -882,8 +881,7 @@ jobs:
# Do not run this job for Pull Requests due to the slowness
condition: and(succeeded(), in(variables['Build.Reason'], 'IndividualCI', 'BatchedCI', 'Manual', 'Schedule'))
pool:
name: 'ubuntu-arm64-2004-pool'
vmImage: 'ubuntu-20.04'
name: ${{ variables.ubuntu_arm64_pool }}
variables:
skipComponentGovernanceDetection: true
strategy:
Expand Down Expand Up @@ -942,8 +940,7 @@ jobs:
- ExtractMetadata
condition: and(succeeded(), in(variables['Build.Reason'], 'IndividualCI', 'BatchedCI', 'Manual', 'Schedule'))
pool:
name: 'ubuntu-arm64-2004-pool'
vmImage: 'ubuntu-20.04'
name: ${{ variables.ubuntu_arm64_pool }}
variables:
skipComponentGovernanceDetection: true
strategy:
Expand Down Expand Up @@ -1014,8 +1011,7 @@ jobs:
displayName: Build Deb Packages ARM64
condition: and(succeeded(), in(variables['Build.Reason'], 'IndividualCI', 'BatchedCI', 'Manual', 'Schedule'))
pool:
name: 'ubuntu-arm64-2004-pool'
vmImage: 'ubuntu-20.04'
name: ${{ variables.ubuntu_arm64_pool }}
variables:
skipComponentGovernanceDetection: true
strategy:
Expand Down Expand Up @@ -1095,8 +1091,7 @@ jobs:
deb_system: debian
distro: bullseye
pool:
name: 'ubuntu-arm64-2004-pool'
vmImage: 'ubuntu-20.04'
name: ${{ variables.ubuntu_arm64_pool }}
variables:
skipComponentGovernanceDetection: true
steps:
Expand Down

0 comments on commit 80eedec

Please sign in to comment.