Skip to content

Commit 458c52d

Browse files
nogueiraandersonnogueiraanderson
committed
Merge remote-tracking branch 'origin/master' into feature/openshift-ssl-automation
2 parents b83c626 + 79472bd commit 458c52d

13 files changed

+180
-93
lines changed

‎IaC/pmm.cd/init.groovy.d/cloud.groovy‎

Lines changed: 37 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -23,28 +23,31 @@ netMap['us-east-2c'] = 'subnet-00b3df129e7d8c658'
2323

2424
// TODO We use rhel label here, in reality it's a RHEL-compatible derivative.
2525
imageMap = [:]
26-
imageMap['us-east-2a.min-rhel-8-x64'] = 'ami-0eeed66f8f65afdba' // oraclelinux 8.9
27-
imageMap['us-east-2a.min-ol-8-x64'] = imageMap['us-east-2a.min-rhel-8-x64'] // oraclelinux 8.9
28-
imageMap['us-east-2a.min-rhel-9-x64'] = 'ami-0b5a1d936f517ad3e' // oraclelinux 9.3
29-
imageMap['us-east-2a.min-ol-9-x64'] = imageMap['us-east-2a.min-rhel-9-x64'] // oraclelinux 9.3
30-
imageMap['us-east-2a.min-jammy-x64'] = 'ami-085438ce84ab3ac76' // ubuntu 22
31-
imageMap['us-east-2a.min-noble-x64'] = 'ami-0d1b5a8c13042c939' // ubuntu 24
32-
imageMap['us-east-2a.min-bullseye-x64'] = 'ami-0434754593ce7b895' // debian 11
33-
imageMap['us-east-2a.min-bookworm-x64'] = 'ami-065eb7eeb82248b49' // debian 12
26+
imageMap['us-east-2a.min-rhel-8-x64'] = 'ami-0eeed66f8f65afdba' // oraclelinux 8.9
27+
imageMap['us-east-2a.min-ol-8-x64'] = imageMap['us-east-2a.min-rhel-8-x64'] // oraclelinux 8.9
28+
imageMap['us-east-2a.min-rhel-9-x64'] = 'ami-0b5a1d936f517ad3e' // oraclelinux 9.3
29+
imageMap['us-east-2a.min-ol-9-x64'] = imageMap['us-east-2a.min-rhel-9-x64'] // oraclelinux 9.3
30+
imageMap['us-east-2a.min-alma-10-x64'] = 'ami-06be7a8dff9965741' // almalinux 10
31+
imageMap['us-east-2a.min-jammy-x64'] = 'ami-085438ce84ab3ac76' // ubuntu 22
32+
imageMap['us-east-2a.min-noble-x64'] = 'ami-0d1b5a8c13042c939' // ubuntu 24
33+
imageMap['us-east-2a.min-bullseye-x64'] = 'ami-0434754593ce7b895' // debian 11
34+
imageMap['us-east-2a.min-bookworm-x64'] = 'ami-065eb7eeb82248b49' // debian 12
3435

3536
imageMap['us-east-2b.min-rhel-8-x64'] = imageMap['us-east-2a.min-rhel-8-x64']
36-
imageMap['us-east-2b.min-ol-8-x64'] = imageMap['us-east-2a.min-ol-8-x64'] // oraclelinux 8
37+
imageMap['us-east-2b.min-ol-8-x64'] = imageMap['us-east-2a.min-ol-8-x64'] // oraclelinux 8
3738
imageMap['us-east-2b.min-rhel-9-x64'] = imageMap['us-east-2a.min-rhel-9-x64']
38-
imageMap['us-east-2b.min-ol-9-x64'] = imageMap['us-east-2a.min-rhel-9-x64'] // oraclelinux 9
39+
imageMap['us-east-2b.min-ol-9-x64'] = imageMap['us-east-2a.min-rhel-9-x64'] // oraclelinux 9
40+
imageMap['us-east-2b.min-alma-10-x64'] = imageMap['us-east-2a.min-alma-10-x64'] // almalinux 10
3941
imageMap['us-east-2b.min-jammy-x64'] = imageMap['us-east-2a.min-jammy-x64']
4042
imageMap['us-east-2b.min-noble-x64'] = imageMap['us-east-2a.min-noble-x64']
4143
imageMap['us-east-2b.min-bullseye-x64'] = imageMap['us-east-2a.min-bullseye-x64']
4244
imageMap['us-east-2b.min-bookworm-x64'] = imageMap['us-east-2a.min-bookworm-x64']
4345

