Add resource packs and remove b9qls-windows-10 machine on openPASS

JIPP
eclipse-cbi · Oct 29, 2024 · ab73486 · ab73486
1 parent 0bf563b
commit ab73486
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 93 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: 13
   },
   jenkins+: {
     plugins+: [

diff --git a/instances/automotive.openpass/jenkins/configuration.yml b/instances/automotive.openpass/jenkins/configuration.yml
@@ -1,27 +1,5 @@
 jenkins:
   nodes:
-  - permanent:
-      labelString: "windows"
-      launcher:
-        inbound:
-          webSocket: true
-          workDirSettings:
-            disabled: false
-            failIfWorkDirIsMissing: false
-            internalDir: "remoting"
-      mode: EXCLUSIVE
-      name: "b9qls-windows-10"
-      nodeDescription: "Windows 10 Pro N, no login session, hosted on Azure"
-      remoteFS: "C:\\Users\\genie.simopenpass\\jenkins_agent"
-      retentionStrategy: "always"
-      nodeProperties:
-      - watcher:
-          offlineAddresses: "[email protected]"
-          onlineAddresses: "[email protected]"
-      - toolLocation:
-          locations:
-          - home: "C:\\Program Files\\Git\\bin\\git"
-            key: "hudson.plugins.git.GitTool$DescriptorImpl@Default"
   - permanent:
       labelString: "windows10"
       launcher:

diff --git a/instances/automotive.openpass/target/config.json b/instances/automotive.openpass/target/config.json
@@ -640,7 +640,7 @@
    },
    "jenkins": {
       "agentConnectionTimeout": 180,
-      "maxConcurrency": 6,
+      "maxConcurrency": 26,
       "permissions": [
          {
             "user": {
@@ -819,12 +819,12 @@
          },
          "resources": {
             "cpu": {
-               "limit": "2000m",
-               "request": "850m"
+               "limit": "7700m",
+               "request": "3850m"
             },
             "memory": {
-               "limit": "2560Mi",
-               "request": "2560Mi"
+               "limit": "7680Mi",
+               "request": "7680Mi"
             }
          },
          "stsName": "openpass"
@@ -881,7 +881,7 @@
    "project": {
       "displayName": "Eclipse openPASS",
       "fullName": "automotive.openpass",
-      "resourcePacks": 3,
+      "resourcePacks": 13,
       "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: "26"
         jenkinsUrl: "http://jenkins-ui.openpass.svc.cluster.local/openpass"
         jenkinsTunnel: "jenkins-discovery.openpass.svc.cluster.local:50000"
         maxRequestsPerHostStr: "32"
@@ -624,28 +624,6 @@ jenkins:
             inheritYamlMergeStrategy: "true"
             yamlMergeStrategy: "merge"
   nodes:
-    - permanent:
-        labelString: "windows"
-        launcher:
-          inbound:
-            webSocket: true
-            workDirSettings:
-              disabled: false
-              failIfWorkDirIsMissing: false
-              internalDir: "remoting"
-        mode: EXCLUSIVE
-        name: "b9qls-windows-10"
-        nodeDescription: "Windows 10 Pro N, no login session, hosted on Azure"
-        remoteFS: "C:\\Users\\genie.simopenpass\\jenkins_agent"
-        retentionStrategy: "always"
-        nodeProperties:
-          - watcher:
-              offlineAddresses: "[email protected]"
-              onlineAddresses: "[email protected]"
-          - toolLocation:
-              locations:
-                - home: "C:\\Program Files\\Git\\bin\\git"
-                  key: "hudson.plugins.git.GitTool$DescriptorImpl@Default"
     - permanent:
         labelString: "windows10"
         launcher:

diff --git a/instances/automotive.openpass/target/jenkins/plugins.log b/instances/automotive.openpass/target/jenkins/plugins.log
@@ -4,7 +4,7 @@ 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_
+asm-api 9.7.1-97.v4cc844130d97
 authentication-tokens 1.119.v50285141b_7e1
 authorize-project 1.7.2
 bootstrap5-api 5.3.3-1
@@ -26,7 +26,7 @@ credentials-binding 681.vf91669a_32e45
 data-tables-api 2.1.8-1
 display-url-api 2.204.vf6fddd8a_8b_e9
 durable-task 577.v2a_8a_4b_7c0247
-echarts-api 5.5.1-1
+echarts-api 5.5.1-3
 eddsa-api 0.3.0-4.v84c6f0f4969e
 email-ext 1844.v3ea_a_b_842374a_
 extended-read-permission 53.v6499940139e5
@@ -44,7 +44,7 @@ github-branch-source 1797.v86fdb_4d57d43
 gitlab-api 5.6.0-97.v6603a_83f8690
 gitlab-branch-source 710.v6f19df32544b_
 gitlab-plugin 1.8.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
 instance-identity 201.vd2a_b_5a_468a_a_6
@@ -62,9 +62,9 @@ jobConfigHistory 1268.v75ce751da_911
 joda-time-api 2.13.0-85.vb_64d1c2921f1
 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
+json-api 20240303-101.v7a_8666713110
+json-path-api 2.9.0-118.v7f23ed82a_8b_8
+junit 1307.vdd5b_2646279e
 kubernetes 4290.v93ea_4b_b_26a_61
 kubernetes-client-api 6.10.0-240.v57880ce8b_0b_2
 kubernetes-credentials 190.v03c305394deb_
@@ -104,7 +104,7 @@ rebuild 332.va_1ee476d8f6d
 resource-disposer 0.24
 run-condition 1.7
 scm-api 696.v778d637b_a_762
-script-security 1362.v67dc1f0e1b_b_3
+script-security 1365.v4778ca_84b_de5
 simple-theme-plugin 196.v96d9592f4efa_
 snakeyaml-api 2.3-123.v13484c65210a_
 sonar 2.17.2
@@ -126,7 +126,7 @@ 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 930.vf51d22b_ce488
 ws-cleanup 0.47
 xvnc 1.28
 
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: "26"
             jenkinsUrl: "http://jenkins-ui.openpass.svc.cluster.local/openpass"
             jenkinsTunnel: "jenkins-discovery.openpass.svc.cluster.local:50000"
             maxRequestsPerHostStr: "32"
@@ -647,28 +647,6 @@ data:
                 inheritYamlMergeStrategy: "true"
                 yamlMergeStrategy: "merge"
       nodes:
-        - permanent:
-            labelString: "windows"
-            launcher:
-              inbound:
-                webSocket: true
-                workDirSettings:
-                  disabled: false
-                  failIfWorkDirIsMissing: false
-                  internalDir: "remoting"
-            mode: EXCLUSIVE
-            name: "b9qls-windows-10"
-            nodeDescription: "Windows 10 Pro N, no login session, hosted on Azure"
-            remoteFS: "C:\\Users\\genie.simopenpass\\jenkins_agent"
-            retentionStrategy: "always"
-            nodeProperties:
-              - watcher:
-                  offlineAddresses: "[email protected]"
-                  onlineAddresses: "[email protected]"
-              - toolLocation:
-                  locations:
-                    - home: "C:\\Program Files\\Git\\bin\\git"
-                      key: "hudson.plugins.git.GitTool$DescriptorImpl@Default"
         - permanent:
             labelString: "windows10"
             launcher:

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": "16896Mi"
             },
             "min": {
@@ -32,7 +32,7 @@
                "memory": "512Mi"
             },
             "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": "30208Mi",
-         "pods": 7,
-         "requests.cpu": "8050m",
-         "requests.memory": "30208Mi"
+         "limits.cpu": "67500m",
+         "limits.memory": "127488Mi",
+         "pods": 27,
+         "requests.cpu": "35050m",
+         "requests.memory": "127488Mi"
       }
    }
 }
diff --git a/instances/automotive.openpass/target/k8s/statefulset.json b/instances/automotive.openpass/target/k8s/statefulset.json
@@ -112,11 +112,11 @@
                   },
                   "resources": {
                      "limits": {
-                        "cpu": "2000m",
-                        "memory": "2560Mi"
+                        "cpu": "7700m",
+                        "memory": "7680Mi"
                      },
                      "requests": {
-                        "cpu": "850m"
+                        "cpu": "3850m"
                      }
                   },
                   "securityContext": {