Skip to content

Commit 9639e89

Browse files
committed
Use defaultBuildDiscarder instead of simpleBuildDiscarder.
Context: https://gitlab.eclipse.org/eclipsefdn/helpdesk/-/issues/7069
1 parent 272aa1b commit 9639e89

File tree

5 files changed

+57
-52
lines changed

5 files changed

+57
-52
lines changed

instances/adoptium.temurin-compliance/jenkins/configuration.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -584,7 +584,7 @@ unclassified:
584584
buildDiscarders:
585585
configuredBuildDiscarders:
586586
- "jobBuildDiscarder"
587-
- simpleBuildDiscarder:
587+
- defaultBuildDiscarder:
588588
discarder:
589589
logRotator:
590590
artifactNumToKeepStr: "50"

instances/adoptium.temurin-compliance/target/config.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -447,6 +447,7 @@
447447
"authorize-project",
448448
"bouncycastle-api",
449449
"build-timeout",
450+
"build-discarder",
450451
"cloudbees-disk-usage-simple",
451452
"cloudbees-folder",
452453
"command-launcher",

instances/adoptium.temurin-compliance/target/jenkins/configuration.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -955,7 +955,7 @@ unclassified:
955955
buildDiscarders:
956956
configuredBuildDiscarders:
957957
- "jobBuildDiscarder"
958-
- simpleBuildDiscarder:
958+
- defaultBuildDiscarder:
959959
discarder:
960960
logRotator:
961961
artifactNumToKeepStr: "50"
@@ -1209,6 +1209,8 @@ tool:
12091209
url: "https://download.eclipse.org/cbi/build-tools/maven-mvnd-1.0.3-linux-amd64.tar.gz"
12101210
- name: "apache-maven-latest"
12111211
home: "/opt/tools/apache-maven/latest"
1212+
- name: "apache-maven-3.9.12"
1213+
home: "/opt/tools/apache-maven/3.9.12"
12121214
- name: "apache-maven-3.9.11"
12131215
home: "/opt/tools/apache-maven/3.9.11"
12141216
- name: "apache-maven-3.9.9"

