diff --git a/jenkins/ansible/roles/setup_jenkins_head/templates/jenkins-agent.service.j2 b/jenkins/ansible/roles/setup_jenkins_head/templates/jenkins-agent.service.j2 index 37bb2b19..d752a919 100644 --- a/jenkins/ansible/roles/setup_jenkins_head/templates/jenkins-agent.service.j2 +++ b/jenkins/ansible/roles/setup_jenkins_head/templates/jenkins-agent.service.j2 @@ -12,7 +12,7 @@ ExecStart=/usr/bin/docker run --rm --name %N \ --mount type=bind,source=/var/jenkins/persistent_data/userContent/relay-docs,target=/var/relay-docs \ --mount type=bind,source=/var/jenkins/persistent_data/userContent/vta-docs,target=/var/vta-docs \ --network=jenkins \ - jenkins/ssh-agent \ + jenkins/ssh-agent:jdk17 \ "{{ lookup('env', 'JENKINS_PUB_KEY') }}" ExecStop=docker stop -t 2 %N diff --git a/jenkins/docker/Dockerfile b/jenkins/docker/Dockerfile index bceff185..90095bac 100644 --- a/jenkins/docker/Dockerfile +++ b/jenkins/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM jenkins/jenkins:2.462.1-lts-jdk17 +FROM jenkins/jenkins:2.528.3-lts-jdk17 ENV JAVA_OPTS=-Djenkins.install.runSetupWizard=false ENV JENKINS_OPTS=--sessionTimeout=10080 ENV CASC_JENKINS_CONFIG=/var/jenkins_home/casc diff --git a/jenkins/docker/plugins.txt b/jenkins/docker/plugins.txt index 529892db..83bf4e06 100644 --- a/jenkins/docker/plugins.txt +++ b/jenkins/docker/plugins.txt @@ -1,4 +1,4 @@ -authorize-project:1.7.2 +authorize-project:1.7.3 aws-java-sdk-ec2:1.12.767-467.vb_e93f0c614b_6 aws-java-sdk-minimal:1.12.767-467.vb_e93f0c614b_6 basic-branch-build-strategies:81.v05e333931c7d @@ -23,7 +23,7 @@ ssh-credentials:343.v884f71d78167 sshd:3.330.vc866a_8389b_58 ssh-slaves:2.846.v1b_70190624f5 strict-crumb-issuer:2.1.0 -timestamper:1.20 +timestamper:1.29 token-macro:400.v35420b_922dcb_ workflow-aggregator:590.v6a_d052e5a_a_b_5 workflow-multibranch:795.ve0cb_1f45ca_9a_ diff --git a/jenkins/docker/prod/base_config.yaml b/jenkins/docker/prod/base_config.yaml index 0cbef522..1313067f 100644 --- a/jenkins/docker/prod/base_config.yaml +++ b/jenkins/docker/prod/base_config.yaml @@ -1,14 +1,10 @@ jenkins: - agentProtocols: - - "JNLP4-connect" - - "Ping" crumbIssuer: strict: checkSessionMatch: false disableRememberMe: false markupFormatter: "plainText" mode: EXCLUSIVE - myViewsTabBar: "standard" nodes: - permanent: labelString: "doc" @@ -99,7 +95,7 @@ unclassified: apiRateLimitChecker: ThrottleForNormalize gitHubPluginConfig: hookUrl: "https://ci.tlcpack.ai/github-webhook/" - gitSCM: + scmGit: createAccountBasedOnEmail: false showEntireCommitSummaryInChanges: false useExistingAccountWithSameEmail: false