diff --git a/instances/technology.omr/config.jsonnet b/instances/technology.omr/config.jsonnet index aa7a9d02f..211a806a5 100644 --- a/instances/technology.omr/config.jsonnet +++ b/instances/technology.omr/config.jsonnet @@ -7,6 +7,7 @@ local permissionsTemplates = import '../../templates/permissions.libsonnet'; }, jenkins+: { staticAgentCount: 40, + mountPrivateKey: true, permissions: permissionsTemplates.projectPermissions($.project.unixGroupName, permissionsTemplates.committerPermissionsList + ["Agent/Connect", "Agent/Disconnect"]) + // https://bugs.eclipse.org/bugs/show_bug.cgi?id=570552 @@ -24,7 +25,6 @@ local permissionsTemplates = import '../../templates/permissions.libsonnet'; "embeddable-build-status", "envinject", "generic-webhook-trigger", - "gerrit-trigger", # required for ssh key for agent connections "gradle", ], }, diff --git a/instances/technology.omr/target/config.json b/instances/technology.omr/target/config.json index de6458db2..7331e274c 100644 --- a/instances/technology.omr/target/config.json +++ b/instances/technology.omr/target/config.json @@ -641,6 +641,7 @@ "jenkins": { "agentConnectionTimeout": 180, "maxConcurrency": 2, + "mountPrivateKey": true, "permissions": [ { "user": { @@ -763,7 +764,6 @@ "embeddable-build-status", "envinject", "generic-webhook-trigger", - "gerrit-trigger", "gradle" ], "pluginsForceUpgrade": true, diff --git a/instances/technology.omr/target/jenkins/configuration.yml b/instances/technology.omr/target/jenkins/configuration.yml index d0b6980d7..2d6e9030e 100644 --- a/instances/technology.omr/target/jenkins/configuration.yml +++ b/instances/technology.omr/target/jenkins/configuration.yml @@ -1305,7 +1305,7 @@ unclassified: createAccountBasedOnEmail: true useExistingAccountWithSameEmail: true jobConfigHistory: - excludePattern: "queue\\.xml|nodeMonitors\\.xml|UpdateCenter\\.xml|global-build-stats|LockableResourcesManager\\.xml|MilestoneStep\\.xml" + excludePattern: "queue\\.xml|nodeMonitors\\.xml|UpdateCenter\\.xml|global-build-stats|LockableResourcesManager\\.xml|MilestoneStep\\.xml|hudson.plugins.xvnc.Xvnc\\.xml" maxDaysToKeepEntries: "60" maxEntriesPerPage: "12" maxHistoryEntries: "500" @@ -1446,7 +1446,7 @@ tool: - installSource: installers: - antFromApache: - id: "1.10.12" + id: "1.10.15" maven: installations: - name: "apache-maven-latest" diff --git a/instances/technology.omr/target/jenkins/plugins-list.txt b/instances/technology.omr/target/jenkins/plugins-list.txt index 0b9877d13..608278e0f 100644 --- a/instances/technology.omr/target/jenkins/plugins-list.txt +++ b/instances/technology.omr/target/jenkins/plugins-list.txt @@ -4,5 +4,4 @@ docker-workflow embeddable-build-status envinject generic-webhook-trigger -gerrit-trigger gradle diff --git a/instances/technology.omr/target/jenkins/plugins.log b/instances/technology.omr/target/jenkins/plugins.log index 0ab1a8a0c..67953cc49 100644 --- a/instances/technology.omr/target/jenkins/plugins.log +++ b/instances/technology.omr/target/jenkins/plugins.log @@ -3,36 +3,36 @@ analysis-model-api 12.9.0 ant 511.v0a_a_1a_334f41b_ antisamy-markup-formatter 162.v0e6ec0fcfcf6 apache-httpcomponents-client-4-api 4.5.14-208.v438351942757 -apache-httpcomponents-client-5-api 5.4-118.v199115451c4d -asm-api 9.7.1-95.v9f552033802a_ +apache-httpcomponents-client-5-api 5.4-124.v31e2987e48f4 +asm-api 9.7.1-97.v4cc844130d97 authentication-tokens 1.119.v50285141b_7e1 -authorize-project 1.7.2 +authorize-project 1.8.1 bootstrap5-api 5.3.3-1 bouncycastle-api 2.30.1.78.1-248.ve27176eb_46cb_ -branch-api 2.1178.v969d9eb_c728e +branch-api 2.1200.v4b_a_3da_2eb_db_4 build-timeout 1.33 caffeine-api 3.1.8-133.v17b_1ff2e0599 checks-api 2.2.1 cloud-stats 336.v788e4055508b_ -cloudbees-disk-usage-simple 203.v3f46a_7462b_1a_ +cloudbees-disk-usage-simple 232.v713eeed2e1f4 cloudbees-folder 6.955.v81e2a_35c08d3 command-launcher 115.vd8b_301cc15d0 commons-lang3-api 3.17.0-84.vb_b_938040b_078 commons-text-api 1.12.0-129.v99a_50df237f7 -config-file-provider 978.v8e85886ffdc4 -configuration-as-code 1850.va_a_8c31d3158b_ +config-file-provider 980.v88956a_a_5d6a_d +configuration-as-code 1873.vea_5814ca_9c93 credentials 1384.vf0a_2ed06f9c6 credentials-binding 681.vf91669a_32e45 data-tables-api 2.1.8-1 display-url-api 2.204.vf6fddd8a_8b_e9 docker-commons 443.v921729d5611d docker-java-api 3.4.0-94.v65ced49b_a_7d5 -docker-plugin 1.6.2 +docker-plugin 1.7.0 docker-workflow 580.vc0c340686b_54 durable-task 577.v2a_8a_4b_7c0247 -echarts-api 5.5.1-1 +echarts-api 5.5.1-4 eddsa-api 0.3.0-4.v84c6f0f4969e -email-ext 1844.v3ea_a_b_842374a_ +email-ext 1849.v6dd03b_f6e423 embeddable-build-status 487.va_0ef04c898a_2 envinject 2.919.v009a_a_1067cd0 envinject-api 1.199.v3ce31253ed13 @@ -41,22 +41,21 @@ external-monitor-job 215.v2e88e894db_f8 extra-columns 1.26 font-awesome-api 6.6.0-2 forensics-api 2.6.0 -generic-webhook-trigger 2.2.2 -gerrit-trigger 2.41.1 +generic-webhook-trigger 2.2.5 ghprb 1.42.2 git 5.5.2 git-client 5.0.0 -git-parameter 0.9.19 +git-parameter 0.10.0 github 1.40.0 github-api 1.321-468.v6a_9f5f2d5a_7e -github-branch-source 1797.v86fdb_4d57d43 +github-branch-source 1807.v50351eb_7dd13 gitlab-api 5.6.0-97.v6603a_83f8690 -gitlab-branch-source 710.v6f19df32544b_ -gitlab-plugin 1.8.1 +gitlab-branch-source 711.v41fb_c8b_2b_7a_e +gitlab-plugin 1.8.2 gradle 2.13.1 -gson-api 2.11.0-41.v019fcf6125dc +gson-api 2.11.0-85.v1f4e87273c33 handy-uri-templates-2-api 2.1.8-30.v7e777411b_148 -hashicorp-vault-plugin 370.v946b_53544a_30 +hashicorp-vault-plugin 371.v884a_4dd60fb_6 instance-identity 201.vd2a_b_5a_468a_a_6 ionicons-api 74.v93d5eb_813d5f jackson2-api 2.17.0-379.v02de8ec9f64c @@ -68,22 +67,22 @@ jaxb 2.3.9-1 jdk-tool 80.v8a_dee33ed6f0 jersey2-api 2.44-151.v6df377fff741 jjwt-api 0.11.5-112.ve82dfb_224b_a_d -jobConfigHistory 1268.v75ce751da_911 -joda-time-api 2.13.0-85.vb_64d1c2921f1 +jobConfigHistory 1283.veb_dfb_00b_5ec0 +joda-time-api 2.13.0-93.v9934da_29b_a_e9 jquery3-api 3.7.1-2 jsch 0.2.16-86.v42e010d9484b_ -json-api 20240303-41.v94e11e6de726 -json-path-api 2.9.0-58.v62e3e85b_a_655 -junit 1304.vc85a_b_ca_96613 -kubernetes 4290.v93ea_4b_b_26a_61 +json-api 20240303-101.v7a_8666713110 +json-path-api 2.9.0-118.v7f23ed82a_8b_8 +junit 1307.vdd5b_2646279e +kubernetes 4296.v20a_7e4d77cf6 kubernetes-client-api 6.10.0-240.v57880ce8b_0b_2 kubernetes-credentials 190.v03c305394deb_ ldap 725.v3cb_b_711b_1a_ef mailer 488.v0c9639c1a_eb_3 -matrix-auth 3.2.2 +matrix-auth 3.2.3 matrix-project 839.vff91cd7e3a_b_2 -maven-plugin 3.23 -metrics 4.2.21-451.vd51df8df52ec +maven-plugin 3.24 +metrics 4.2.21-458.vcf496cb_839e4 mina-sshd-api-common 2.14.0-133.vcc091215a_358 mina-sshd-api-core 2.14.0-133.vcc091215a_358 okhttp-api 4.11.0-172.vda_da_1feeb_c6e @@ -91,7 +90,7 @@ pam-auth 1.11 parameterized-trigger 806.vf6fff3e28c3e pipeline-build-step 540.vb_e8849e1a_b_d8 pipeline-graph-analysis 216.vfd8b_ece330ca_ -pipeline-groovy-lib 730.ve57b_34648c63 +pipeline-groovy-lib 744.v5b_556ee7c253 pipeline-input-step 495.ve9c153f6067b_ pipeline-maven 1457.vf7a_de13b_c0d4 pipeline-maven-api 1457.vf7a_de13b_c0d4 @@ -106,12 +105,12 @@ pipeline-stage-view 2.34 plain-credentials 183.va_de8f1dd5a_2b_ plugin-util-api 5.1.0 prism-api 1.29.0-17 -prometheus 787.v52e8f47488fc +prometheus 795.v995762102f28 promoted-builds 965.vcda_c6a_e0998f rebuild 332.va_1ee476d8f6d resource-disposer 0.24 scm-api 696.v778d637b_a_762 -script-security 1362.v67dc1f0e1b_b_3 +script-security 1367.vdf2fc45f229c simple-theme-plugin 196.v96d9592f4efa_ snakeyaml-api 2.3-123.v13484c65210a_ sonar 2.17.2 @@ -123,17 +122,17 @@ timestamper 1.27 token-macro 400.v35420b_922dcb_ trilead-api 2.147.vb_73cc728a_32e variant 60.v7290fc0eb_b_cd -warnings-ng 11.9.0 +warnings-ng 11.10.0 workflow-aggregator 600.vb_57cdd26fdd7 workflow-api 1336.vee415d95c521 workflow-basic-steps 1058.vcb_fc1e3a_21a_9 -workflow-cps 3969.vdc9d3a_efcc6a_ +workflow-cps 3990.vd281dd77a_388 workflow-durable-task-step 1371.vb_7cec8f3b_95e workflow-job 1436.vfa_244484591f workflow-multibranch 795.ve0cb_1f45ca_9a_ workflow-scm-step 427.v4ca_6512e7df1 workflow-step-api 678.v3ee58b_469476 -workflow-support 926.v9f4f9b_b_98c19 +workflow-support 932.vb_555de1b_a_b_94 ws-cleanup 0.47 xvnc 1.28 diff --git a/instances/technology.omr/target/k8s/configmap-jenkins-config.yml b/instances/technology.omr/target/k8s/configmap-jenkins-config.yml index 84cad9953..6cb34d926 100644 --- a/instances/technology.omr/target/k8s/configmap-jenkins-config.yml +++ b/instances/technology.omr/target/k8s/configmap-jenkins-config.yml @@ -1328,7 +1328,7 @@ data: createAccountBasedOnEmail: true useExistingAccountWithSameEmail: true jobConfigHistory: - excludePattern: "queue\\.xml|nodeMonitors\\.xml|UpdateCenter\\.xml|global-build-stats|LockableResourcesManager\\.xml|MilestoneStep\\.xml" + excludePattern: "queue\\.xml|nodeMonitors\\.xml|UpdateCenter\\.xml|global-build-stats|LockableResourcesManager\\.xml|MilestoneStep\\.xml|hudson.plugins.xvnc.Xvnc\\.xml" maxDaysToKeepEntries: "60" maxEntriesPerPage: "12" maxHistoryEntries: "500" @@ -1469,7 +1469,7 @@ data: - installSource: installers: - antFromApache: - id: "1.10.12" + id: "1.10.15" maven: installations: - name: "apache-maven-latest"