Skip to content

Commit

Permalink
Merge branch 'master' into check-go
Browse files Browse the repository at this point in the history
  • Loading branch information
@kaushikpuneet07
kaushikpuneet07 authored Jun 10, 2024
2 parents 537940e + b37bebf commit a4ff9fa
Show file tree
Hide file tree
Showing 10 changed files with 201 additions and 39 deletions.
21 changes: 21 additions & 0 deletions IaC/init.groovy.d/ami-defs.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -254,4 +254,25 @@ AwsAmi {

user = "ubuntu"
}

// Ubuntu 24.04 (Noble) AMIs
Ubuntu2404_x86_64 {
euCentral1 = "ami-01e444924a2233b07"
euWest1 = "ami-0776c814353b4814d"
usEast2 = "ami-075e395c96a011fee"
usWest1 = "ami-08012c0a9ee8e21c4"
usWest2 = "ami-0cf2b4e024cdb6960"

user = "ubuntu"
}

Ubuntu2404_aarch64 {
euCentral1 = "ami-099b7bab1b9843525"
euWest1 = "ami-0a636034c582e2138"
usEast2 = "ami-0eac975a54dfee8cb"
usWest1 = "ami-02404fb4d4dc3c0c7"
usWest2 = "ami-0c29a2c5cf69b5a9c"

user = "ubuntu"
}
}
2 changes: 1 addition & 1 deletion IaC/init.groovy.d/ami-defs.properties.sha256
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
76e448bb7d16744b4ce4bd1079d30d10b8f4eff75dc362fde87d2dc7fbfe0350
26a1860e9975def51bb316bbcb36296d63e10de4dfc1863a3fe2cda7f1d6f53e
11 changes: 11 additions & 0 deletions IaC/pmm.cd/init.groovy.d/cloud.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ imageMap['us-east-2a.min-ol-9-x64'] = imageMap['us-east-2a.min-rhel-9-x64'
imageMap['us-east-2a.min-bionic-x64'] = 'ami-0bb220fc4bffd88dd' // ubuntu 18
imageMap['us-east-2a.min-focal-x64'] = 'ami-01936e31f56bdacde' // ubuntu 20
imageMap['us-east-2a.min-jammy-x64'] = 'ami-0e83be366243f524a' // ubuntu 22
imageMap['us-east-2a.min-noble-x64'] = 'ami-075e395c96a011fee' // ubuntu 24
imageMap['us-east-2a.min-stretch-x64'] = 'ami-0a694f67ea86df8a7' // debian 9
imageMap['us-east-2a.min-buster-x64'] = 'ami-0dc2cee9dad26918a' // debian 10
imageMap['us-east-2a.min-bullseye-x64'] = 'ami-023766a7f545f3c77' // debian 11
Expand All @@ -46,6 +47,7 @@ imageMap['us-east-2b.min-ol-9-x64'] = imageMap['us-east-2a.min-rhel-9-x64'
imageMap['us-east-2b.min-bionic-x64'] = imageMap['us-east-2a.min-bionic-x64']
imageMap['us-east-2b.min-focal-x64'] = imageMap['us-east-2a.min-focal-x64']
imageMap['us-east-2b.min-jammy-x64'] = imageMap['us-east-2a.min-jammy-x64']
imageMap['us-east-2b.min-noble-x64'] = imageMap['us-east-2a.min-noble-x64']
imageMap['us-east-2b.min-stretch-x64'] = imageMap['us-east-2a.min-stretch-x64']
imageMap['us-east-2b.min-buster-x64'] = imageMap['us-east-2a.min-buster-x64']
imageMap['us-east-2b.min-bullseye-x64'] = imageMap['us-east-2a.min-bullseye-x64']
Expand All @@ -60,6 +62,7 @@ imageMap['us-east-2c.min-ol-9-x64'] = imageMap['us-east-2a.min-rhel-9-x64'
imageMap['us-east-2c.min-bionic-x64'] = imageMap['us-east-2a.min-bionic-x64']
imageMap['us-east-2c.min-focal-x64'] = imageMap['us-east-2a.min-focal-x64']
imageMap['us-east-2c.min-jammy-x64'] = imageMap['us-east-2a.min-jammy-x64']
imageMap['us-east-2c.min-noble-x64'] = imageMap['us-east-2a.min-noble-x64']
imageMap['us-east-2c.min-stretch-x64'] = imageMap['us-east-2a.min-stretch-x64']
imageMap['us-east-2c.min-buster-x64'] = imageMap['us-east-2a.min-buster-x64']
imageMap['us-east-2c.min-bullseye-x64'] = imageMap['us-east-2a.min-bullseye-x64']
Expand All @@ -82,6 +85,7 @@ userMap['min-ol-9-x64'] = 'ec2-user'
userMap['min-focal-x64'] = 'ubuntu'
userMap['min-bionic-x64'] = 'ubuntu'
userMap['min-jammy-x64'] = 'ubuntu'
userMap['min-noble-x64'] = 'ubuntu'
userMap['min-stretch-x64'] = 'admin'
userMap['min-buster-x64'] = 'admin'
userMap['min-bullseye-x64'] = 'admin'
Expand Down Expand Up @@ -219,6 +223,7 @@ initMap['min-ol-9-x64'] = initMap['rpmMap']
initMap['min-focal-x64'] = initMap['debMap']
initMap['min-bionic-x64'] = initMap['debMap']
initMap['min-jammy-x64'] = initMap['debMap']
initMap['min-noble-x64'] = initMap['debMap']
initMap['min-stretch-x64'] = initMap['debMap']
initMap['min-bullseye-x64'] = initMap['debMap']
initMap['min-bookworm-x64'] = initMap['debMap']
Expand All @@ -240,6 +245,7 @@ typeMap['min-ol-9-x64'] = typeMap['min-rhel-7-x64']
typeMap['min-focal-x64'] = typeMap['min-rhel-7-x64']
typeMap['min-bionic-x64'] = typeMap['min-rhel-7-x64']
typeMap['min-jammy-x64'] = typeMap['min-rhel-7-x64']
typeMap['min-noble-x64'] = typeMap['min-rhel-7-x64']
typeMap['min-stretch-x64'] = typeMap['min-rhel-7-x64']
typeMap['min-buster-x64'] = typeMap['min-rhel-7-x64']
typeMap['min-bullseye-x64'] = typeMap['min-rhel-7-x64']
Expand All @@ -255,6 +261,7 @@ execMap['min-ol-9-x64'] = '1'
execMap['min-focal-x64'] = '1'
execMap['min-bionic-x64'] = '1'
execMap['min-jammy-x64'] = '1'
execMap['min-noble-x64'] = '1'
execMap['min-stretch-x64'] = '1'
execMap['min-buster-x64'] = '1'
execMap['min-bullseye-x64'] = '1'
Expand All @@ -270,6 +277,7 @@ devMap['min-ol-9-x64'] = devMap['min-rhel-7-x64']
devMap['min-focal-x64'] = devMap['min-rhel-7-x64']
devMap['min-bionic-x64'] = devMap['min-rhel-7-x64']
devMap['min-jammy-x64'] = devMap['min-rhel-7-x64']
devMap['min-noble-x64'] = devMap['min-rhel-7-x64']
devMap['min-stretch-x64'] = '/dev/xvda=:80:true:gp2,/dev/xvdd=:20:true:gp2'
devMap['min-buster-x64'] = '/dev/xvda=:80:true:gp2,/dev/xvdd=:20:true:gp2'
devMap['min-bullseye-x64'] = '/dev/xvda=:80:true:gp2,/dev/xvdd=:20:true:gp2'
Expand All @@ -285,6 +293,7 @@ labelMap['min-ol-9-x64'] = 'min-ol-9-x64'
labelMap['min-focal-x64'] = 'min-focal-x64'
labelMap['min-bionic-x64'] = 'min-bionic-x64'
labelMap['min-jammy-x64'] = 'min-jammy-x64'
labelMap['min-noble-x64'] = 'min-noble-x64'
labelMap['min-stretch-x64'] = 'min-stretch-x64'
labelMap['min-buster-x64'] = 'min-buster-x64'
labelMap['min-bullseye-x64'] = 'min-bullseye-x64'
Expand All @@ -300,6 +309,7 @@ jvmoptsMap['min-ol-9-x64'] = jvmoptsMap['min-rhel-7-x64']
jvmoptsMap['min-focal-x64'] = jvmoptsMap['min-rhel-7-x64']
jvmoptsMap['min-bionic-x64'] = jvmoptsMap['min-rhel-7-x64']
jvmoptsMap['min-jammy-x64'] = jvmoptsMap['min-rhel-7-x64']
jvmoptsMap['min-noble-x64'] = jvmoptsMap['min-rhel-7-x64']
jvmoptsMap['min-stretch-x64'] = jvmoptsMap['min-rhel-7-x64']
jvmoptsMap['min-buster-x64'] = jvmoptsMap['min-rhel-7-x64']
jvmoptsMap['min-bullseye-x64'] = jvmoptsMap['min-rhel-7-x64']
Expand Down Expand Up @@ -383,6 +393,7 @@ String region = 'us-east-2'
getTemplate('min-focal-x64', "${region}${it}"),
getTemplate('min-bionic-x64', "${region}${it}"),
getTemplate('min-jammy-x64', "${region}${it}"),
getTemplate('min-noble-x64', "${region}${it}"),
getTemplate('min-stretch-x64', "${region}${it}"),
getTemplate('min-buster-x64', "${region}${it}"),
getTemplate('min-bullseye-x64', "${region}${it}"),
Expand Down
22 changes: 22 additions & 0 deletions IaC/ps3.cd/init.groovy.d/cloud.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,13 +87,15 @@ imageMap['eu-west-1a.min-xenial-x64'] = properties.AwsAmi['Ubuntu1604_x86_
imageMap['eu-west-1a.docker-32gb-hirsute'] = properties.AwsAmi['Ubuntu2104_x86_64']['euWest1']
imageMap['eu-west-1a.docker-32gb-focal'] = properties.AwsAmi['Ubuntu2004_x86_64']['euWest1']
imageMap['eu-west-1a.docker-32gb-jammy'] = properties.AwsAmi['Ubuntu2204_x86_64']['euWest1']
imageMap['eu-west-1a.docker-32gb-noble'] = properties.AwsAmi['Ubuntu2404_x86_64']['euWest1']
imageMap['eu-west-1a.docker-32gb-bullseye'] = imageMap['eu-west-1a.min-bullseye-x64']

imageMap['eu-west-1a.docker-32gb-aarch64'] = properties.AwsAmi['AmazonLinux2_aarch64']['euWest1']
imageMap['eu-west-1a.min-centos-7-aarch64'] = properties.AwsAmi['Centos7_aarch64']['euWest1']
imageMap['eu-west-1a.min-bookworm-aarch64'] = properties.AwsAmi['Debian12_aarch64']['euWest1']
imageMap['eu-west-1a.min-bullseye-aarch64'] = properties.AwsAmi['Debian11_aarch64']['euWest1']
imageMap['eu-west-1a.min-jammy-aarch64'] = properties.AwsAmi['Ubuntu2204_aarch64']['euWest1']
imageMap['eu-west-1a.min-noble-aarch64'] = properties.AwsAmi['Ubuntu2404_aarch64']['euWest1']

imageMap['eu-west-1b.docker'] = imageMap['eu-west-1a.docker']
imageMap['eu-west-1b.docker-32gb'] = imageMap['eu-west-1a.docker-32gb']
Expand All @@ -114,13 +116,15 @@ imageMap['eu-west-1b.min-xenial-x64'] = imageMap['eu-west-1a.min-xenial-x6
imageMap['eu-west-1b.docker-32gb-hirsute'] = imageMap['eu-west-1a.docker-32gb-hirsute']
imageMap['eu-west-1b.docker-32gb-focal'] = imageMap['eu-west-1a.docker-32gb-focal']
imageMap['eu-west-1b.docker-32gb-jammy'] = imageMap['eu-west-1a.docker-32gb-jammy']
imageMap['eu-west-1b.docker-32gb-noble'] = imageMap['eu-west-1a.docker-32gb-noble']
imageMap['eu-west-1b.docker-32gb-bullseye'] = imageMap['eu-west-1a.docker-32gb-bullseye']

imageMap['eu-west-1b.docker-32gb-aarch64'] = imageMap['eu-west-1a.docker-32gb-aarch64']
imageMap['eu-west-1b.min-centos-7-aarch64'] = imageMap['eu-west-1a.min-centos-7-aarch64']
imageMap['eu-west-1b.min-bookworm-aarch64'] = imageMap['eu-west-1a.min-bookworm-aarch64']
imageMap['eu-west-1b.min-bullseye-aarch64'] = imageMap['eu-west-1a.min-bullseye-aarch64']
imageMap['eu-west-1b.min-jammy-aarch64'] = imageMap['eu-west-1a.min-jammy-aarch64']
imageMap['eu-west-1b.min-noble-aarch64'] = imageMap['eu-west-1a.min-noble-aarch64']

imageMap['eu-west-1c.docker'] = imageMap['eu-west-1a.docker']
imageMap['eu-west-1c.docker-32gb'] = imageMap['eu-west-1a.docker-32gb']
Expand All @@ -141,13 +145,15 @@ imageMap['eu-west-1c.min-xenial-x64'] = imageMap['eu-west-1a.min-xenial-x6
imageMap['eu-west-1c.docker-32gb-hirsute'] = imageMap['eu-west-1a.docker-32gb-hirsute']
imageMap['eu-west-1c.docker-32gb-focal'] = imageMap['eu-west-1a.docker-32gb-focal']
imageMap['eu-west-1c.docker-32gb-jammy'] = imageMap['eu-west-1a.docker-32gb-jammy']
imageMap['eu-west-1c.docker-32gb-noble'] = imageMap['eu-west-1a.docker-32gb-noble']
imageMap['eu-west-1c.docker-32gb-bullseye'] = imageMap['eu-west-1a.docker-32gb-bullseye']

imageMap['eu-west-1c.docker-32gb-aarch64'] = imageMap['eu-west-1a.docker-32gb-aarch64']
imageMap['eu-west-1c.min-centos-7-aarch64'] = imageMap['eu-west-1a.min-centos-7-aarch64']
imageMap['eu-west-1c.min-bookworm-aarch64'] = imageMap['eu-west-1a.min-bookworm-aarch64']
imageMap['eu-west-1c.min-bullseye-aarch64'] = imageMap['eu-west-1a.min-bullseye-aarch64']
imageMap['eu-west-1c.min-jammy-aarch64'] = imageMap['eu-west-1a.min-jammy-aarch64']
imageMap['eu-west-1c.min-noble-aarch64'] = imageMap['eu-west-1a.min-noble-aarch64']


priceMap = [:]
Expand Down Expand Up @@ -176,13 +182,15 @@ userMap['min-buster-x64'] = properties.AwsAmi['Debian10_x86_64']['user']
userMap['docker-32gb-hirsute'] = properties.AwsAmi['Ubuntu2104_x86_64']['user']
userMap['docker-32gb-focal'] = properties.AwsAmi['Ubuntu2004_x86_64']['user']
userMap['docker-32gb-jammy'] = properties.AwsAmi['Ubuntu2204_x86_64']['user']
userMap['docker-32gb-noble'] = properties.AwsAmi['Ubuntu2404_x86_64']['user']
userMap['docker-32gb-bullseye'] = properties.AwsAmi['Debian11_x86_64']['user']

userMap['docker-32gb-aarch64'] = properties.AwsAmi['AmazonLinux2_aarch64']['user']
userMap['min-centos-7-aarch64'] = properties.AwsAmi['Centos7_aarch64']['user']
userMap['min-bookworm-aarch64'] = properties.AwsAmi['Debian12_aarch64']['user']
userMap['min-bullseye-aarch64'] = properties.AwsAmi['Debian11_aarch64']['user']
userMap['min-jammy-aarch64'] = properties.AwsAmi['Ubuntu2204_aarch64']['user']
userMap['min-noble-aarch64'] = properties.AwsAmi['Ubuntu2404_aarch64']['user']


initMap = [:]
Expand Down Expand Up @@ -316,6 +324,7 @@ initMap['docker-32gb-hirsute'] = '''
'''
initMap['docker-32gb-focal'] = initMap['docker-32gb-hirsute']
initMap['docker-32gb-jammy'] = initMap['docker-32gb-hirsute']
initMap['docker-32gb-noble'] = initMap['docker-32gb-hirsute']

initMap['docker-32gb-bullseye'] = '''
set -o xtrace
Expand Down Expand Up @@ -516,6 +525,7 @@ initMap['min-centos-7-aarch64'] = initMap['rpmMap']
initMap['min-bookworm-aarch64'] = initMap['debMap']
initMap['min-bullseye-aarch64'] = initMap['debMap']
initMap['min-jammy-aarch64'] = initMap['debMap']
initMap['min-noble-aarch64'] = initMap['debMap']

capMap = [:]
capMap['c5n.2xlarge'] = '60'
Expand Down Expand Up @@ -543,13 +553,15 @@ typeMap['min-xenial-x64'] = typeMap['min-centos-7-x64']
typeMap['docker-32gb-hirsute'] = 'i4i.2xlarge'
typeMap['docker-32gb-focal'] = 'i4i.2xlarge'
typeMap['docker-32gb-jammy'] = 'i4i.2xlarge'
typeMap['docker-32gb-noble'] = 'i4i.2xlarge'
typeMap['docker-32gb-bullseye'] = 'i4i.2xlarge'

typeMap['docker-32gb-aarch64'] = 'r6g.2xlarge'
typeMap['min-centos-7-aarch64'] = typeMap['docker-32gb-aarch64']
typeMap['min-bookworm-aarch64'] = typeMap['docker-32gb-aarch64']
typeMap['min-bullseye-aarch64'] = typeMap['docker-32gb-aarch64']
typeMap['min-jammy-aarch64'] = typeMap['docker-32gb-aarch64']
typeMap['min-noble-aarch64'] = typeMap['docker-32gb-aarch64']

execMap = [:]
execMap['docker'] = '1'
Expand All @@ -568,6 +580,7 @@ execMap['min-buster-x64'] = '1'
execMap['docker-32gb-hirsute'] = '1'
execMap['docker-32gb-focal'] = '1'
execMap['docker-32gb-jammy'] = '1'
execMap['docker-32gb-noble'] = '1'
execMap['min-bookworm-x64'] = '1'
execMap['min-bullseye-x64'] = '1'
execMap['docker-32gb-bullseye'] = '1'
Expand All @@ -577,6 +590,7 @@ execMap['min-centos-7-aarch64'] = '1'
execMap['min-bookworm-aarch64'] = '1'
execMap['min-bullseye-aarch64'] = '1'
execMap['min-jammy-aarch64'] = '1'
execMap['min-noble-aarch64'] = '1'

devMap = [:]
devMap['docker'] = '/dev/xvda=:8:true:gp2,/dev/xvdd=:80:true:gp2'
Expand All @@ -596,6 +610,7 @@ devMap['min-buster-x64'] = '/dev/xvda=:8:true:gp2,/dev/xvdd=:80:true:gp2'
devMap['docker-32gb-hirsute'] = devMap['docker']
devMap['docker-32gb-focal'] = devMap['docker']
devMap['docker-32gb-jammy'] = devMap['docker']
devMap['docker-32gb-noble'] = devMap['docker']
devMap['min-bookworm-x64'] = '/dev/xvda=:8:true:gp2,/dev/xvdd=:80:true:gp2'
devMap['min-bullseye-x64'] = '/dev/xvda=:8:true:gp2,/dev/xvdd=:80:true:gp2'
devMap['docker-32gb-bullseye'] = '/dev/xvda=:8:true:gp2,/dev/xvdd=:80:true:gp2'
Expand All @@ -605,6 +620,7 @@ devMap['min-centos-7-aarch64'] = '/dev/xvda=:8:true:gp2,/dev/xvdd=:80:true:gp2'
devMap['min-bookworm-aarch64'] = '/dev/xvda=:8:true:gp2,/dev/xvdd=:80:true:gp2'
devMap['min-bullseye-aarch64'] = '/dev/xvda=:8:true:gp2,/dev/xvdd=:80:true:gp2'
devMap['min-jammy-aarch64'] = '/dev/xvda=:8:true:gp2,/dev/xvdd=:80:true:gp2'
devMap['min-noble-aarch64'] = '/dev/xvda=:8:true:gp2,/dev/xvdd=:80:true:gp2'

labelMap = [:]
labelMap['docker'] = ''
Expand All @@ -623,6 +639,7 @@ labelMap['min-buster-x64'] = ''
labelMap['docker-32gb-hirsute'] = ''
labelMap['docker-32gb-focal'] = ''
labelMap['docker-32gb-jammy'] = ''
labelMap['docker-32gb-noble'] = ''
labelMap['min-bookworm-x64'] = ''
labelMap['min-bullseye-x64'] = ''
labelMap['docker-32gb-bullseye'] = ''
Expand All @@ -632,6 +649,7 @@ labelMap['min-centos-7-aarch64'] = ''
labelMap['min-bookworm-aarch64'] = ''
labelMap['min-bullseye-aarch64'] = ''
labelMap['min-jammy-aarch64'] = ''
labelMap['min-noble-aarch64'] = ''

jvmoptsMap = [:]
jvmoptsMap['docker'] = '-Xmx512m -Xms512m'
Expand All @@ -650,6 +668,7 @@ jvmoptsMap['min-buster-x64'] = jvmoptsMap['docker']
jvmoptsMap['docker-32gb-hirsute'] = jvmoptsMap['docker']
jvmoptsMap['docker-32gb-focal'] = jvmoptsMap['docker']
jvmoptsMap['docker-32gb-jammy'] = jvmoptsMap['docker']
jvmoptsMap['docker-32gb-noble'] = jvmoptsMap['docker']
jvmoptsMap['min-bookworm-x64'] = '-Xmx512m -Xms512m --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED'
jvmoptsMap['min-bullseye-x64'] = jvmoptsMap['docker']
jvmoptsMap['docker-32gb-bullseye'] = jvmoptsMap['docker']
Expand All @@ -659,6 +678,7 @@ jvmoptsMap['min-centos-7-aarch64'] = jvmoptsMap['docker']
jvmoptsMap['min-bookworm-aarch64'] = jvmoptsMap['docker']
jvmoptsMap['min-bullseye-aarch64'] = jvmoptsMap['docker']
jvmoptsMap['min-jammy-aarch64'] = jvmoptsMap['docker']
jvmoptsMap['min-noble-aarch64'] = jvmoptsMap['docker']

// https://github.com/jenkinsci/ec2-plugin/blob/ec2-1.41/src/main/java/hudson/plugins/ec2/SlaveTemplate.java
SlaveTemplate getTemplate(String OSType, String AZ) {
Expand Down Expand Up @@ -745,12 +765,14 @@ String region = 'eu-west-1'
getTemplate('docker-32gb-hirsute', "${region}${it}"),
getTemplate('docker-32gb-focal', "${region}${it}"),
getTemplate('docker-32gb-jammy', "${region}${it}"),
getTemplate('docker-32gb-noble', "${region}${it}"),
getTemplate('docker-32gb-bullseye', "${region}${it}"),
getTemplate('docker-32gb-aarch64', "${region}${it}"),
getTemplate('min-centos-7-aarch64', "${region}${it}"),
getTemplate('min-bookworm-aarch64', "${region}${it}"),
getTemplate('min-bullseye-aarch64', "${region}${it}"),
getTemplate('min-jammy-aarch64', "${region}${it}"),
getTemplate('min-noble-aarch64', "${region}${it}"),
], // List<? extends SlaveTemplate> templates
'',
''
Expand Down
Loading

0 comments on commit a4ff9fa

Please sign in to comment.