Skip to content

Commit 0ee065f

Browse files
Copilotscbedd
andauthored
Update Ubuntu references from 22.04/20.04 to 24.04 across CI/CD configuration files (#41548)
* Update Ubuntu references from 22.04/20.04 to 24.04 across configuration files * Fix update-binfmts command not found on Ubuntu 24.04 by installing binfmt-support package * update labelling for storage builds Co-authored-by: copilot-swe-agent[bot] <[email protected]> Co-authored-by: scbedd <[email protected]> Co-authored-by: Scott Beddall <[email protected]>
1 parent e76c1f6 commit 0ee065f

File tree

9 files changed

+22
-22
lines changed

9 files changed

+22
-22
lines changed

eng/pipelines/templates/stages/platform-matrix.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
},
77
"matrix": {
88
"Agent": {
9-
"ubuntu-20.04": { "OSVmImage": "env:LINUXVMIMAGE", "Pool": "env:LINUXPOOL" },
9+
"ubuntu-24.04": { "OSVmImage": "env:LINUXVMIMAGE", "Pool": "env:LINUXPOOL" },
1010
"windows-2022": { "OSVmImage": "env:WINDOWSVMIMAGE", "Pool": "env:WINDOWSPOOL" }
1111
},
1212
"PythonVersion": [ "3.10", "3.12" ],
@@ -27,7 +27,7 @@
2727
},
2828
{
2929
"PyPyConfig": {
30-
"ubuntu2004_pypy39": {
30+
"ubuntu2404_pypy39": {
3131
"OSVmImage": "env:LINUXVMIMAGE",
3232
"Pool": "env:LINUXPOOL",
3333
"PythonVersion": "pypy3.9",
@@ -38,7 +38,7 @@
3838
},
3939
{
4040
"CoverageConfig": {
41-
"ubuntu2004_39_coverage": {
41+
"ubuntu2404_39_coverage": {
4242
"OSVmImage": "env:LINUXVMIMAGE",
4343
"Pool": "env:LINUXPOOL",
4444
"PythonVersion": "3.9",
@@ -49,7 +49,7 @@
4949
},
5050
{
5151
"Config": {
52-
"Ubuntu2004_313": {
52+
"Ubuntu2404_313": {
5353
"OSVmImage": "env:LINUXVMIMAGE",
5454
"Pool": "env:LINUXPOOL",
5555
"PythonVersion": "3.13",

eng/pipelines/templates/steps/build-package-artifacts.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ steps:
105105
106106
- script: |
107107
sudo apt-get update
108-
sudo apt-get install -y qemu-user-static
108+
sudo apt-get install -y qemu-user-static binfmt-support
109109
sudo update-binfmts --enable qemu-aarch64
110110
displayName: 'Install QEMU Dependencies'
111111
condition: and(succeeded(), eq(variables['Agent.OS'], 'Linux'))

eng/pipelines/templates/variables/image.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ variables:
99
value: Azure Pipelines
1010

1111
- name: LINUXVMIMAGE
12-
value: ubuntu-22.04
12+
value: ubuntu-24.04
1313
- name: LINUXNEXTVMIMAGE
14-
value: ubuntu-22.04
14+
value: ubuntu-24.04
1515
- name: WINDOWSVMIMAGE
1616
value: windows-2022
1717
- name: MACVMIMAGE

sdk/ai/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ extends:
3232
TestProxy: true
3333
BuildDocs: true
3434
TestTimeoutInMinutes: 60
35-
# The job "Test ubuntu2004_pypy39" in the "python - ai" pipeline hangs and eventually times out.
35+
# The job "Test ubuntu2404_pypy39" in the "python - ai" pipeline hangs and eventually times out.
3636
# Disable it until the issue is understood.
3737
MatrixFilters:
3838
- PythonVersion=^(?!pypy3).*

sdk/cosmos/live-platform-matrix.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77
"include": [
88
{
99
"SplitTestConfig": {
10-
"Ubuntu2004_39_split": {
10+
"Ubuntu2404_39_split": {
1111
"OSVmImage": "env:LINUXVMIMAGE",
1212
"Pool": "env:LINUXPOOL",
1313
"PythonVersion": "3.9",
1414
"CoverageArg": "--disablecov",
1515
"TestSamples": "false",
1616
"TestMarkArgument": "cosmosSplit"
1717
},
18-
"Ubuntu2004_313_split": {
18+
"Ubuntu2404_313_split": {
1919
"OSVmImage": "env:LINUXVMIMAGE",
2020
"Pool": "env:LINUXPOOL",
2121
"PythonVersion": "3.13",
@@ -27,7 +27,7 @@
2727
},
2828
{
2929
"CircuitBreakerMultiWriteTestConfig": {
30-
"Ubuntu2004_313_circuit_breaker": {
30+
"Ubuntu2404_313_circuit_breaker": {
3131
"OSVmImage": "env:LINUXVMIMAGE",
3232
"Pool": "env:LINUXPOOL",
3333
"PythonVersion": "3.13",
@@ -44,7 +44,7 @@
4444
},
4545
{
4646
"CircuitBreakerMultiRegionTestConfig": {
47-
"Ubuntu2004_39_circuit_breaker": {
47+
"Ubuntu2404_39_circuit_breaker": {
4848
"OSVmImage": "env:LINUXVMIMAGE",
4949
"Pool": "env:LINUXPOOL",
5050
"PythonVersion": "3.9",
@@ -73,7 +73,7 @@
7373
},
7474
{
7575
"PyPyConfig": {
76-
"ubuntu2004_pypy39_query": {
76+
"ubuntu2404_pypy39_query": {
7777
"OSVmImage": "env:LINUXVMIMAGE",
7878
"Pool": "env:LINUXPOOL",
7979
"PythonVersion": "pypy3.9",
@@ -85,7 +85,7 @@
8585
},
8686
{
8787
"CoverageConfig": {
88-
"ubuntu2004_39_coverage_query": {
88+
"ubuntu2404_39_coverage_query": {
8989
"OSVmImage": "env:LINUXVMIMAGE",
9090
"Pool": "env:LINUXPOOL",
9191
"PythonVersion": "3.9",

sdk/evaluation/platform-matrix.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"matrix": {
88
"Agent": {
99
"macos-latest": { "OSVmImage": "env:MACVMIMAGE", "Pool": "env:MACPOOL" },
10-
"ubuntu-20.04": { "OSVmImage": "env:LINUXVMIMAGE", "Pool": "env:LINUXPOOL" }
10+
"ubuntu-24.04": { "OSVmImage": "env:LINUXVMIMAGE", "Pool": "env:LINUXPOOL" }
1111
},
1212
"PythonVersion": [ "3.9", "3.11", "3.10" ],
1313
"CoverageArg": "--disablecov",
@@ -16,7 +16,7 @@
1616
"include": [
1717
{
1818
"CoverageConfig": {
19-
"ubuntu2004_39_coverage": {
19+
"ubuntu2404_39_coverage": {
2020
"OSVmImage": "env:LINUXVMIMAGE",
2121
"Pool": "env:LINUXPOOL",
2222
"PythonVersion": "3.9",
@@ -27,7 +27,7 @@
2727
},
2828
{
2929
"Config": {
30-
"Ubuntu2004_312": {
30+
"Ubuntu2404_312": {
3131
"OSVmImage": "env:LINUXVMIMAGE",
3232
"Pool": "env:LINUXPOOL",
3333
"PythonVersion": "3.12",
@@ -38,7 +38,7 @@
3838
},
3939
{
4040
"Config": {
41-
"pyrit_Ubuntu2004_310": {
41+
"pyrit_Ubuntu2404_310": {
4242
"OSVmImage": "env:LINUXVMIMAGE",
4343
"Pool": "env:LINUXPOOL",
4444
"PythonVersion": "3.10",

sdk/identity/platform-matrix.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"include": [
99
{
1010
"Config": {
11-
"ubuntu_20.04_3.9_msal": {
11+
"ubuntu_24.04_3.9_msal": {
1212
"OSVmImage": "env:LINUXVMIMAGE",
1313
"Pool": "env:LINUXPOOL",
1414
"PythonVersion": "3.9",

sdk/keyvault/azure-keyvault-keys/platform-matrix.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"include": [
33
{
44
"Agent": {
5-
"ubuntu-20.04_ManagedHSM": {
5+
"ubuntu-24.04_ManagedHSM": {
66
"OSVmImage": "env:LINUXVMIMAGE",
77
"Pool": "env:LINUXPOOL",
88
"ArmTemplateParameters": "@{ enableHsm = $true }"

sdk/storage/platform-matrix-all-versions.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
},
77
"matrix": {
88
"Agent": {
9-
"Ubuntu-20.04": { "OSVmImage": "env:LINUXVMIMAGE", "Pool": "env:LINUXPOOL" },
9+
"Ubuntu-24.04": { "OSVmImage": "env:LINUXVMIMAGE", "Pool": "env:LINUXPOOL" },
1010
"windows-2022": { "OSVmImage": "env:WINDOWSVMIMAGE", "Pool": "env:WINDOWSPOOL" }
1111
},
1212
"PythonVersion": [ "3.9", "3.10"],
@@ -36,7 +36,7 @@
3636
},
3737
{
3838
"CoverageConfig": {
39-
"ubuntu2004_pypy39": {
39+
"ubuntu2404_pypy39": {
4040
"OSVmImage": "env:LINUXVMIMAGE",
4141
"Pool": "env:LINUXPOOL",
4242
"PythonVersion": "pypy3.9",

0 commit comments

Comments
 (0)