feat: update metro instance, and reset ossrh token

Related to https://gitlab.eclipse.org/eclipsefdn/helpdesk/-/issues/4831 Signed-off-by: sebastien.heurtematte <[email protected]>
eclipse-cbi · Jul 18, 2024 · 6d66b17 · 6d66b17
1 parent d2f6fef
commit 6d66b17
Show file tree

Hide file tree

Showing 4 changed files with 129 additions and 78 deletions.
diff --git a/instances/ee4j.metro/target/config.json b/instances/ee4j.metro/target/config.json
@@ -45,6 +45,7 @@
                },
                "home": "/home/jenkins",
                "kubernetes": {
+                  "inheritYamlMergeStrategy": true,
                   "resources": {
                      "cpu": {
                         "limit": "2000m",
@@ -88,7 +89,8 @@
                         ],
                         "name": "m2-dir"
                      }
-                  ]
+                  ],
+                  "yamlMergeStrategy": "merge"
                },
                "labels": [
                   "basic"
@@ -138,6 +140,7 @@
                },
                "home": "/home/jenkins",
                "kubernetes": {
+                  "inheritYamlMergeStrategy": true,
                   "resources": {
                      "cpu": {
                         "limit": "2000m",
@@ -181,7 +184,8 @@
                         ],
                         "name": "m2-dir"
                      }
-                  ]
+                  ],
+                  "yamlMergeStrategy": "merge"
                },
                "labels": [
                   "basic-ubuntu"
@@ -231,6 +235,7 @@
                },
                "home": "/home/jenkins",
                "kubernetes": {
+                  "inheritYamlMergeStrategy": true,
                   "resources": {
                      "cpu": {
                         "limit": "2000m",
@@ -274,7 +279,8 @@
                         ],
                         "name": "m2-dir"
                      }
-                  ]
+                  ],
+                  "yamlMergeStrategy": "merge"
                },
                "labels": [
                   "migration",
@@ -326,6 +332,7 @@
                },
                "home": "/home/jenkins",
                "kubernetes": {
+                  "inheritYamlMergeStrategy": true,
                   "resources": {
                      "cpu": {
                         "limit": "2000m",
@@ -369,7 +376,8 @@
                         ],
                         "name": "m2-dir"
                      }
-                  ]
+                  ],
+                  "yamlMergeStrategy": "merge"
                },
                "labels": [
                   "centos-latest",
@@ -513,6 +521,7 @@
          "authorize-project",
          "bouncycastle-api",
          "build-timeout",
+         "cloudbees-disk-usage-simple",
          "cloudbees-folder",
          "command-launcher",
          "config-file-provider",

diff --git a/instances/ee4j.metro/target/jenkins/configuration.yml b/instances/ee4j.metro/target/jenkins/configuration.yml
@@ -90,10 +90,6 @@ jenkins:
                   periodSeconds: 0
                   successThreshold: 0
                   timeoutSeconds: 0
-                resourceLimitCpu: "2000m"
-                resourceRequestCpu: "1000m"
-                resourceLimitMemory: "4096Mi"
-                resourceRequestMemory: "4096Mi"
                 ttyEnabled: true
                 command: ""
                 args: ""
@@ -139,6 +135,13 @@ jenkins:
               spec:
                 containers:
                 - name: jnlp
+                  resources:
+                    limits:
+                      cpu: "2000m"
+                      memory: "4096Mi"
+                    requests:
+                      cpu: "1000m"
+                      memory: "4096Mi"
                   volumeMounts:
                   - name: m2-secret-dir
                     mountPath: /home/jenkins/.m2/settings-security.xml
@@ -163,6 +166,8 @@ jenkins:
                 - name: m2-dir
                   configMap:
                     name: m2-dir
+            inheritYamlMergeStrategy: "true"
+            yamlMergeStrategy: "merge"
           - name: "basic-ubuntu"
             namespace: "metro"
             label: "basic-ubuntu"
@@ -176,10 +181,6 @@ jenkins:
                   periodSeconds: 0
                   successThreshold: 0
                   timeoutSeconds: 0
-                resourceLimitCpu: "2000m"
-                resourceRequestCpu: "1000m"
-                resourceLimitMemory: "4096Mi"
-                resourceRequestMemory: "4096Mi"
                 ttyEnabled: true
                 command: ""
                 args: ""
@@ -225,6 +226,13 @@ jenkins:
               spec:
                 containers:
                 - name: jnlp
+                  resources:
+                    limits:
+                      cpu: "2000m"
+                      memory: "4096Mi"
+                    requests:
+                      cpu: "1000m"
+                      memory: "4096Mi"
                   volumeMounts:
                   - name: m2-secret-dir
                     mountPath: /home/jenkins/.m2/settings-security.xml
@@ -249,6 +257,8 @@ jenkins:
                 - name: m2-dir
                   configMap:
                     name: m2-dir
+            inheritYamlMergeStrategy: "true"
+            yamlMergeStrategy: "merge"
           - name: "centos-7"
             namespace: "metro"
             label: "migration jipp-migration centos-7"
@@ -262,10 +272,6 @@ jenkins:
                   periodSeconds: 0
                   successThreshold: 0
                   timeoutSeconds: 0
-                resourceLimitCpu: "2000m"
-                resourceRequestCpu: "1000m"
-                resourceLimitMemory: "4096Mi"
-                resourceRequestMemory: "4096Mi"
                 ttyEnabled: true
                 command: ""
                 args: ""
@@ -311,6 +317,13 @@ jenkins:
               spec:
                 containers:
                 - name: jnlp
+                  resources:
+                    limits:
+                      cpu: "2000m"
+                      memory: "4096Mi"
+                    requests:
+                      cpu: "1000m"
+                      memory: "4096Mi"
                   volumeMounts:
                   - name: m2-secret-dir
                     mountPath: /home/jenkins/.m2/settings-security.xml
@@ -335,6 +348,8 @@ jenkins:
                 - name: m2-dir
                   configMap:
                     name: m2-dir
+            inheritYamlMergeStrategy: "true"
+            yamlMergeStrategy: "merge"
           - name: "centos-8"
             namespace: "metro"
             label: "centos-latest centos-8"
@@ -348,10 +363,6 @@ jenkins:
                   periodSeconds: 0
                   successThreshold: 0
                   timeoutSeconds: 0
-                resourceLimitCpu: "2000m"
-                resourceRequestCpu: "1000m"
-                resourceLimitMemory: "4096Mi"
-                resourceRequestMemory: "4096Mi"
                 ttyEnabled: true
                 command: ""
                 args: ""
@@ -397,6 +408,13 @@ jenkins:
               spec:
                 containers:
                 - name: jnlp
+                  resources:
+                    limits:
+                      cpu: "2000m"
+                      memory: "4096Mi"
+                    requests:
+                      cpu: "1000m"
+                      memory: "4096Mi"
                   volumeMounts:
                   - name: m2-secret-dir
                     mountPath: /home/jenkins/.m2/settings-security.xml
@@ -421,6 +439,8 @@ jenkins:
                 - name: m2-dir
                   configMap:
                     name: m2-dir
+            inheritYamlMergeStrategy: "true"
+            yamlMergeStrategy: "merge"
 security:
   apiToken:
     creationOfLegacyTokenEnabled: false

diff --git a/instances/ee4j.metro/target/jenkins/plugins.log b/instances/ee4j.metro/target/jenkins/plugins.log
@@ -3,28 +3,30 @@ analysis-model-api 12.3.3
 ant 497.v94e7d9fffa_b_9
 antisamy-markup-formatter 162.v0e6ec0fcfcf6
 apache-httpcomponents-client-4-api 4.5.14-208.v438351942757
-apache-httpcomponents-client-5-api 5.3.1-1.0
+apache-httpcomponents-client-5-api 5.3.1-110.v77252fb_d4da_5
 asm-api 9.7-33.v4d23ef79fcc8
-authentication-tokens 1.53.v1c90fd9191a_b_
-authorize-project 1.7.1
+authentication-tokens 1.119.v50285141b_7e1
+authorize-project 1.7.2
 bootstrap5-api 5.3.3-1
-bouncycastle-api 2.30.1.77-225.v26ea_c9455fd9
+bouncycastle-api 2.30.1.78.1-248.ve27176eb_46cb_
 branch-api 2.1169.va_f810c56e895
-build-timeout 1.32
+build-timeout 1.33
 caffeine-api 3.1.8-133.v17b_1ff2e0599
 checks-api 2.2.0
+cloudbees-disk-usage-simple 203.v3f46a_7462b_1a_
 cloudbees-folder 6.928.v7c780211d66e
 command-launcher 107.v773860566e2e
-commons-lang3-api 3.13.0-62.v7d18e55f51e2
-commons-text-api 1.11.0-109.vfe16c66636eb_
+commons-lang3-api 3.14.0-76.vda_5591261cfe
+commons-text-api 1.12.0-119.v73ef73f2345d
 config-file-provider 973.vb_a_80ecb_9a_4d0
 configuration-as-code 1810.v9b_c30a_249a_4c
-credentials 1337.v60b_d7b_c7b_c9f
-credentials-binding 677.vdc9d38cb_254d
-data-tables-api 2.0.7-1
+credentials 1371.vfee6b_095f0a_3
+credentials-binding 681.vf91669a_32e45
+data-tables-api 2.0.8-1
 display-url-api 2.204.vf6fddd8a_8b_e9
 durable-task 555.v6802fe0f0b_82
 echarts-api 5.5.0-1
+eddsa-api 0.3.0-4.v84c6f0f4969e
 email-ext 1814.v404722f34263
 extended-read-permission 53.v6499940139e5
 external-monitor-job 215.v2e88e894db_f8
@@ -33,15 +35,15 @@ font-awesome-api 6.5.2-1
 forensics-api 2.4.0
 ghprb 1.42.2
 git 5.2.2
-git-client 4.7.0
+git-client 5.0.0
 git-parameter 0.9.19
 github 1.39.0
 github-api 1.318-461.v7a_c09c9fa_d63
 github-branch-source 1789.v5b_0c0cea_18c3
 gitlab-api 5.3.0-91.v1f9a_fda_d654f
 gitlab-branch-source 704.vc7f1202d7e14
 gitlab-plugin 1.8.1
-gson-api 2.10.1-15.v0d99f670e0a_7
+gson-api 2.11.0-41.v019fcf6125dc
 handy-uri-templates-2-api 2.1.8-30.v7e777411b_148
 instance-identity 185.v303dc7c645f9
 ionicons-api 74.v93d5eb_813d5f
@@ -50,7 +52,7 @@ jacoco 3.3.6
 jakarta-activation-api 2.1.3-1
 jakarta-mail-api 2.1.3-1
 javadoc 243.vb_b_503b_b_45537
-javax-activation-api 1.2.0-6
+javax-activation-api 1.2.0-7
 jaxb 2.3.9-1
 jdk-tool 73.vddf737284550
 jersey2-api 2.42-147.va_28a_44603b_d5
@@ -62,65 +64,65 @@ jsch 0.2.16-86.v42e010d9484b_
 json-api 20240303-41.v94e11e6de726
 json-path-api 2.9.0-58.v62e3e85b_a_655
 junit 1265.v65b_14fa_f12f0
-kubernetes 4233.vb_67a_0e11a_039
+kubernetes 4253.v7700d91739e5
 kubernetes-client-api 6.10.0-240.v57880ce8b_0b_2
-kubernetes-credentials 173.v04e9c17cffd7
+kubernetes-credentials 174.va_36e093562d9
 ldap 725.v3cb_b_711b_1a_ef
 mailer 472.vf7c289a_4b_420
 matrix-auth 3.2.2
-matrix-project 822.824.v14451b_c0fd42
+matrix-project 832.va_66e270d2946
 maven-plugin 3.23
 metrics 4.2.21-451.vd51df8df52ec
-mina-sshd-api-common 2.12.1-101.v85b_e08b_780dd
-mina-sshd-api-core 2.12.1-101.v85b_e08b_780dd
+mina-sshd-api-common 2.13.1-117.v2f1a_b_66ff91d
+mina-sshd-api-core 2.13.1-117.v2f1a_b_66ff91d
 okhttp-api 4.11.0-172.vda_da_1feeb_c6e
-pam-auth 1.10
+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 710.v4b_94b_077a_808
+pipeline-groovy-lib 727.ve832a_9244dfa_
 pipeline-input-step 495.ve9c153f6067b_
-pipeline-maven 1396.veb_f07b_2fc1d8
-pipeline-maven-api 1396.veb_f07b_2fc1d8
+pipeline-maven 1421.v610fa_b_e2d60e
+pipeline-maven-api 1421.v610fa_b_e2d60e
 pipeline-milestone-step 119.vdfdc43fc3b_9a_
-pipeline-model-api 2.2198.v41dd8ef6dd56
-pipeline-model-definition 2.2198.v41dd8ef6dd56
-pipeline-model-extensions 2.2198.v41dd8ef6dd56
+pipeline-model-api 2.2205.vc9522a_9d5711
+pipeline-model-definition 2.2205.vc9522a_9d5711
+pipeline-model-extensions 2.2205.vc9522a_9d5711
 pipeline-rest-api 2.34
 pipeline-stage-step 312.v8cd10304c27a_
-pipeline-stage-tags-metadata 2.2198.v41dd8ef6dd56
+pipeline-stage-tags-metadata 2.2205.vc9522a_9d5711
 pipeline-stage-view 2.34
-plain-credentials 182.v468b_97b_9dcb_8
+plain-credentials 183.va_de8f1dd5a_2b_
 plugin-util-api 4.1.0
 prism-api 1.29.0-15
-prometheus 770.ve5e758db_606e
-promoted-builds 945.v597f5c6a_d3fd
+prometheus 773.v3b_62d8178eec
+promoted-builds 957.vf5b_cee587563
 rebuild 332.va_1ee476d8f6d
 resource-disposer 0.23
 scm-api 690.vfc8b_54395023
-script-security 1336.vf33a_a_9863911
-simple-theme-plugin 176.v39740c03a_a_f5
+script-security 1341.va_2819b_414686
+simple-theme-plugin 191.vcd207ef9dd24
 snakeyaml-api 2.2-111.vc6598e30cc65
 sonar 2.17.2
 ssh-agent 367.vf9076cd4ee21
 ssh-credentials 337.v395d2403ccd4
-ssh-slaves 2.948.vb_8050d697fec
-structs 337.v1b_04ea_4df7c8
+ssh-slaves 2.973.v0fa_8c0dea_f9f
+structs 338.v848422169819
 timestamper 1.27
 token-macro 400.v35420b_922dcb_
-trilead-api 2.142.v748523a_76693
+trilead-api 2.147.vb_73cc728a_32e
 variant 60.v7290fc0eb_b_cd
 warnings-ng 11.3.0
-workflow-aggregator 596.v8c21c963d92d
-workflow-api 1311.v4250456a_e552
+workflow-aggregator 600.vb_57cdd26fdd7
+workflow-api 1316.v33eb_726c50b_a_
 workflow-basic-steps 1058.vcb_fc1e3a_21a_9
-workflow-cps 3894.3896.vca_2c931e7935
-workflow-durable-task-step 1353.v1891a_b_01da_18
+workflow-cps 3908.vd6b_b_5a_a_54010
+workflow-durable-task-step 1360.v82d13453da_a_f
 workflow-job 1400.v7fd111b_ec82f
-workflow-multibranch 783.va_6eb_ef636fb_d
+workflow-multibranch 783.787.v50539468395f
 workflow-scm-step 427.v4ca_6512e7df1
-workflow-step-api 657.v03b_e8115821b_
-workflow-support 907.v6713a_ed8a_573
-ws-cleanup 0.45
+workflow-step-api 678.v3ee58b_469476
+workflow-support 920.v59f71ce16f04
+ws-cleanup 0.46
 xvnc 1.28