Assign TNO member resource pack to Eclipse ESCET project

https://gitlab.eclipse.org/eclipsefdn/helpdesk/-/issues/5263
eclipse-cbi · Nov 18, 2024 · c0776f7 · c0776f7
1 parent 9629068
commit c0776f7
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 22 deletions.
diff --git a/instances/technology.escet/config.jsonnet b/instances/technology.escet/config.jsonnet
@@ -2,5 +2,6 @@
   project+: {
     fullName: "technology.escet",
     displayName: "Eclipse ESCET",
+    resourcePacks: 2,
   },
 }
diff --git a/instances/technology.escet/target/config.json b/instances/technology.escet/target/config.json
@@ -640,7 +640,7 @@
    },
    "jenkins": {
       "agentConnectionTimeout": 180,
-      "maxConcurrency": 2,
+      "maxConcurrency": 4,
       "permissions": [
          {
             "user": {
@@ -816,11 +816,11 @@
          "resources": {
             "cpu": {
                "limit": "2000m",
-               "request": "250m"
+               "request": "550m"
             },
             "memory": {
-               "limit": "1536Mi",
-               "request": "1536Mi"
+               "limit": "2048Mi",
+               "request": "2048Mi"
             }
          },
          "stsName": "escet"
@@ -877,7 +877,7 @@
    "project": {
       "displayName": "Eclipse ESCET",
       "fullName": "technology.escet",
-      "resourcePacks": 1,
+      "resourcePacks": 2,
       "shortName": "escet",
       "unixGroupName": "technology.escet"
    },

diff --git a/instances/technology.escet/target/jenkins/configuration.yml b/instances/technology.escet/target/jenkins/configuration.yml
@@ -70,7 +70,7 @@ jenkins:
   clouds:
     - kubernetes:
         name: "kubernetes"
-        containerCapStr: "2"
+        containerCapStr: "4"
         jenkinsUrl: "http://jenkins-ui.escet.svc.cluster.local/escet"
         jenkinsTunnel: "jenkins-discovery.escet.svc.cluster.local:50000"
         maxRequestsPerHostStr: "32"
@@ -702,7 +702,7 @@ unclassified:
     createAccountBasedOnEmail: true
     useExistingAccountWithSameEmail: true
   jobConfigHistory:
-    excludePattern: "queue\\.xml|nodeMonitors\\.xml|UpdateCenter\\.xml|global-build-stats|LockableResourcesManager\\.xml|MilestoneStep\\.xml"
+    excludePattern: "queue\\.xml|nodeMonitors\\.xml|UpdateCenter\\.xml|global-build-stats|LockableResourcesManager\\.xml|MilestoneStep\\.xml|hudson.plugins.xvnc.Xvnc\\.xml"
     maxDaysToKeepEntries: "60"
     maxEntriesPerPage: "12"
     maxHistoryEntries: "500"
@@ -858,7 +858,7 @@ tool:
           - installSource:
               installers:
                 - antFromApache:
-                    id: "1.10.12"
+                    id: "1.10.15"
   maven:
     installations:
       - name: "apache-maven-latest"

diff --git a/instances/technology.escet/target/k8s/configmap-jenkins-config.yml b/instances/technology.escet/target/k8s/configmap-jenkins-config.yml
@@ -93,7 +93,7 @@ data:
       clouds:
         - kubernetes:
             name: "kubernetes"
-            containerCapStr: "2"
+            containerCapStr: "4"
             jenkinsUrl: "http://jenkins-ui.escet.svc.cluster.local/escet"
             jenkinsTunnel: "jenkins-discovery.escet.svc.cluster.local:50000"
             maxRequestsPerHostStr: "32"
@@ -725,7 +725,7 @@ data:
         createAccountBasedOnEmail: true
         useExistingAccountWithSameEmail: true
       jobConfigHistory:
-        excludePattern: "queue\\.xml|nodeMonitors\\.xml|UpdateCenter\\.xml|global-build-stats|LockableResourcesManager\\.xml|MilestoneStep\\.xml"
+        excludePattern: "queue\\.xml|nodeMonitors\\.xml|UpdateCenter\\.xml|global-build-stats|LockableResourcesManager\\.xml|MilestoneStep\\.xml|hudson.plugins.xvnc.Xvnc\\.xml"
         maxDaysToKeepEntries: "60"
         maxEntriesPerPage: "12"
         maxHistoryEntries: "500"
@@ -881,7 +881,7 @@ data:
               - installSource:
                   installers:
                     - antFromApache:
-                        id: "1.10.12"
+                        id: "1.10.15"
       maven:
         installations:
           - name: "apache-maven-latest"

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

diff --git a/instances/technology.escet/target/k8s/resource-quotas.json b/instances/technology.escet/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": "11200m",
+         "limits.memory": "20480Mi",
+         "pods": 5,
+         "requests.cpu": "5350m",
+         "requests.memory": "20480Mi"
       }
    }
 }
diff --git a/instances/technology.escet/target/k8s/statefulset.json b/instances/technology.escet/target/k8s/statefulset.json
@@ -113,10 +113,10 @@
                   "resources": {
                      "limits": {
                         "cpu": "2000m",
-                        "memory": "1536Mi"
+                        "memory": "2048Mi"
                      },
                      "requests": {
-                        "cpu": "250m"
+                        "cpu": "550m"
                      }
                   },
                   "securityContext": { },