feat: move openpass BMW Group resource pack to automotive.scm

Related to https://gitlab.eclipse.org/eclipsefdn/helpdesk/-/issues/5069 Signed-off-by: sebastien.heurtematte <[email protected]>
eclipse-cbi · Oct 9, 2024 · 2d6e412 · 2d6e412
1 parent ae66632
commit 2d6e412
Show file tree

Hide file tree

Showing 14 changed files with 38 additions and 37 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: 5
+    resourcePacks: 3
   },
   jenkins+: {
     plugins+: [

diff --git a/instances/automotive.openpass/target/config.json b/instances/automotive.openpass/target/config.json
@@ -640,7 +640,7 @@
    },
    "jenkins": {
       "agentConnectionTimeout": 180,
-      "maxConcurrency": 10,
+      "maxConcurrency": 6,
       "permissions": [
          {
             "user": {
@@ -819,12 +819,12 @@
          },
          "resources": {
             "cpu": {
-               "limit": "2900m",
-               "request": "1450m"
+               "limit": "2000m",
+               "request": "850m"
             },
             "memory": {
-               "limit": "3584Mi",
-               "request": "3584Mi"
+               "limit": "2560Mi",
+               "request": "2560Mi"
             }
          },
          "stsName": "openpass"
@@ -881,7 +881,7 @@
    "project": {
       "displayName": "Eclipse openPASS",
       "fullName": "automotive.openpass",
-      "resourcePacks": 5,
+      "resourcePacks": 3,
       "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: "10"
+        containerCapStr: "6"
         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/configmap-jenkins-config.yml b/instances/automotive.openpass/target/k8s/configmap-jenkins-config.yml
@@ -93,7 +93,7 @@ data:
       clouds:
         - kubernetes:
             name: "kubernetes"
-            containerCapStr: "10"
+            containerCapStr: "6"
             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": "8300m",
+               "cpu": "6300m",
                "memory": "16896Mi"
             },
             "min": {
@@ -32,7 +32,7 @@
                "memory": "512Mi"
             },
             "max": {
-               "cpu": "8000m",
+               "cpu": "6000m",
                "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": "25900m",
-         "limits.memory": "49664Mi",
-         "pods": 11,
-         "requests.cpu": "13450m",
-         "requests.memory": "49664Mi"
+         "limits.cpu": "15800m",
+         "limits.memory": "30208Mi",
+         "pods": 7,
+         "requests.cpu": "8050m",
+         "requests.memory": "30208Mi"
       }
    }
 }
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": "2900m",
-                        "memory": "3584Mi"
+                        "cpu": "2000m",
+                        "memory": "2560Mi"
                      },
                      "requests": {
-                        "cpu": "1450m"
+                        "cpu": "850m"
                      }
                   },
                   "securityContext": {

diff --git a/instances/automotive.scm/config.jsonnet b/instances/automotive.scm/config.jsonnet
@@ -2,6 +2,7 @@
   project+: {
     fullName: "automotive.scm",
     displayName: "Eclipse SCM",
+    resourcePacks: 3
   },
   seLinuxLevel: "s0:c38,c22",
 }
diff --git a/instances/automotive.scm/target/config.json b/instances/automotive.scm/target/config.json
@@ -640,7 +640,7 @@
    },
    "jenkins": {
       "agentConnectionTimeout": 180,
-      "maxConcurrency": 2,
+      "maxConcurrency": 6,
       "permissions": [
          {
             "user": {
@@ -816,11 +816,11 @@
          "resources": {
             "cpu": {
                "limit": "2000m",
-               "request": "250m"
+               "request": "850m"
             },
             "memory": {
-               "limit": "1536Mi",
-               "request": "1536Mi"
+               "limit": "2560Mi",
+               "request": "2560Mi"
             }
          },
          "stsName": "scm"
@@ -877,7 +877,7 @@
    "project": {
       "displayName": "Eclipse SCM",
       "fullName": "automotive.scm",
-      "resourcePacks": 1,
+      "resourcePacks": 3,
       "shortName": "scm",
       "unixGroupName": "automotive.scm"
    },

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

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

diff --git a/instances/automotive.scm/target/k8s/limit-range.json b/instances/automotive.scm/target/k8s/limit-range.json
@@ -13,8 +13,8 @@
       "limits": [
          {
             "max": {
-               "cpu": "2300m",
-               "memory": "8704Mi"
+               "cpu": "6300m",
+               "memory": "16896Mi"
             },
             "min": {
                "cpu": "200m",
@@ -32,8 +32,8 @@
                "memory": "512Mi"
             },
             "max": {
-               "cpu": "2000m",
-               "memory": "8192Mi"
+               "cpu": "6000m",
+               "memory": "16384Mi"
             },
             "min": {
                "cpu": "100m",

diff --git a/instances/automotive.scm/target/k8s/resource-quotas.json b/instances/automotive.scm/target/k8s/resource-quotas.json
@@ -11,11 +11,11 @@
    },
    "spec": {
       "hard": {
-         "limits.cpu": "6600m",
-         "limits.memory": "10752Mi",
-         "pods": 3,
-         "requests.cpu": "2650m",
-         "requests.memory": "10752Mi"
+         "limits.cpu": "15800m",
+         "limits.memory": "30208Mi",
+         "pods": 7,
+         "requests.cpu": "8050m",
+         "requests.memory": "30208Mi"
       }
    }
 }
diff --git a/instances/automotive.scm/target/k8s/statefulset.json b/instances/automotive.scm/target/k8s/statefulset.json
@@ -113,10 +113,10 @@
                   "resources": {
                      "limits": {
                         "cpu": "2000m",
-                        "memory": "1536Mi"
+                        "memory": "2560Mi"
                      },
                      "requests": {
-                        "cpu": "250m"
+                        "cpu": "850m"
                      }
                   },
                   "securityContext": {