Skip to content

Commit ed364eb

Browse files
authored
Merge pull request #5644 from inikep/PS-9872-8.0-GCA
PS-9872 [8.0]: Switch Cirrus CI images to Ubuntu 24.04 Noble
2 parents 6561edf + de05eb9 commit ed364eb

File tree

1 file changed

+64
-52
lines changed

1 file changed

+64
-52
lines changed

.cirrus.yml

Lines changed: 64 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -125,138 +125,150 @@ script_template: &SCRIPT_TEMPLATE
125125
path: ${RESULTS_FILE}.html
126126

127127

128+
# DISABLED: (x86_64) Ubuntu 24.04 Noble for percona/percona-server
128129
task:
129130
<< : *FILTER_TEMPLATE
130131
# run only on "percona/percona-server" but not on "8.0" as we have nightly cron builds for "8.0" branch
131-
only_if: "$CIRRUS_CRON != '' || $CIRRUS_REPO_FULL_NAME == 'percona/percona-server' && $CIRRUS_BRANCH != '8.0' && !changesIncludeOnly('doc/*', 'build-ps/*', 'man/*', 'mysql-test/*', 'packaging/*', 'policy/*', 'scripts/*', 'support-files/*')"
132+
# only_if: "$CIRRUS_CRON != '' || $CIRRUS_REPO_FULL_NAME == 'percona/percona-server' && $CIRRUS_BRANCH != '8.0' && !changesIncludeOnly('doc/*', 'build-ps/*', 'man/*', 'mysql-test/*', 'packaging/*', 'policy/*', 'scripts/*', 'support-files/*')"
133+
only_if: false # DISABLED
132134
aws_credentials: ENCRYPTED[!f57794979d3ed96943cd39073b66a4fffbdc3ee6366b265e68c5aae890961d171bddca50bf169cc07db56c8c68172b84!]
133135
ec2_instance:
134-
# aws ec2 describe-images --filters "Name=name,Values=ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-arm64-server-202307*"
135-
image: ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-arm64-server-20230728
136-
# image: ami-0e2b332e63c56bcb5 # Ubuntu Server 22.04 LTS ARM 64-bit
137-
type: c6gd.4xlarge # 16 vCPUs, 32 GB, 950 GB SSD, 0.6144 USD/H
136+
# aws ec2 describe-images --filters "Name=name,Values=ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-2024061*"
137+
image: ami-0d3d400c0ff21c982 # Ubuntu 24.04 x86-64 with gcc-14
138+
type: c6i.4xlarge # 16 vCPUs, 32 GB, no SSD
138139
region: us-east-1
139-
architecture: arm64 # defaults to amd64
140+
architecture: amd64 # defaults to amd64
140141
spot: true
141142
env:
142-
OS_TYPE: ubuntu-22.04-arm64
143+
OS_TYPE: ubuntu-24.04-x86_64
143144
matrix:
144-
- name: (arm64) gcc Debug [Ubuntu 22.04 Jammy]
145+
- name: (x86_64) gcc-14 Debug [Ubuntu 24.04 Noble]
145146
env:
146-
SELECTED_CC: gcc
147-
SELECTED_CXX: g++
147+
SELECTED_CC: gcc-14
148+
SELECTED_CXX: g++-14
148149
BUILD_TYPE: Debug
149-
- name: (arm64) gcc RelWithDebInfo [Ubuntu 22.04 Jammy]
150+
BUILD_PARAMS_TYPE: normal
151+
- name: (x86_64) gcc-14 RelWithDebInfo [Ubuntu 24.04 Noble]
150152
skip: $CIRRUS_PR != "" # skip PRs
151153
env:
152-
SELECTED_CC: gcc
153-
SELECTED_CXX: g++
154+
SELECTED_CC: gcc-14
155+
SELECTED_CXX: g++-14
154156
BUILD_TYPE: RelWithDebInfo
157+
BUILD_PARAMS_TYPE: normal
155158
mount_disk_script: |
156159
lsblk
157160
lsblk -f
158-
df -Th
159-
sudo mkfs -t xfs /dev/nvme1n1
160-
sudo mkdir $MOUNT_POINT
161-
sudo mount /dev/nvme1n1 $MOUNT_POINT
162-
df -Th
163161
<< : *SCRIPT_TEMPLATE
164162

165163

