From 5e49641df5c39405e2a0959a8aba1a79c04b990f Mon Sep 17 00:00:00 2001
From: Divya Madala <divyaasm@amazon.com>
Date: Mon, 3 Jun 2024 11:25:01 -0700
Subject: [PATCH] Add changes from #419

Signed-off-by: Divya Madala <divyaasm@amazon.com>
---
 packer/jenkins-agent-al2-arm64.json                | 2 +-
 packer/jenkins-agent-al2-x64.json                  | 2 +-
 packer/jenkins-agent-al2023-arm64.json             | 2 +-
 packer/jenkins-agent-al2023-x64.json               | 2 +-
 packer/jenkins-agent-macos12-x64.json              | 2 +-
 packer/jenkins-agent-ubuntu2004-x64.json           | 2 +-
 packer/jenkins-agent-win2019-x64-gradle-check.json | 2 +-
 packer/jenkins-agent-win2019-x64.json              | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packer/jenkins-agent-al2-arm64.json b/packer/jenkins-agent-al2-arm64.json
index 7e15dc78..3e54c52b 100644
--- a/packer/jenkins-agent-al2-arm64.json
+++ b/packer/jenkins-agent-al2-arm64.json
@@ -1,6 +1,6 @@
 {
   "variables": {
-    "name-base":"Jenkins-Agent-AL2-ARM64",
+    "name-base":"Jenkins-Agent-AL2-ARM64-JDK21",
     "os-version": "AL2",
     "build-region":"us-east-1",
     "build-vpc":"vpc-<>",
diff --git a/packer/jenkins-agent-al2-x64.json b/packer/jenkins-agent-al2-x64.json
index badb32c9..84f3e89d 100644
--- a/packer/jenkins-agent-al2-x64.json
+++ b/packer/jenkins-agent-al2-x64.json
@@ -1,6 +1,6 @@
 {
   "variables": {
-    "name-base":"Jenkins-Agent-AL2-X64",
+    "name-base":"Jenkins-Agent-AL2-X64-JDK21",
     "os-version": "AL2",
     "build-region":"us-east-1",
     "build-vpc":"vpc-<>",
diff --git a/packer/jenkins-agent-al2023-arm64.json b/packer/jenkins-agent-al2023-arm64.json
index 37cab105..3d53b2f1 100644
--- a/packer/jenkins-agent-al2023-arm64.json
+++ b/packer/jenkins-agent-al2023-arm64.json
@@ -1,6 +1,6 @@
 {
   "variables": {
-    "name-base":"Jenkins-Agent-AL2023-ARM64",
+    "name-base":"Jenkins-Agent-AL2023-ARM64-JDK21",
     "os-version": "AL2023",
     "build-region":"us-east-1",
     "build-vpc":"vpc-<>",
diff --git a/packer/jenkins-agent-al2023-x64.json b/packer/jenkins-agent-al2023-x64.json
index 892ef7af..e12fba31 100644
--- a/packer/jenkins-agent-al2023-x64.json
+++ b/packer/jenkins-agent-al2023-x64.json
@@ -1,6 +1,6 @@
 {
   "variables": {
-    "name-base":"Jenkins-Agent-AL2023-X64",
+    "name-base":"Jenkins-Agent-AL2023-X64-JDK21",
     "os-version": "AL2023",
     "build-region":"us-east-1",
     "build-vpc":"vpc-<>",
diff --git a/packer/jenkins-agent-macos12-x64.json b/packer/jenkins-agent-macos12-x64.json
index bb2e041e..7b7027da 100644
--- a/packer/jenkins-agent-macos12-x64.json
+++ b/packer/jenkins-agent-macos12-x64.json
@@ -1,6 +1,6 @@
 {
   "variables":{
-    "ami_name":"Jenkins-Agent-MacOS-X64-Mac1Metal",
+    "ami_name":"Jenkins-Agent-MacOS-X64-Mac1Metal-JDK21",
     "os_version": "12.4",
     "os_architecture": "x86_64_mac",
     "build-region":"us-east-1",
diff --git a/packer/jenkins-agent-ubuntu2004-x64.json b/packer/jenkins-agent-ubuntu2004-x64.json
index 31b2b43a..e4d32ce5 100644
--- a/packer/jenkins-agent-ubuntu2004-x64.json
+++ b/packer/jenkins-agent-ubuntu2004-x64.json
@@ -1,6 +1,6 @@
 {
   "variables": {
-    "name-base":"Jenkins-Agent-Ubuntu2004-X64",
+    "name-base":"Jenkins-Agent-Ubuntu2004-X64-JDK21",
     "os-version": "Ubuntu2004",
     "build-region":"us-east-1",
     "build-vpc":"vpc-<>",
diff --git a/packer/jenkins-agent-win2019-x64-gradle-check.json b/packer/jenkins-agent-win2019-x64-gradle-check.json
index 57325590..2c87eaf3 100644
--- a/packer/jenkins-agent-win2019-x64-gradle-check.json
+++ b/packer/jenkins-agent-win2019-x64-gradle-check.json
@@ -1,6 +1,6 @@
 {
   "variables": {
-    "name-base":"Jenkins-Agent-Windows2019-X64-Gradle-Check",
+    "name-base":"Jenkins-Agent-Windows2019-X64-Gradle-Check-JDK21",
     "os-version": "Windows2019",
     "build-region":"us-east-1",
     "build-vpc":"vpc-<>",
diff --git a/packer/jenkins-agent-win2019-x64.json b/packer/jenkins-agent-win2019-x64.json
index d528d3ea..5e16483e 100644
--- a/packer/jenkins-agent-win2019-x64.json
+++ b/packer/jenkins-agent-win2019-x64.json
@@ -1,6 +1,6 @@
 {
   "variables": {
-    "name-base":"Jenkins-Agent-Windows2019-X64",
+    "name-base":"Jenkins-Agent-Windows2019-X64-JDK21",
     "os-version": "Windows2019",
     "build-region":"us-east-1",
     "build-vpc":"vpc-<>",