Assign resource packs to project Eclipse openpass

https://gitlab.eclipse.org/eclipsefdn/helpdesk/-/issues/3686
eclipse-cbi · Oct 10, 2023 · 1be8e9e · 1be8e9e
1 parent 577b44d
commit 1be8e9e
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 27 deletions.
diff --git a/instances/automotive.openpass/config.jsonnet b/instances/automotive.openpass/config.jsonnet
@@ -2,7 +2,7 @@
   project+: {
     fullName: "automotive.openpass",
     displayName: "Eclipse openPASS",
-    resourcePacks: 3
+    resourcePacks: 5
   },
   jenkins+: {
     plugins+: [

diff --git a/instances/automotive.openpass/target/config.json b/instances/automotive.openpass/target/config.json
@@ -436,7 +436,7 @@
    },
    "jenkins": {
       "agentConnectionTimeout": 180,
-      "maxConcurrency": 6,
+      "maxConcurrency": 10,
       "permissions": [
          {
             "grantedPermissions": [
@@ -602,12 +602,12 @@
          },
          "resources": {
             "cpu": {
-               "limit": "2000m",
-               "request": "850m"
+               "limit": "2900m",
+               "request": "1450m"
             },
             "memory": {
-               "limit": "2560Mi",
-               "request": "2560Mi"
+               "limit": "3584Mi",
+               "request": "3584Mi"
             }
          },
          "stsName": "openpass"
@@ -664,7 +664,7 @@
    "project": {
       "displayName": "Eclipse openPASS",
       "fullName": "automotive.openpass",
-      "resourcePacks": 3,
+      "resourcePacks": 5,
       "shortName": "openpass",
       "unixGroupName": "automotive.openpass"
    },

diff --git a/instances/automotive.openpass/target/jenkins/configuration.yml b/instances/automotive.openpass/target/jenkins/configuration.yml
@@ -70,7 +70,7 @@ jenkins:
   clouds:
     - kubernetes:
         name: "kubernetes"
-        containerCapStr: "6"
+        containerCapStr: "10"
         jenkinsUrl: "http://jenkins-ui.openpass.svc.cluster.local/openpass"
         jenkinsTunnel: "jenkins-discovery.openpass.svc.cluster.local:50000"
         maxRequestsPerHostStr: "32"

diff --git a/instances/automotive.openpass/target/jenkins/plugins.log b/instances/automotive.openpass/target/jenkins/plugins.log
@@ -1,5 +1,5 @@
 Resulting plugin list:
-analysis-model-api 11.8.0
+analysis-model-api 11.9.0
 ant 497.v94e7d9fffa_b_9
 antisamy-markup-formatter 162.v0e6ec0fcfcf6
 apache-httpcomponents-client-4-api 4.5.14-208.v438351942757
@@ -20,7 +20,7 @@ config-file-provider 959.vcff671a_4518b_
 configuration-as-code 1714.v09593e830cfa
 credentials 1293.vff276f713473
 credentials-binding 636.v55f1275c7b_27
-data-tables-api 1.13.6-4
+data-tables-api 1.13.6-5
 display-url-api 2.200.vb_9327d658781
 durable-task 523.va_a_22cf15d5e0
 echarts-api 5.4.0-6
@@ -38,7 +38,7 @@ github 1.37.3
 github-api 1.316-451.v15738eef3414
 github-branch-source 1741.va_3028eb_9fd21
 gitlab-api 5.3.0-91.v1f9a_fda_d654f
-gitlab-branch-source 677.v0b_63b_038322b_
+gitlab-branch-source 680.vc179a_1a_37915
 gitlab-plugin 1.7.16
 handy-uri-templates-2-api 2.1.8-22.v77d5b_75e6953
 instance-identity 173.va_37c494ec4e5
@@ -75,8 +75,8 @@ pipeline-build-step 505.v5f0844d8d126
 pipeline-graph-analysis 202.va_d268e64deb_3
 pipeline-groovy-lib 689.veec561a_dee13
 pipeline-input-step 477.v339683a_8d55e
-pipeline-maven 1342.vfc697b_789147
-pipeline-maven-api 1342.vfc697b_789147
+pipeline-maven 1345.va_0ef5530a_5ca_
+pipeline-maven-api 1345.va_0ef5530a_5ca_
 pipeline-milestone-step 111.v449306f708b_7
 pipeline-model-api 2.2144.v077a_d1928a_40
 pipeline-model-definition 2.2144.v077a_d1928a_40
@@ -86,7 +86,7 @@ pipeline-stage-step 305.ve96d0205c1c6
 pipeline-stage-tags-metadata 2.2144.v077a_d1928a_40
 pipeline-stage-view 2.33
 plain-credentials 143.v1b_df8b_d3b_e48
-plugin-util-api 3.5.0
+plugin-util-api 3.6.0
 prism-api 1.29.0-8
 promoted-builds 892.vd6219fc0a_efb
 rebuild 320.v5a_0933a_e7d61
@@ -109,7 +109,7 @@ warnings-ng 10.4.0
 workflow-aggregator 596.v8c21c963d92d
 workflow-api 1283.v99c10937efcb_
 workflow-basic-steps 1042.ve7b_140c4a_e0c
-workflow-cps 3793.v65dec41c3a_c3
+workflow-cps 3802.vd42b_fcf00b_a_c
 workflow-durable-task-step 1289.v4d3e7b_01546b_
 workflow-job 1348.v32a_a_f150910e
 workflow-multibranch 756.v891d88f2cd46

diff --git a/instances/automotive.openpass/target/k8s/configmap-jenkins-config.yml b/instances/automotive.openpass/target/k8s/configmap-jenkins-config.yml
@@ -93,7 +93,7 @@ data:
       clouds:
         - kubernetes:
             name: "kubernetes"
-            containerCapStr: "6"
+            containerCapStr: "10"
             jenkinsUrl: "http://jenkins-ui.openpass.svc.cluster.local/openpass"
             jenkinsTunnel: "jenkins-discovery.openpass.svc.cluster.local:50000"
             maxRequestsPerHostStr: "32"

diff --git a/instances/automotive.openpass/target/k8s/limit-range.json b/instances/automotive.openpass/target/k8s/limit-range.json
@@ -13,7 +13,7 @@
       "limits": [
          {
             "max": {
-               "cpu": "6300m",
+               "cpu": "8300m",
                "memory": "16640Mi"
             },
             "min": {
@@ -32,7 +32,7 @@
                "memory": "256Mi"
             },
             "max": {
-               "cpu": "6000m",
+               "cpu": "8000m",
                "memory": "16384Mi"
             },
             "min": {

diff --git a/instances/automotive.openpass/target/k8s/resource-quotas.json b/instances/automotive.openpass/target/k8s/resource-quotas.json
@@ -11,11 +11,11 @@
    },
    "spec": {
       "hard": {
-         "limits.cpu": "15800m",
-         "limits.memory": "28672Mi",
-         "pods": 7,
-         "requests.cpu": "8050m",
-         "requests.memory": "28672Mi"
+         "limits.cpu": "25900m",
+         "limits.memory": "47104Mi",
+         "pods": 11,
+         "requests.cpu": "13450m",
+         "requests.memory": "47104Mi"
       }
    }
 }
diff --git a/instances/automotive.openpass/target/k8s/statefulset.json b/instances/automotive.openpass/target/k8s/statefulset.json
@@ -74,7 +74,7 @@
                            "command": [
                               "/bin/sh",
                               "-c",
-                              "java -cp /var/cache/jenkins/war/winstone.jar winstone.tools.WinstoneControl shutdown --host=localhost --port=8081 >/dev/termination-log 2>&1"
+                              "java -cp /var/cache/jenkins/war/executable/winstone.jar winstone.tools.WinstoneControl shutdown --host=localhost --port=8081 >/dev/termination-log 2>&1"
                            ]
                         }
                      }
@@ -112,11 +112,11 @@
                   },
                   "resources": {
                      "limits": {
-                        "cpu": "2000m",
-                        "memory": "2560Mi"
+                        "cpu": "2900m",
+                        "memory": "3584Mi"
                      },
                      "requests": {
-                        "cpu": "850m"
+                        "cpu": "1450m"
                      }
                   },
                   "volumeMounts": [