164+
# (x86_64) Ubuntu 24.04 Noble for percona/percona-server
166165
task:
167166
<< : *FILTER_TEMPLATE
168167
# run only on "percona/percona-server" but not on "8.0" as we have nightly cron builds for "8.0" branch
169-
# only_if: "$CIRRUS_CRON != '' || $CIRRUS_REPO_FULL_NAME == 'percona/percona-server' && $CIRRUS_BRANCH != '8.0' && !changesIncludeOnly('doc/*', 'build-ps/*', 'man/*', 'mysql-test/*', 'packaging/*', 'policy/*', 'scripts/*', 'support-files/*')"
170-
only_if: false # DISABLED
168+
only_if: "$CIRRUS_CRON != '' || $CIRRUS_REPO_FULL_NAME == 'percona/percona-server' && $CIRRUS_BRANCH != '8.0' && !changesIncludeOnly('doc/*', 'build-ps/*', 'man/*', 'mysql-test/*', 'packaging/*', 'policy/*', 'scripts/*', 'support-files/*')"
171169
aws_credentials: ENCRYPTED[!f57794979d3ed96943cd39073b66a4fffbdc3ee6366b265e68c5aae890961d171bddca50bf169cc07db56c8c68172b84!]
172170
ec2_instance:
173-
# aws ec2 describe-images --filters "Name=name,Values=ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-2024061*"
174-
image: ami-0d3d400c0ff21c982 # Ubuntu 24.04 x86-64 with gcc-14
175-
type: c6i.4xlarge # 16 vCPUs, 32 GB, no SSD
171+
# aws ec2 describe-images --filters "Name=name,Values=ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-202302*"
172+
#image: ami-0f9f8d3ed33d7cb88 # Ubuntu 22.04.1 x86-64 with 40 GB gp2 and percona-server gcc-13 gcc-12 gcc-11 gcc-10 gcc-9 clang-15 clang-14 clang-13 node-12
173+
# aws ec2 describe-images --filters "Name=name,Values=ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-202506*"
174+
image: ami-0f384563326d8c771 # Ubuntu 24.04.2 Noble, amd64 with 40 GB gp3, gcc-14
175+
#
176+
#type: c6a.4xlarge # 16 vCPUs, 32 GB, no SSD, 0.612 USD/H
177+
#type: c5a.4xlarge # 16 vCPUs, 32 GB, no SSD, 0.616 USD/H
178+
#type: c5.4xlarge # 16 vCPUs, 32 GB, no SSD, 0.68 USD/H
179+
#type: c6i.4xlarge # 16 vCPUs, 32 GB, no SSD, 0.68 USD/H
180+
type: c5ad.4xlarge
176181
region: us-east-1
177182
architecture: amd64 # defaults to amd64
178183
spot: true
179184
env:
180185
OS_TYPE: ubuntu-24.04-x86_64
181186
matrix:
182-
- name: (x86_64) gcc-14 Debug [Ubuntu 24.04 Noble]
187+
- name: (x86_64) gcc-14 Debug INVERTED [Ubuntu 24.04 Noble]
183188
env:
184189
SELECTED_CC: gcc-14
185190
SELECTED_CXX: g++-14
186191
BUILD_TYPE: Debug
187-
BUILD_PARAMS_TYPE: normal
188-
- name: (x86_64) gcc-14 RelWithDebInfo [Ubuntu 24.04 Noble]
192+
BUILD_PARAMS_TYPE: inverted
193+
- name: (x86_64) gcc-14 RelWithDebInfo INVERTED [Ubuntu 24.04 Noble]
189194
skip: $CIRRUS_PR != "" # skip PRs
190195
env:
191196
SELECTED_CC: gcc-14
192197
SELECTED_CXX: g++-14
193198
BUILD_TYPE: RelWithDebInfo
194-
BUILD_PARAMS_TYPE: normal
199+
BUILD_PARAMS_TYPE: inverted
195200
mount_disk_script: |
196201
lsblk
197202
lsblk -f
198203
<< : *SCRIPT_TEMPLATE
199204

200205

