From e773a69326c13fdd5cddb9cbc9b697b81807b3aa Mon Sep 17 00:00:00 2001
From: Jeff Lu <chunglu@amazon.com>
Date: Fri, 19 Apr 2024 09:36:31 -0700
Subject: [PATCH] Applying necessary changes for Jenkins 2.440.2 upgrade

Signed-off-by: Jeff Lu <chunglu@amazon.com>
---
 lib/compute/agent-node-config.ts | 2 +-
 resources/baseJenkins.yaml       | 9 ++++-----
 resources/docker-compose.yml     | 2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/lib/compute/agent-node-config.ts b/lib/compute/agent-node-config.ts
index 5855acfb..4486bb7e 100644
--- a/lib/compute/agent-node-config.ts
+++ b/lib/compute/agent-node-config.ts
@@ -157,7 +157,7 @@ export class AgentNodeConfig {
 
     const agentNodeYamlConfig = [{
       amazonEC2: {
-        cloudName: 'Amazon_ec2_cloud',
+        name: 'Amazon_ec2_cloud',
         region: this.STACKREGION,
         sshKeysCredentialsId: this.SSHEC2KeySecretId,
         templates: configTemplates,
diff --git a/resources/baseJenkins.yaml b/resources/baseJenkins.yaml
index 03689d01..e0cfffcd 100644
--- a/resources/baseJenkins.yaml
+++ b/resources/baseJenkins.yaml
@@ -54,6 +54,9 @@ globalCredentialsConfiguration:
   configuration:
     providerFilter: "none"
     typeFilter: "none"
+appearance:
+  loginTheme:
+    useDefaultTheme: true
 security:
   apiToken:
     creationOfLegacyTokenEnabled: false
@@ -125,7 +128,7 @@ unclassified:
     apiRateLimitChecker: ThrottleForNormalize
   gitHubPluginConfig:
     hookUrl: "http://localhost:8080/github-webhook/"
-  gitSCM:
+  scmGit:
     addGitTagAction: false
     allowSecondFetch: false
     createAccountBasedOnEmail: false
@@ -139,14 +142,10 @@ unclassified:
     storage: "file"
   location:
     adminAddress: "address not configured yet <nobody@nowhere>"
-  login-theme-plugin:
-    useDefaultTheme: true
   mailer:
     charset: "UTF-8"
     useSsl: false
     useTls: false
-  pluginImpl:
-    enableCredentialsFromNode: false
   pollSCM:
     pollingThreadCount: 10
   timestamper:
diff --git a/resources/docker-compose.yml b/resources/docker-compose.yml
index 8edd1f2b..f49da699 100644
--- a/resources/docker-compose.yml
+++ b/resources/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3.8'
 services:
   jenkins:
-    image: opensearchstaging/jenkins:2.387.1-lts-jdk11
+    image: opensearchstaging/jenkins:2.440.2-lts-jdk21
     restart: on-failure
     privileged: true
     tty: true