instances/adoptium.temurin-compliance/target/jenkins/plugins.log

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
Resulting plugin list:
22
Parameterized-Remote-Trigger 3.2.2
3-
analysis-model-api 13.17.0-931.v730d8659ea_9c
3+
analysis-model-api 13.18.0-935.v784ca_107400a_
44
ant 520.vd082ecfb_16a_9
55
antisamy-markup-formatter 173.v680e3a_b_69ff3
66
apache-httpcomponents-client-4-api 4.5.14-269.vfa_2321039a_83
7-
apache-httpcomponents-client-5-api 5.5-170.v023de017ccd7
7+
apache-httpcomponents-client-5-api 5.6-183.ve5a_8a_b_e71e59
88
artifactory 4.0.8
9-
asm-api 9.9-185.va_6c6b_3348b_c3
9+
asm-api 9.9.1-189.vb_5ef2964da_91
1010
authentication-tokens 1.144.v5ff4a_5ec5c33
1111
authorize-project 2.0.0
12-
badge 2.560.v5135054c2e76
12+
badge 2.562.vc3c0b_6925377
1313
bootstrap5-api 5.3.8-895.v4d0d8e47fea_d
1414
bouncycastle-api 2.30.1.82-277.v70ca_0b_877184
1515
branch-api 2.1268.v044a_87612da_8
16-
build-timeout 1.38
17-
build-user-vars-plugin 195.v8c35f9d5c3dc
16+
build-timeout 1.39
17+
build-user-vars-plugin 212.vd6b_e9f6d0cdb_
1818
build-with-parameters 81.ve4a_9c2499d9a
1919
caffeine-api 3.2.3-194.v31a_b_f7a_b_5a_81
20-
checks-api 373.vfe7645102093
20+
checks-api 402.vca_263b_f200e3
2121
cloudbees-disk-usage-simple 256.v20ec4eb_884f1
2222
cloudbees-folder 6.1073.va_7888eb_dd514
2323
command-launcher 123.v37cfdc92ef67
@@ -26,128 +26,128 @@ commons-compress-api 1.28.0-2
2626
commons-lang3-api 3.20.0-109.ve43756e2d2b_4
2727
commons-text-api 1.15.0-210.v7480a_da_70b_9e
2828
config-file-provider 1006.vc7366c201f57
29-
configuration-as-code 2006.v001a_2ca_6b_574
30-
copyartifact 770.va_6c69e063442
31-
credentials 1453.v9b_a_29777a_b_fd
29+
configuration-as-code 2031.veb_a_fdda_b_3ffd
30+
copyartifact 795.ve8e151429b_27
31+
credentials 1480.v2246fd131e83
3232
credentials-binding 702.vfe613e537e88
33-
data-tables-api 2.3.5-1482.vb_47a_3c19f78c
33+
data-tables-api 2.3.5-1497.v38449eb_7d5a_1
3434
display-url-api 2.217.va_6b_de84cc74b_
3535
dtkit-api 3.0.3
36-
durable-task 639.vefb_3d8372f6d
36+
durable-task 651.v1f5e074fc83f
3737
echarts-api 6.0.0-1165.vd1283a_3e37d4
38-
eddsa-api 0.3.0.1-19.vc432d923e5ee
38+
eddsa-api 0.3.0.1-29.v67e9a_1c969b_b_
3939
email-ext 1933.v45cec755423f
40-
embeddable-build-status 627.v0249270b_488e
40+
embeddable-build-status 637.vd878e68178f8
4141
emoji-symbols-api 17.0-57.v8d44b_9a_b_d5ea_
4242
extended-read-permission 68.vd270568a_7520
4343
external-monitor-job 223.vb_fddcf42c9b_3
4444
extra-columns 1.28
4545
font-awesome-api 7.1.0-882.v1dfb_771e3278
46-
forensics-api 3.1772.v99ca_3d83b_9fa_
46+
forensics-api 3.1832.va_1179842528b_
4747
generic-webhook-trigger 2.4.1
4848
ghprb 1.42.2
4949
git 5.8.1
50-
git-client 6.4.1
51-
git-parameter 460.v71e7583a_c099
50+
git-client 6.5.0
51+
git-parameter 462.vdcf3df2ed2ca_
5252
github 1.45.0
5353
github-api 1.330-492.v3941a_032db_2a_
5454
github-branch-source 1917.v9ee8a_39b_3d0d
5555
gitlab-api 6.2.0-111.vf174d6b_8c12e
56-
gitlab-branch-source 736.v10e786eeea_19
57-
gitlab-plugin 1.9.11
58-
gradle 2.16.1149.v711b_998b_0532
59-
groovy-postbuild 272.v52a_03efb_8653
56+
gitlab-branch-source 740.v04f287f9194d
57+
gitlab-plugin 1.9.13
58+
gradle 2.18.1203.v2c96b_1243c72
59+
groovy-postbuild 300.va_253b_2988cb_1
6060
gson-api 2.13.2-173.va_a_092315913c
6161
handy-uri-templates-2-api 2.1.8-38.vcea_5d521d5f3
62-
hashicorp-vault-plugin 371.v884a_4dd60fb_6
63-
http_request 1.23
62+
hashicorp-vault-plugin 377.vc87a_13718939
63+
http_request 1.24
6464
instance-identity 203.v15e81a_1b_7a_38
6565
ionicons-api 94.vcc3065403257
6666
jackson2-api 2.20.1-423.v13951f6b_6532
6767
jakarta-activation-api 2.1.4-1
6868
jakarta-mail-api 2.1.5-1
69-
jakarta-xml-bind-api 4.0.6-10.v9b_7e1d1fc40b_
69+
jakarta-xml-bind-api 4.0.6-12.vb_1833c1231d3
7070
javadoc 354.vee1a_660b_4990
7171
javax-activation-api 1.2.0-8
72-
jaxb 2.3.9-133.vb_ec76a_73f706
72+
jaxb 2.3.9-143.v5979df3304e6
7373
jdk-tool 83.v417146707a_3d
7474
jersey2-api 2.47-165.ve7809a_3e87e0
7575
jersey3-api 3.1.11-4.v77818819c2e1
76-
jira 3.20
76+
jira 3.21
7777
jjwt-api 0.11.5-120.v0268cf544b_89
7878
job-dsl 1.93
7979
jobConfigHistory 1356.ve360da_6c523a_
80-
joda-time-api 2.14.0-149.v1c3ce991d1b_9
80+
joda-time-api 2.14.0-177.vd7e9347b_e7d5
8181
jquery3-api 3.7.1-619.vdb_10e002501a_
8282
jsch 0.2.16-95.v3eecb_55fa_b_78
83-
json-api 20250517-173.v596efb_962a_31
83+
json-api 20251224-185.v0cc18490c62c
8484
json-path-api 2.10.0-202.va_9cc16c1e476
85-
jsoup 1.21.2-66.v6ea_38164b_8a_2
85+
jsoup 1.22.1-76.v9cdb_2456c0e3
8686
junit 1369.v15da_00283f06
87-
kubernetes 4398.vb_b_33d9e7fe23
87+
kubernetes 4419.v36079e3b_eb_5b_
8888
kubernetes-client-api 7.3.1-256.v788a_0b_787114
89-
kubernetes-credentials 206.vde31a_b_0f71a_c
90-
ldap 793.v754d6b_41b_ea_4
89+
kubernetes-credentials 207.v492f58828b_ed
90+
ldap 807.v7d7de30930cf
9191
mailer 525.v2458b_d8a_1a_71
9292
matrix-auth 3.2.9
9393
matrix-project 870.v9db_fcfc2f45b_
9494
maven-plugin 3.27
95-
metrics 4.2.37-489.vb_6db_69b_ce753
95+
metrics 4.2.37-494.v06f9a_939d33a_
9696
mina-sshd-api-common 2.16.0-167.va_269f38cc024
9797
mina-sshd-api-core 2.16.0-167.va_269f38cc024
98-
monitoring 2.5.0
98+
monitoring 2.6.0
9999
okhttp-api 4.12.0-195.vc02552c04ffd
100-
oss-symbols-api 424.ved751e062911
100+
oss-symbols-api 442.v99039087229b_
101101
pam-auth 1.12
102-
parameter-separator 296.v9b_a_90c81160d
102+
parameter-separator 334.v1fc0e534c71d
103103
parameterized-trigger 873.v8b_e37dd8418f
104-
pipeline-build-step 571.v08a_fffd4b_0ce
104+
pipeline-build-step 584.vdb_a_2cc3a_d07a_
105105
pipeline-graph-analysis 245.v88f03631a_b_21
106106
pipeline-graph-view 661.v6003f4542123
107107
pipeline-groovy-lib 787.ve2fef0efdca_6
108108
pipeline-input-step 540.v14b_100d754dd
109-
pipeline-maven 1567.vb_2c3a_2116860
110-
pipeline-maven-api 1567.vb_2c3a_2116860
109+
pipeline-maven 1611.v6a_00c04177b_b_
110+
pipeline-maven-api 1611.v6a_00c04177b_b_
111111
pipeline-milestone-step 138.v78ca_76831a_43
112112
pipeline-model-api 2.2277.v00573e73ddf1
113113
pipeline-model-definition 2.2277.v00573e73ddf1
114114
pipeline-model-extensions 2.2277.v00573e73ddf1
115-
pipeline-rest-api 2.38
115+
pipeline-rest-api 2.39
116116
pipeline-stage-step 322.vecffa_99f371c
117117
pipeline-stage-tags-metadata 2.2277.v00573e73ddf1
118-
pipeline-stage-view 2.38
118+
pipeline-stage-view 2.39
119119
pipeline-utility-steps 2.20.0
120120
plain-credentials 199.v9f8e1f741799
121121
plugin-usage-plugin 4.10
122122
plugin-util-api 6.1192.v30fe6e2837ff
123-
prism-api 1.30.0-630.va_e19d17f83b_0
124-
prometheus 819.v50953a_c560dd
123+
prism-api 1.30.0-701.vf8f8f1f3fd55
124+
prometheus 847.v8440e5c21e7c
125125
promoted-builds 992.va_00888f21b_74
126126
rebuild 338.va_0a_b_50e29397
127127
resource-disposer 0.25
128128
scm-api 724.v7d839074eb_5c
129129
script-security 1385.v7d2d9ec4d909
130-
simple-theme-plugin 211.v5424a_5510e47
130+
simple-theme-plugin 230.v8b_fd91b_b_800c
131131
slack 795.v4b_9705b_e6d47
132132
snakeyaml-api 2.5-143.v93b_c004f89de
133133
sonar 2.18.2
134134
ssh-agent 386.v36cc0c7582f0
135135
ssh-credentials 361.vb_f6760818e8c
136-
ssh-slaves 3.1085.vc64d040efa_85
136+
ssh-slaves 3.1096.v0b_cc466e4323
137137
structs 362.va_b_695ef4fdf9
138138
tap 2.4.4
139139
timestamper 1.30
140140
token-macro 477.vd4f0dc3cb_cf1
141141
trilead-api 2.284.v1974ea_324382
142142
variant 70.va_d9f17f859e0
143-
view-job-filters 405.v9a_5fddc9230d
144-
warnings-ng 12.9848.v5603977006f2
143+
view-job-filters 406.va_0ec67147ee2
144+
warnings-ng 12.9990.v14e88294b_d54
145145
workflow-aggregator 608.v67378e9d3db_1
146146
workflow-api 1384.vdc05a_48f535f
147147
workflow-basic-steps 1098.v808b_fd7f8cf4
148-
workflow-cps 4238.va_6fb_65c1f699
148+
workflow-cps 4254.v0c8e228524ea_
149149
workflow-durable-task-step 1464.v2d3f5c68f84c
150-
workflow-job 1559.va_a_533730b_ea_d
150+
workflow-job 1571.vb_423c255d6d9
151151
workflow-multibranch 821.vc3b_4ea_780798
152152
workflow-scm-step 466.va_d69e602552b_
153153
workflow-step-api 710.v3e456cc85233

instances/adoptium.temurin-compliance/target/k8s/configmap-jenkins-config.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -978,7 +978,7 @@ data:
978978
buildDiscarders:
979979
configuredBuildDiscarders:
980980
- "jobBuildDiscarder"
981-
- simpleBuildDiscarder:
981+
- defaultBuildDiscarder:
982982
discarder:
983983
logRotator:
984984
artifactNumToKeepStr: "50"
@@ -1232,6 +1232,8 @@ data:
12321232
url: "https://download.eclipse.org/cbi/build-tools/maven-mvnd-1.0.3-linux-amd64.tar.gz"
12331233
- name: "apache-maven-latest"
12341234
home: "/opt/tools/apache-maven/latest"
1235+
- name: "apache-maven-3.9.12"
1236+
home: "/opt/tools/apache-maven/3.9.12"
12351237
- name: "apache-maven-3.9.11"
12361238
home: "/opt/tools/apache-maven/3.9.11"
12371239
- name: "apache-maven-3.9.9"

0 commit comments

Comments
 (0)