Skip to content

Commit 48aed84

Browse files
[FLINK-38487][build] bump vmImage version to ubuntu-24.04 (#27095)
1 parent 47478ed commit 48aed84

File tree

5 files changed

+26
-15
lines changed

5 files changed

+26
-15
lines changed

azure-pipelines.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,16 +73,16 @@ stages:
7373
parameters: # see template file for a definition of the parameters.
7474
stage_name: ci_build
7575
test_pool_definition:
76-
vmImage: 'ubuntu-22.04'
76+
vmImage: 'ubuntu-24.04'
7777
e2e_pool_definition:
78-
vmImage: 'ubuntu-22.04'
78+
vmImage: 'ubuntu-24.04'
7979
environment: PROFILE="-Dflink.hadoop.version=2.10.2 -Djdk17 -Pjava17-target"
8080
run_end_to_end: false
8181
container: flink-build-container
8282
jdk: 17
8383
- job: docs_404_check # run on a MSFT provided machine
8484
pool:
85-
vmImage: 'ubuntu-22.04'
85+
vmImage: 'ubuntu-24.04'
8686
steps:
8787
- task: GoTool@0
8888
inputs:

tools/azure-pipelines/build-apache-repo.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -68,14 +68,14 @@ stages:
6868
test_pool_definition:
6969
name: Default
7070
e2e_pool_definition:
71-
vmImage: 'ubuntu-22.04'
71+
vmImage: 'ubuntu-24.04'
7272
environment: PROFILE="-Dflink.hadoop.version=2.10.2 -Djdk17 -Pjava17-target"
7373
run_end_to_end: false
7474
container: flink-build-container
7575
jdk: 17
7676
- job: docs_404_check # run on a MSFT provided machine
7777
pool:
78-
vmImage: 'ubuntu-22.04'
78+
vmImage: 'ubuntu-24.04'
7979
steps:
8080
# Skip docs check if this is a pull request that doesn't contain a documentation change
8181
- task: GoTool@0
@@ -112,9 +112,9 @@ stages:
112112
parameters:
113113
stage_name: cron_azure
114114
test_pool_definition:
115-
vmImage: 'ubuntu-22.04'
115+
vmImage: 'ubuntu-24.04'
116116
e2e_pool_definition:
117-
vmImage: 'ubuntu-22.04'
117+
vmImage: 'ubuntu-24.04'
118118
environment: PROFILE="-Dflink.hadoop.version=2.10.2 -Djdk17 -Pjava17-target"
119119
run_end_to_end: true
120120
container: flink-build-container
@@ -125,7 +125,7 @@ stages:
125125
test_pool_definition:
126126
name: Default
127127
e2e_pool_definition:
128-
vmImage: 'ubuntu-22.04'
128+
vmImage: 'ubuntu-24.04'
129129
environment: PROFILE="-Dflink.hadoop.version=3.2.3 -Phadoop3-tests,hive3 -Djdk17 -Pjava17-target"
130130
run_end_to_end: true
131131
container: flink-build-container
@@ -136,7 +136,7 @@ stages:
136136
test_pool_definition:
137137
name: Default
138138
e2e_pool_definition:
139-
vmImage: 'ubuntu-22.04'
139+
vmImage: 'ubuntu-24.04'
140140
environment: PROFILE="-Dflink.hadoop.version=2.10.2 -Djdk11 -Pjava11-target"
141141
run_end_to_end: true
142142
container: flink-build-container
@@ -147,7 +147,7 @@ stages:
147147
test_pool_definition:
148148
name: Default
149149
e2e_pool_definition:
150-
vmImage: 'ubuntu-22.04'
150+
vmImage: 'ubuntu-24.04'
151151
environment: PROFILE="-Dflink.hadoop.version=2.10.2 -Djdk21 -Pjava21-target"
152152
run_end_to_end: true
153153
container: flink-build-container
@@ -158,14 +158,14 @@ stages:
158158
test_pool_definition:
159159
name: Default
160160
e2e_pool_definition:
161-
vmImage: 'ubuntu-22.04'
161+
vmImage: 'ubuntu-24.04'
162162
environment: PROFILE="-Dflink.hadoop.version=2.10.2 -Penable-adaptive-scheduler -Djdk17 -Pjava17-target"
163163
run_end_to_end: true
164164
container: flink-build-container
165165
jdk: 17
166166
- job: docs_404_check # run on a MSFT provided machine
167167
pool:
168-
vmImage: 'ubuntu-22.04'
168+
vmImage: 'ubuntu-24.04'
169169
steps:
170170
- task: GoTool@0
171171
inputs:

tools/azure-pipelines/build-nightly-dist.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ parameters:
1919
jobs:
2020
- job: ${{parameters.stage_name}}_binary
2121
pool:
22-
vmImage: 'ubuntu-22.04'
22+
vmImage: 'ubuntu-24.04'
2323
container: flink-build-container
2424
workspace:
2525
clean: all
@@ -69,7 +69,7 @@ jobs:
6969
# artifact: nightly-release
7070
- job: ${{parameters.stage_name}}_maven
7171
pool:
72-
vmImage: 'ubuntu-22.04'
72+
vmImage: 'ubuntu-24.04'
7373
container: flink-build-container
7474
timeoutInMinutes: 240
7575
workspace:

tools/azure-pipelines/build-python-wheels.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
jobs:
1717
- job: build_wheels_on_Linux
1818
pool:
19-
vmImage: 'ubuntu-22.04'
19+
vmImage: 'ubuntu-24.04'
2020
steps:
2121
- task: UsePythonVersion@0
2222
inputs:

tools/azure-pipelines/e2e-template.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,17 @@ jobs:
5151
- task: UsePythonVersion@0
5252
inputs:
5353
versionSpec: '3.12'
54+
# Install upstream kubectl so we don't use the agent's FIPS-patched build.
55+
- bash: |
56+
set -euo pipefail
57+
echo ">>> Installing upstream kubectl"
58+
curl -sSL -o kubectl "https://dl.k8s.io/release/$(curl -sSL https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl"
59+
sudo install -m 0755 kubectl /usr/local/bin/kubectl
60+
echo ">>> kubectl on PATH:"
61+
which kubectl
62+
kubectl version --client=true -o=yaml
63+
displayName: "Use upstream kubectl (avoid host FIPS build)"
64+
condition: not(eq(variables['SKIP'], '1'))
5465
# the cache task does not create directories on a cache miss, and can later fail when trying to tar the directory if the test haven't created it
5566
# this may for example happen if a given directory is only used by a subset of tests, which are run in a different 'group'
5667
- bash: |

0 commit comments

Comments
 (0)