Use the new jenkins image (#427)

Signed-off-by: Divya Madala <[email protected]>
opensearch-project · Jun 3, 2024 · f568ae1 · f568ae1
1 parent 6d7b3bf
commit f568ae1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git 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
@@ -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
@@ -1,7 +1,7 @@
 version: '3.8'
 services:
   jenkins:
-    image: opensearchstaging/jenkins:2.387.1-lts-jdk11
+    image: opensearchstaging/jenkins:2.426.3-lts-jdk21
     restart: on-failure
     privileged: true
     tty: true