206+
# (arm64) Ubuntu 24.04 Noble for percona/percona-server
201207
task:
202208
<< : *FILTER_TEMPLATE
203209
# run only on "percona/percona-server" but not on "8.0" as we have nightly cron builds for "8.0" branch
204210
only_if: "$CIRRUS_CRON != '' || $CIRRUS_REPO_FULL_NAME == 'percona/percona-server' && $CIRRUS_BRANCH != '8.0' && !changesIncludeOnly('doc/*', 'build-ps/*', 'man/*', 'mysql-test/*', 'packaging/*', 'policy/*', 'scripts/*', 'support-files/*')"
205211
aws_credentials: ENCRYPTED[!f57794979d3ed96943cd39073b66a4fffbdc3ee6366b265e68c5aae890961d171bddca50bf169cc07db56c8c68172b84!]
206212
ec2_instance:
207-
# aws ec2 describe-images --filters "Name=name,Values=ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-202302*"
208-
image: ami-0f9f8d3ed33d7cb88 # Ubuntu 22.04.1 x86-64 with 40 GB gp2 and percona-server gcc-13 gcc-12 gcc-11 gcc-10 gcc-9 clang-15 clang-14 clang-13 node-12
209-
type: c6a.4xlarge # 16 vCPUs, 32 GB, no SSD, 0.612 USD/H
210-
#type: c5a.4xlarge # 16 vCPUs, 32 GB, no SSD, 0.616 USD/H
211-
#type: c5.4xlarge # 16 vCPUs, 32 GB, no SSD, 0.68 USD/H
212-
#type: c6i.4xlarge # 16 vCPUs, 32 GB, no SSD, 0.68 USD/H
213-
region: us-east-1
214-
architecture: amd64 # defautls to amd64
213+
# aws ec2 describe-images --filters "Name=name,Values=ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-arm64-server-202506*"
214+
# image: ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-arm64-server-20250617
215+
# image: ami-0e2b332e63c56bcb5 # Ubuntu Server 22.04 LTS ARM 64-bit
216+
# aws ec2 describe-images --filters "Name=name,Values=ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-arm64-server-2025*" | grep "ubuntu-noble-24.04-arm64-server-202506"
217+
image: ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-arm64-server-20250610
218+
type: c6gd.4xlarge # 16 vCPUs, 32 GB, 950 GB SSD, 0.6144 USD/H
219+
region: us-west-1
220+
architecture: arm64 # defaults to amd64
215221
spot: true
216222
env:
217-
OS_TYPE: ubuntu-22.04-x86_64
223+
OS_TYPE: ubuntu-24.04-arm64
218224
matrix:
219-
- name: (x86_64) gcc-13 Debug INVERTED [Ubuntu 22.04 Jammy]
225+
- name: (arm64) gcc Debug [Ubuntu 24.04 Noble]
220226
env:
221-
SELECTED_CC: gcc-13
222-
SELECTED_CXX: g++-13
227+
SELECTED_CC: gcc
228+
SELECTED_CXX: g++
223229
BUILD_TYPE: Debug
224-
BUILD_PARAMS_TYPE: inverted
225-
- name: (x86_64) gcc-13 RelWithDebInfo INVERTED [Ubuntu 22.04 Jammy]
230+
- name: (arm64) gcc RelWithDebInfo [Ubuntu 24.04 Noble]
226231
skip: $CIRRUS_PR != "" # skip PRs
227232
env:
228-
SELECTED_CC: gcc-13
229-
SELECTED_CXX: g++-13
233+
SELECTED_CC: gcc
234+
SELECTED_CXX: g++
230235
BUILD_TYPE: RelWithDebInfo
231-
BUILD_PARAMS_TYPE: inverted
232236
mount_disk_script: |
233237
lsblk
234238
lsblk -f
239+
df -Th
240+
sudo mkfs -t xfs /dev/nvme1n1
241+
sudo mkdir $MOUNT_POINT
242+
sudo mount /dev/nvme1n1 $MOUNT_POINT
243+
df -Th
235244
<< : *SCRIPT_TEMPLATE
236245

237246

247+
# (arm64) Ubuntu 24.04 Noble for inikep/percona-server
238248
task:
239249
<< : *FILTER_TEMPLATE
240-
aws_credentials: ENCRYPTED[!92ac22d2430cf40dfcec42f739513a65c8b368c822cb397e95f799d41c0ba4498c3a1c337ab14a25cc47b2d4b53c46c5!]
241250
# run only on "inikep/percona-server" when a branch name contains "cirrus-arm"
242251
only_if: "$CIRRUS_BRANCH =~ '.*cirrus-arm.*' && $CIRRUS_REPO_FULL_NAME == 'inikep/percona-server' && !changesIncludeOnly('doc/*', 'build-ps/*', 'man/*', 'mysql-test/*', 'packaging/*', 'policy/*', 'scripts/*', 'support-files/*')" # we have nightly cron builds for "8.0" branch
252+
aws_credentials: ENCRYPTED[!92ac22d2430cf40dfcec42f739513a65c8b368c822cb397e95f799d41c0ba4498c3a1c337ab14a25cc47b2d4b53c46c5!]
243253
ec2_instance:
244-
# aws ec2 describe-images --filters "Name=name,Values=ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-arm64-server-202212*"
245-
image: ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-arm64-server-20221206
254+
# aws ec2 describe-images --filters "Name=name,Values=ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-arm64-server-202506*"
255+
# image: ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-arm64-server-20250617
246256
# image: ami-0e2b332e63c56bcb5 # Ubuntu Server 22.04 LTS ARM 64-bit
257+
# aws ec2 describe-images --filters "Name=name,Values=ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-arm64-server-2025*" | grep "ubuntu-noble-24.04-arm64-server-202506"
258+
image: ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-arm64-server-20250610
247259
type: c6gd.4xlarge # 16 vCPUs, 32 GB, 950 GB SSD, 0.6144 USD/H
248-
region: us-east-1
249-
architecture: arm64 # defautls to amd64
260+
region: us-west-1
261+
architecture: arm64 # defaults to amd64
250262
spot: true
251263
env:
252-
OS_TYPE: ubuntu-22.04-arm64
264+
OS_TYPE: ubuntu-24.04-arm64
253265
matrix:
254-
- name: (arm64) gcc Debug [Ubuntu 22.04 Jammy]
266+
- name: (arm64) gcc Debug [Ubuntu 24.04 Noble]
255267
env:
256268
SELECTED_CC: gcc
257269
SELECTED_CXX: g++
258270
BUILD_TYPE: Debug
259-
- name: (arm64) gcc RelWithDebInfo [Ubuntu 22.04 Jammy]
271+
- name: (arm64) gcc RelWithDebInfo [Ubuntu 24.04 Noble]
260272
env:
261273
SELECTED_CC: gcc
262274
SELECTED_CXX: g++

0 commit comments

Comments
 (0)