Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Upgrade] Add required changes for Jenkins 2.426.3 upgrade #427

Merged
merged 1 commit into from
Jun 3, 2024
Merged

[Upgrade] Add required changes for Jenkins 2.426.3 upgrade #427

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/compute/agent-node-config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
9 changes: 4 additions & 5 deletions resources/baseJenkins.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@ globalCredentialsConfiguration:
configuration:
providerFilter: "none"
typeFilter: "none"
appearance:
loginTheme:
useDefaultTheme: true
security:
apiToken:
creationOfLegacyTokenEnabled: false
Expand Down Expand Up @@ -125,7 +128,7 @@ unclassified:
apiRateLimitChecker: ThrottleForNormalize
gitHubPluginConfig:
hookUrl: "http://localhost:8080/github-webhook/"
gitSCM:
scmGit:
addGitTagAction: false
allowSecondFetch: false
createAccountBasedOnEmail: false
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion resources/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Loading