4446
imageMap['us-east-2c.min-rhel-8-x64'] = imageMap['us-east-2a.min-rhel-8-x64']
45-
imageMap['us-east-2c.min-ol-8-x64'] = imageMap['us-east-2a.min-ol-8-x64'] // oraclelinux 8
47+
imageMap['us-east-2c.min-ol-8-x64'] = imageMap['us-east-2a.min-ol-8-x64'] // oraclelinux 8
4648
imageMap['us-east-2c.min-rhel-9-x64'] = imageMap['us-east-2a.min-rhel-9-x64']
47-
imageMap['us-east-2c.min-ol-9-x64'] = imageMap['us-east-2a.min-rhel-9-x64'] // oraclelinux 9
49+
imageMap['us-east-2c.min-ol-9-x64'] = imageMap['us-east-2a.min-rhel-9-x64'] // oraclelinux 9
50+
imageMap['us-east-2c.min-alma-10-x64'] = imageMap['us-east-2a.min-alma-10-x64'] // almalinux 10
4851
imageMap['us-east-2c.min-jammy-x64'] = imageMap['us-east-2a.min-jammy-x64']
4952
imageMap['us-east-2c.min-noble-x64'] = imageMap['us-east-2a.min-noble-x64']
5053
imageMap['us-east-2c.min-bullseye-x64'] = imageMap['us-east-2a.min-bullseye-x64']
@@ -53,20 +56,23 @@ imageMap['us-east-2c.min-bookworm-x64'] = imageMap['us-east-2a.min-bookworm-x6
5356
// ARM64 based AMIs
5457
imageMap['us-east-2a.min-ol-8-arm64'] = 'ami-0f77cbbab56907b6c' // oraclelinux 8.9 arm64
5558
imageMap['us-east-2a.min-ol-9-arm64'] = 'ami-0ffbdb6ee492c2cd5' // oraclelinux 9.3 arm64
59+
imageMap['us-east-2a.min-alma-10-arm64'] = 'ami-0f5ead2bc98a63a65' // almalinux 10 arm64
5660
imageMap['us-east-2a.min-jammy-arm64'] = 'ami-0f732d76e7fad24ca' // ubuntu 22.04 arm64
5761
imageMap['us-east-2a.min-noble-arm64'] = 'ami-019eeff96c2865995' // ubuntu 24.04 arm64
5862
imageMap['us-east-2a.min-bullseye-arm64'] = 'ami-0d0902423ff93b14f' // debian 11 arm64
5963
imageMap['us-east-2a.min-bookworm-arm64'] = 'ami-0de4c77901001cfe7' // debian 12 arm64
6064

6165
imageMap['us-east-2b.min-ol-8-arm64'] = imageMap['us-east-2a.min-ol-8-arm64']
6266
imageMap['us-east-2b.min-ol-9-arm64'] = imageMap['us-east-2a.min-ol-9-arm64']
67+
imageMap['us-east-2b.min-alma-10-arm64'] = imageMap['us-east-2a.min-alma-10-arm64']
6368
imageMap['us-east-2b.min-jammy-arm64'] = imageMap['us-east-2a.min-jammy-arm64']
6469
imageMap['us-east-2b.min-noble-arm64'] = imageMap['us-east-2a.min-noble-arm64']
6570
imageMap['us-east-2b.min-bullseye-arm64'] = imageMap['us-east-2a.min-bullseye-arm64']
6671
imageMap['us-east-2b.min-bookworm-arm64'] = imageMap['us-east-2a.min-bookworm-arm64']
6772

6873
imageMap['us-east-2c.min-ol-8-arm64'] = imageMap['us-east-2a.min-ol-8-arm64']
6974
imageMap['us-east-2c.min-ol-9-arm64'] = imageMap['us-east-2a.min-ol-9-arm64']
75+
imageMap['us-east-2c.min-alma-10-arm64'] = imageMap['us-east-2a.min-alma-10-arm64']
7076
imageMap['us-east-2c.min-jammy-arm64'] = imageMap['us-east-2a.min-jammy-arm64']
7177
imageMap['us-east-2c.min-noble-arm64'] = imageMap['us-east-2a.min-noble-arm64']
7278
imageMap['us-east-2c.min-bullseye-arm64'] = imageMap['us-east-2a.min-bullseye-arm64']
@@ -85,13 +91,15 @@ userMap['min-rhel-8-x64'] = 'ec2-user'
8591
userMap['min-ol-8-x64'] = 'ec2-user'
8692
userMap['min-rhel-9-x64'] = 'ec2-user'
8793
userMap['min-ol-9-x64'] = 'ec2-user'
94+
userMap['min-alma-10-x64'] = 'ec2-user'
8895
userMap['min-jammy-x64'] = 'ubuntu'
8996
userMap['min-noble-x64'] = 'ubuntu'
9097
userMap['min-bullseye-x64'] = 'admin'
9198
userMap['min-bookworm-x64'] = 'admin'
9299

93100
userMap['min-ol-8-arm64'] = 'ec2-user'
94101
userMap['min-ol-9-arm64'] = 'ec2-user'
102+
userMap['min-alma-10-arm64'] = 'ec2-user'
95103
userMap['min-jammy-arm64'] = 'ubuntu'
96104
userMap['min-noble-arm64'] = 'ubuntu'
97105
userMap['min-bullseye-arm64'] = 'admin'
@@ -121,20 +129,13 @@ initMap['rpmMap'] = '''
121129
10.30.6.9 repo.ci.percona.com
122130
" | sudo tee -a /etc/hosts
123131
124-
if [[ $SYSREL -eq 2 ]]; then
125-
sudo sysctl -w fs.inotify.max_user_watches=10000000 || true
126-
sudo sysctl -w fs.aio-max-nr=1048576 || true
127-
sudo sysctl -w fs.file-max=6815744 || true
128-
echo "* soft core unlimited" | sudo tee -a /etc/security/limits.conf
129-
sudo amazon-linux-extras install epel java-openjdk11 -y
130-
PKGLIST="tar coreutils p7zip"
131-
elif [[ $SYSREL -eq 7 ]]; then
132-
PKGLIST="tar coreutils java-11-openjdk"
132+
if [[ $SYSREL -ge 10 ]]; then
133+
PKGLIST="tar coreutils java-21-openjdk-headless tzdata-java"
133134
elif [[ $SYSREL -ge 8 ]]; then
134135
PKGLIST="tar coreutils java-11-openjdk tzdata-java"
135136
fi
136137
137-
if [[ ${RHVER} -eq 8 ]] || [[ ${RHVER} -eq 7 ]]; then
138+
if [[ ${RHVER} -eq 8 ]]; then
138139
sudo sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-*
139140
sudo sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-*
140141
fi
@@ -145,24 +146,6 @@ initMap['rpmMap'] = '''
145146
done
146147
147148
sudo yum -y install git ${PKGLIST} || :
148-
aws --version || :
149-
sudo yum -y remove aws-cli || :
150-
151-
if [[ $SYSREL -eq 2 ]]; then
152-
if ! $(aws --version | grep -q 'aws-cli/2'); then
153-
find /tmp -maxdepth 1 -name "*aws*" | xargs sudo rm -rf
154-
155-
until curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "/tmp/awscliv2.zip"; do
156-
sleep 1
157-
echo try again
158-
done
159-
160-
7za -o/tmp x /tmp/awscliv2.zip
161-
cd /tmp/aws && sudo ./install
162-
aws --version || :
163-
fi
164-
fi
165-
166149
sudo install -o $(id -u -n) -g $(id -g -n) -d /mnt/jenkins
167150
168151
'''
@@ -225,13 +208,15 @@ initMap['min-rhel-8-x64'] = initMap['rpmMap']
225208
initMap['min-ol-8-x64'] = initMap['rpmMap']
226209
initMap['min-rhel-9-x64'] = initMap['rpmMap']
227210
initMap['min-ol-9-x64'] = initMap['rpmMap']
211+
initMap['min-alma-10-x64'] = initMap['rpmMap']
228212
initMap['min-jammy-x64'] = initMap['debMap']
229213
initMap['min-noble-x64'] = initMap['debMap']
230214
initMap['min-bullseye-x64'] = initMap['debMap']
231215
initMap['min-bookworm-x64'] = initMap['debMap']
232216

233217
initMap['min-ol-8-arm64'] = initMap['rpmMap']
234218
initMap['min-ol-9-arm64'] = initMap['rpmMap']
219+
initMap['min-alma-10-arm64'] = initMap['rpmMap']
235220
initMap['min-jammy-arm64'] = initMap['debMap']
236221
initMap['min-noble-arm64'] = initMap['debMap']
237222
initMap['min-bullseye-arm64'] = initMap['debMap']
@@ -250,13 +235,15 @@ typeMap['min-rhel-8-x64'] = 'm7a.large'
250235
typeMap['min-ol-8-x64'] = typeMap['min-rhel-8-x64']
251236
typeMap['min-rhel-9-x64'] = typeMap['min-rhel-8-x64']
252237
typeMap['min-ol-9-x64'] = typeMap['min-rhel-8-x64']
238+
typeMap['min-alma-10-x64'] = typeMap['min-rhel-8-x64']
253239
typeMap['min-jammy-x64'] = typeMap['min-rhel-8-x64']
254240
typeMap['min-noble-x64'] = typeMap['min-rhel-8-x64']
255241
typeMap['min-bullseye-x64'] = typeMap['min-rhel-8-x64']
256242
typeMap['min-bookworm-x64'] = typeMap['min-rhel-8-x64']
257243

258244
typeMap['min-ol-8-arm64'] = 'm7g.large'
259245
typeMap['min-ol-9-arm64'] = typeMap['min-ol-8-arm64']
246+
typeMap['min-alma-10-arm64'] = typeMap['min-ol-8-arm64']
260247
typeMap['min-jammy-arm64'] = typeMap['min-ol-8-arm64']
261248
typeMap['min-noble-arm64'] = typeMap['min-ol-8-arm64']
262249
typeMap['min-bullseye-arm64'] = typeMap['min-ol-8-arm64']
@@ -267,13 +254,15 @@ execMap['min-rhel-8-x64'] = '1'
267254
execMap['min-ol-8-x64'] = '1'
268255
execMap['min-rhel-9-x64'] = '1'
269256
execMap['min-ol-9-x64'] = '1'
257+
execMap['min-alma-10-x64'] = '1'
270258
execMap['min-jammy-x64'] = '1'
271259
execMap['min-noble-x64'] = '1'
272260
execMap['min-bullseye-x64'] = '1'
273261
execMap['min-bookworm-x64'] = '1'
274262

275263
execMap['min-ol-8-arm64'] = '1'
276264
execMap['min-ol-9-arm64'] = '1'
265+
execMap['min-alma-10-arm64'] = '1'
277266
execMap['min-jammy-arm64'] = '1'
278267
execMap['min-noble-arm64'] = '1'
279268
execMap['min-bullseye-arm64'] = '1'
@@ -284,13 +273,15 @@ devMap['min-rhel-8-x64'] = '/dev/sda1=:80:true:gp3,/dev/sdd=:20:true:gp3'
284273
devMap['min-ol-8-x64'] = devMap['min-rhel-8-x64']
285274
devMap['min-rhel-9-x64'] = devMap['min-rhel-8-x64']
286275
devMap['min-ol-9-x64'] = devMap['min-rhel-8-x64']
276+
devMap['min-alma-10-x64'] = devMap['min-rhel-8-x64']
287277
devMap['min-jammy-x64'] = devMap['min-rhel-8-x64']
288278
devMap['min-noble-x64'] = devMap['min-rhel-8-x64']
289279
devMap['min-bullseye-x64'] = '/dev/xvda=:80:true:gp3,/dev/xvdd=:20:true:gp3'
290280
devMap['min-bookworm-x64'] = '/dev/xvda=:80:true:gp3,/dev/xvdd=:20:true:gp3'
291281

292282
devMap['min-ol-8-arm64'] = devMap['min-rhel-8-x64']
293283
devMap['min-ol-9-arm64'] = devMap['min-rhel-8-x64']
284+
devMap['min-alma-10-arm64'] = devMap['min-rhel-8-x64']
294285
devMap['min-jammy-arm64'] = devMap['min-rhel-8-x64']
295286
devMap['min-noble-arm64'] = devMap['min-rhel-8-x64']
296287
devMap['min-bullseye-arm64'] = '/dev/xvda=:80:true:gp3,/dev/xvdd=:20:true:gp3'
@@ -301,13 +292,15 @@ labelMap['min-rhel-8-x64'] = 'min-rhel-8-x64'
301292
labelMap['min-ol-8-x64'] = 'min-ol-8-x64'
302293
labelMap['min-rhel-9-x64'] = 'min-rhel-9-x64'
303294
labelMap['min-ol-9-x64'] = 'min-ol-9-x64'
295+
labelMap['min-alma-10-x64'] = 'min-alma-10-x64'
304296
labelMap['min-jammy-x64'] = 'min-jammy-x64'
305297
labelMap['min-noble-x64'] = 'min-noble-x64'
306298
labelMap['min-bullseye-x64'] = 'min-bullseye-x64'
307299
labelMap['min-bookworm-x64'] = 'min-bookworm-x64'
308300

309301
labelMap['min-ol-8-arm64'] = 'min-ol-8-arm64'
310302
labelMap['min-ol-9-arm64'] = 'min-ol-9-arm64'
303+
labelMap['min-alma-10-arm64'] = 'min-alma-10-arm64'
311304
labelMap['min-jammy-arm64'] = 'min-jammy-arm64'
312305
labelMap['min-noble-arm64'] = 'min-noble-arm64'
313306
labelMap['min-bullseye-arm64'] = 'min-bullseye-arm64'
@@ -318,13 +311,15 @@ jvmoptsMap['min-rhel-8-x64'] = '-Xmx512m -Xms512m'
318311
jvmoptsMap['min-ol-8-x64'] = jvmoptsMap['min-rhel-8-x64']
319312
jvmoptsMap['min-rhel-9-x64'] = jvmoptsMap['min-rhel-8-x64']
320313
jvmoptsMap['min-ol-9-x64'] = jvmoptsMap['min-rhel-8-x64']
314+
jvmoptsMap['min-alma-10-x64'] = jvmoptsMap['min-rhel-8-x64']
321315
jvmoptsMap['min-jammy-x64'] = jvmoptsMap['min-rhel-8-x64']
322316
jvmoptsMap['min-noble-x64'] = jvmoptsMap['min-rhel-8-x64']
323317
jvmoptsMap['min-bullseye-x64'] = '-Xmx512m -Xms512m --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED'
324318
jvmoptsMap['min-bookworm-x64'] = '-Xmx512m -Xms512m --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED'
325319

326320
jvmoptsMap['min-ol-8-arm64'] = jvmoptsMap['min-rhel-8-x64']
327321
jvmoptsMap['min-ol-9-arm64'] = jvmoptsMap['min-rhel-8-x64']
322+
jvmoptsMap['min-alma-10-arm64'] = jvmoptsMap['min-rhel-8-x64']
328323
jvmoptsMap['min-jammy-arm64'] = jvmoptsMap['min-rhel-8-x64']
329324
jvmoptsMap['min-noble-arm64'] = jvmoptsMap['min-rhel-8-x64']
330325
jvmoptsMap['min-bullseye-arm64'] = '-Xmx512m -Xms512m --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED'
@@ -403,12 +398,14 @@ String region = 'us-east-2'
403398
getTemplate('min-ol-8-x64', "${region}${it}"),
404399
getTemplate('min-rhel-9-x64', "${region}${it}"),
405400
getTemplate('min-ol-9-x64', "${region}${it}"),
401+
getTemplate('min-alma-10-x64', "${region}${it}"),
406402
getTemplate('min-jammy-x64', "${region}${it}"),
407403
getTemplate('min-noble-x64', "${region}${it}"),
408404
getTemplate('min-bullseye-x64', "${region}${it}"),
409405
getTemplate('min-bookworm-x64', "${region}${it}"),
410406
getTemplate('min-ol-8-arm64', "${region}${it}"),
411407
getTemplate('min-ol-9-arm64', "${region}${it}"),
408+
getTemplate('min-alma-10-arm64', "${region}${it}"),
412409
getTemplate('min-jammy-arm64', "${region}${it}"),
413410
getTemplate('min-noble-arm64', "${region}${it}"),
414411
getTemplate('min-bullseye-arm64', "${region}${it}"),

‎cloud/jenkins/openshift-cluster-create.yml‎ renamed to ‎pmm/openshift/openshift-cluster-create.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -190,12 +190,12 @@
190190
pipeline-scm:
191191
scm:
192192
- git:
193-
url: https://github.com/nogueiraanderson/jenkins-pipelines.git
193+
url: https://github.com/Percona-Lab/jenkins-pipelines.git
194194
branches:
195-
- "feature/openshift-shared-libraries"
195+
- "master"
196196
wipe-workspace: false
197197
lightweight-checkout: true
198-
script-path: cloud/jenkins/openshift_cluster_create.groovy
198+
script-path: pmm/openshift/openshift_cluster_create.groovy
199199

200200
concurrent: true
201201

‎cloud/jenkins/openshift-cluster-destroy.yml‎ renamed to ‎pmm/openshift/openshift-cluster-destroy.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,12 @@
4141
pipeline-scm:
4242
scm:
4343
- git:
44-
url: https://github.com/nogueiraanderson/jenkins-pipelines.git
44+
url: https://github.com/Percona-Lab/jenkins-pipelines.git
4545
branches:
46-
- 'feature/openshift-shared-libraries'
46+
- 'master'
4747
wipe-workspace: false
4848
lightweight-checkout: true
49-
script-path: cloud/jenkins/openshift_cluster_destroy.groovy
49+
script-path: pmm/openshift/openshift_cluster_destroy.groovy
5050

5151
concurrent: true
5252

‎cloud/jenkins/openshift-cluster-list.yml‎ renamed to ‎pmm/openshift/openshift-cluster-list.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
pipeline-scm:
2121
scm:
2222
- git:
23-
url: https://github.com/nogueiraanderson/jenkins-pipelines.git
23+
url: https://github.com/Percona-Lab/jenkins-pipelines.git
2424
branches:
25-
- feature/openshift-shared-libraries
26-
script-path: cloud/jenkins/openshift_cluster_list.groovy
25+
- master
26+
script-path: pmm/openshift/openshift_cluster_list.groovy
2727
lightweight-checkout: true
2828

2929
concurrent: true

0 commit comments

Comments
 (0)