Skip to content

Commit 35cfbf5

Browse files
bwbarrettbwbarrett
committed
jenkins: Re-add date in AMI name
While EC2 doesn't require AMI names be unique, Packer does. So re-add the date and we'll have to deal with the name differences in cleanup. Signed-off-by: Brian Barrett <bbarrett@amazon.com>
1 parent 39bf24b commit 35cfbf5

2 files changed

Lines changed: 21 additions & 16 deletions

File tree

‎jenkins/build-amis.sh‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,7 @@ while getopts "h?a:lpd" opt; do
5151
esac
5252
done
5353

54-
BUILD_DATE=`date +%Y%m%d%H%M`
55-
54+
export BUILD_DATE=`date +%Y%m%d%H%M`
5655
export AWS_IAM_ROLE="jenkins-worker"
5756
export BUILD_TYPE="${build_type}"
5857
export DEPRECATION_DATE="${deprecation_date}"

‎jenkins/jenkins-amis.pkr.hcl‎

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@ packer {
77
}
88
}
99

10+
11+
variable "build_date" {
12+
type = string
13+
default = "${env("BUILD_DATE")}"
14+
}
15+
1016
variable "iam_role" {
1117
type = string
1218
default = "${env("AWS_IAM_ROLE")}"
@@ -56,7 +62,7 @@ source "amazon-ebs" "AmazonLinux2-arm64" {
5662
device_name = "/dev/xvda"
5763
volume_size = 16
5864
}
59-
ami_name = "Jenkins Amazon Linux 2 arm64"
65+
ami_name = "Jenkins Amazon Linux 2 arm64 ${var.build_date}"
6066
deprecate_at = "${var.deprecation_date}"
6167
associate_public_ip_address = true
6268
ena_support = true
@@ -96,7 +102,7 @@ source "amazon-ebs" "AmazonLinux2-x86" {
96102
device_name = "/dev/xvda"
97103
volume_size = 16
98104
}
99-
ami_name = "Jenkins Amazon Linux 2 x86_64"
105+
ami_name = "Jenkins Amazon Linux 2 x86_64 ${var.build_date}"
100106
deprecate_at = "${var.deprecation_date}"
101107
associate_public_ip_address = true
102108
ena_support = true
@@ -129,7 +135,7 @@ source "amazon-ebs" "AmazonLinux2023-arm64" {
129135
device_name = "/dev/sda1"
130136
volume_size = 16
131137
}
132-
ami_name = "Jenkins Amazon Linux 2023 arm64"
138+
ami_name = "Jenkins Amazon Linux 2023 arm64 ${var.build_date}"
133139
deprecate_at = "${var.deprecation_date}"
134140
associate_public_ip_address = true
135141
ena_support = true
@@ -162,7 +168,7 @@ source "amazon-ebs" "AmazonLinux2023-x86" {
162168
device_name = "/dev/sda1"
163169
volume_size = 16
164170
}
165-
ami_name = "Jenkins Amazon Linux 2023 x86"
171+
ami_name = "Jenkins Amazon Linux 2023 x86 ${var.build_date}"
166172
deprecate_at = "${var.deprecation_date}"
167173
associate_public_ip_address = true
168174
ena_support = true
@@ -208,7 +214,7 @@ source "amazon-ebs" "RHEL8-arm64" {
208214
device_name = "/dev/sda1"
209215
volume_size = 16
210216
}
211-
ami_name = "Jenkins RHEL 8 arm64"
217+
ami_name = "Jenkins RHEL 8 arm64 ${var.build_date}"
212218
deprecate_at = "${var.deprecation_date}"
213219
associate_public_ip_address = true
214220
ena_support = true
@@ -249,7 +255,7 @@ source "amazon-ebs" "RHEL8-x86" {
249255
device_name = "/dev/sda1"
250256
volume_size = 16
251257
}
252-
ami_name = "Jenkins RHEL 8 x86_64"
258+
ami_name = "Jenkins RHEL 8 x86_64 ${var.build_date}"
253259
deprecate_at = "${var.deprecation_date}"
254260
associate_public_ip_address = true
255261
ena_support = true
@@ -294,7 +300,7 @@ source "amazon-ebs" "SLES15-x86" {
294300
device_name = "/dev/sda1"
295301
volume_size = 16
296302
}
297-
ami_name = "Jenkins SLES 15 x86_64"
303+
ami_name = "Jenkins SLES 15 x86_64 ${var.build_date}"
298304
deprecate_at = "${var.deprecation_date}"
299305
associate_public_ip_address = true
300306
ena_support = true
@@ -340,7 +346,7 @@ source "amazon-ebs" "Ubuntu1804-x86" {
340346
device_name = "/dev/sda1"
341347
volume_size = 16
342348
}
343-
ami_name = "Jenkins Ubuntu 18.04 x86_64"
349+
ami_name = "Jenkins Ubuntu 18.04 x86_64 ${var.build_date}"
344350
deprecate_at = "${var.deprecation_date}"
345351
associate_public_ip_address = true
346352
ena_support = true
@@ -380,7 +386,7 @@ source "amazon-ebs" "Ubuntu2004-arm64" {
380386
device_name = "/dev/sda1"
381387
volume_size = 16
382388
}
383-
ami_name = "Jenkins Ubuntu 20.04 arm64"
389+
ami_name = "Jenkins Ubuntu 20.04 arm64 ${var.build_date}"
384390
deprecate_at = "${var.deprecation_date}"
385391
associate_public_ip_address = true
386392
ena_support = true
@@ -420,7 +426,7 @@ source "amazon-ebs" "Ubuntu2004-x86" {
420426
device_name = "/dev/sda1"
421427
volume_size = 16
422428
}
423-
ami_name = "Jenkins Ubuntu 20.04 x86_64"
429+
ami_name = "Jenkins Ubuntu 20.04 x86_64 ${var.build_date}"
424430
deprecate_at = "${var.deprecation_date}"
425431
associate_public_ip_address = true
426432
ena_support = true
@@ -460,7 +466,7 @@ source "amazon-ebs" "Ubuntu2204-arm64" {
460466
device_name = "/dev/sda1"
461467
volume_size = 16
462468
}
463-
ami_name = "Jenkins Ubuntu 22.04 arm64"
469+
ami_name = "Jenkins Ubuntu 22.04 arm64 ${var.build_date}"
464470
deprecate_at = "${var.deprecation_date}"
465471
associate_public_ip_address = true
466472
ena_support = true
@@ -500,7 +506,7 @@ source "amazon-ebs" "Ubuntu2204-x86" {
500506
device_name = "/dev/sda1"
501507
volume_size = 16
502508
}
503-
ami_name = "Jenkins Ubuntu 22.04 x86_64"
509+
ami_name = "Jenkins Ubuntu 22.04 x86_64 ${var.build_date}"
504510
deprecate_at = "${var.deprecation_date}"
505511
associate_public_ip_address = true
506512
ena_support = true
@@ -540,7 +546,7 @@ source "amazon-ebs" "Ubuntu2404-arm64" {
540546
device_name = "/dev/sda1"
541547
volume_size = 16
542548
}
543-
ami_name = "Jenkins Ubuntu 24.04 arm64"
549+
ami_name = "Jenkins Ubuntu 24.04 arm64 ${var.build_date}"
544550
deprecate_at = "${var.deprecation_date}"
545551
associate_public_ip_address = true
546552
ena_support = true
@@ -580,7 +586,7 @@ source "amazon-ebs" "Ubuntu2404-x86" {
580586
device_name = "/dev/sda1"
581587
volume_size = 16
582588
}
583-
ami_name = "Jenkins Ubuntu 24.04 x86_64"
589+
ami_name = "Jenkins Ubuntu 24.04 x86_64 ${var.build_date}"
584590
deprecate_at = "${var.deprecation_date}"
585591
associate_public_ip_address = true
586592
ena_support = true

0 commit comments

Comments
 (0)