[Sirius] OOM killer regularly occurs on CI Sirius tests (SIGKILL)

https://gitlab.eclipse.org/eclipsefdn/helpdesk/-/issues/3798 - Add pod template with 6 GB of RAM
eclipse-cbi · Oct 13, 2023 · c917ade · c917ade
1 parent 5d8af10
commit c917ade
Show file tree

Hide file tree

Showing 5 changed files with 291 additions and 1 deletion.
diff --git a/instances/modeling.sirius/config.jsonnet b/instances/modeling.sirius/config.jsonnet
@@ -10,4 +10,22 @@
       "zentimestamp",
     ],
   },
+  clouds+: {
+    kubernetes+: {
+      local currentCloud = self,
+      templates+: {
+        "centos-7-6gb": currentCloud.templates["centos-7"] {
+          labels: ["centos-7-6gb"],
+          kubernetes+: {
+            resources+: {
+              memory: {
+                limit: "6144Mi",
+                request: "6144Mi",
+              },
+            },
+          },
+        },
+      },
+    },
+  },
 }
diff --git a/instances/modeling.sirius/target/config.json b/instances/modeling.sirius/target/config.json
@@ -306,6 +306,104 @@
                "startupScript": "/usr/local/bin/jenkins-agent",
                "username": "jenkins"
             },
+            "centos-7-6gb": {
+               "agentWorkdir": "/home/jenkins/jenkins-agent",
+               "docker": {
+                  "aliases": [
+                     "docker.io/eclipsecbijenkins/jipp-migration-agent:3131.vf2b_b_798b_ce99",
+                     "docker.io/eclipsecbijenkins/migration-fat-agent:3131.vf2b_b_798b_ce99",
+                     "docker.io/eclipsecbijenkins/ui-test-agent:3131.vf2b_b_798b_ce99",
+                     "docker.io/eclipsecbijenkins/ui-tests-agent:3131.vf2b_b_798b_ce99"
+                  ],
+                  "context": "centos-7",
+                  "dockerfile": "#*******************************************************************************\n# Copyright (c) 2020 Eclipse Foundation and others.\n# This program and the accompanying materials are made available\n# under the terms of the Eclipse Public License 2.0\n# which is available at http://www.eclipse.org/legal/epl-v20.html,\n# or the MIT License which is available at https://opensource.org/licenses/MIT.\n# SPDX-License-Identifier: EPL-2.0 OR MIT\n#*******************************************************************************\nFROM docker.io/eclipsecbi/jiro-agent-centos-7:spec\n\n# These environment variables will be used in the uid_entrypoint script from the parent image\nENV USER_NAME=\"jenkins\"\nENV HOME=\"/home/jenkins\"\n\nVOLUME [ \"/home/jenkins\", ]\nWORKDIR \"/home/jenkins\"\nENTRYPOINT [ \"uid_entrypoint\", \"/usr/local/bin/jenkins-agent\" ]\n\nADD \"https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3131.vf2b_b_798b_ce99/remoting-3131.vf2b_b_798b_ce99.jar\" \"/usr/share/jenkins/agent.jar\" \nADD \"https://github.com/jenkinsci/docker-inbound-agent/raw/3131.vf2b_b_798b_ce99-5/jenkins-agent\" \"/usr/local/bin/jenkins-agent\"\n\nRUN sed -e 's/JAVA_OPTS/JAVA_OPTS \\$JENKINS_REMOTING_JAVA_OPTS/g' /usr/local/bin/jenkins-agent > /usr/local/bin/jenkins-agent.sed \\\n    && mv /usr/local/bin/jenkins-agent.sed /usr/local/bin/jenkins-agent\n\nRUN chmod 755 \"$(dirname \"/usr/share/jenkins/agent.jar\")\" \\\n  && chmod 644 \"/usr/share/jenkins/agent.jar\" \\\n  && chmod ug+rx \"/usr/local/bin/jenkins-agent\" \\\n  && chgrp 0 \"/usr/local/bin/jenkins-agent\"\n\nUSER 10001:0\n",
+                  "image": "jiro-agent-centos-7",
+                  "registry": "docker.io",
+                  "repository": "eclipsecbi",
+                  "tag": "remoting-3131.vf2b_b_798b_ce99"
+               },
+               "env": {
+                  "JAVA_TOOL_OPTIONS": [ ],
+                  "JENKINS_REMOTING_JAVA_OPTS": [
+                     "-showversion",
+                     "-XshowSettings:vm",
+                     "-Xmx256m",
+                     "-Dorg.jenkinsci.remoting.engine.JnlpProtocol3.disabled=true",
+                     "-Dorg.jenkinsci.plugins.gitclient.CliGitAPIImpl.useSETSID=true"
+                  ],
+                  "OPENJ9_JAVA_OPTIONS": [
+                     "-XX:+IgnoreUnrecognizedVMOptions",
+                     "-XX:+IdleTuningCompactOnIdle",
+                     "-XX:+IdleTuningGcOnIdle"
+                  ],
+                  "_JAVA_OPTIONS": [ ]
+               },
+               "home": "/home/jenkins",
+               "kubernetes": {
+                  "resources": {
+                     "cpu": {
+                        "limit": "2000m",
+                        "request": "1000m"
+                     },
+                     "memory": {
+                        "limit": "6144Mi",
+                        "request": "6144Mi"
+                     }
+                  },
+                  "volumes": [
+                     {
+                        "mounts": [
+                           {
+                              "mountPath": "/home/jenkins/.m2/settings-security.xml",
+                              "subPath": "settings-security.xml"
+                           },
+                           {
+                              "mountPath": "/home/jenkins/.m2/settings.xml",
+                              "subPath": "settings.xml"
+                           }
+                        ],
+                        "name": "m2-secret-dir",
+                        "secret": {
+                           "name": "m2-secret-dir"
+                        }
+                     },
+                     {
+                        "configMap": {
+                           "name": "m2-dir"
+                        },
+                        "mounts": [
+                           {
+                              "mountPath": "/home/jenkins/.m2/toolchains.xml",
+                              "subPath": "toolchains.xml"
+                           },
+                           {
+                              "mountPath": "/home/jenkins/.mavenrc",
+                              "subPath": ".mavenrc"
+                           }
+                        ],
+                        "name": "m2-dir"
+                     }
+                  ]
+               },
+               "labels": [
+                  "centos-7-6gb"
+               ],
+               "maxHeap": "256m",
+               "mode": "EXCLUSIVE",
+               "name": "centos-7",
+               "remoting": {
+                  "jar": "/usr/share/jenkins/agent.jar",
+                  "startupScript": {
+                     "name": "jenkins-agent",
+                     "url": "https://github.com/jenkinsci/docker-inbound-agent/raw/3131.vf2b_b_798b_ce99-5/jenkins-agent",
+                     "version": "3131.vf2b_b_798b_ce99-5"
+                  },
+                  "url": "https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/3131.vf2b_b_798b_ce99/remoting-3131.vf2b_b_798b_ce99.jar",
+                  "version": "3131.vf2b_b_798b_ce99"
+               },
+               "startupScript": "/usr/local/bin/jenkins-agent",
+               "username": "jenkins"
+            },
             "centos-8": {
                "agentWorkdir": "/home/jenkins/jenkins-agent",
                "docker": {

diff --git a/instances/modeling.sirius/target/jenkins/configuration.yml b/instances/modeling.sirius/target/jenkins/configuration.yml
@@ -342,6 +342,92 @@ jenkins:
             - name: m2-dir
               configMap:
                 name: m2-dir
+      - name: "centos-7-6gb"
+        namespace: "sirius"
+        label: "centos-7-6gb"
+        containers:
+        - name: "jnlp"
+          image: docker.io/eclipsecbi/jiro-agent-centos-7:remoting-3131.vf2b_b_798b_ce99
+          alwaysPullImage: true
+          livenessProbe:
+            failureThreshold: 0
+            initialDelaySeconds: 0
+            periodSeconds: 0
+            successThreshold: 0
+            timeoutSeconds: 0
+          resourceLimitCpu: "2000m"
+          resourceRequestCpu: "1000m"
+          resourceLimitMemory: "6144Mi"
+          resourceRequestMemory: "6144Mi"
+          ttyEnabled: true
+          command: ""
+          args: ""
+        instanceCap: -1
+        nodeUsageMode: EXCLUSIVE
+        envVars:
+        - envVar:
+            key: "JAVA_TOOL_OPTIONS"
+            value: ""
+        - envVar:
+            key: "JENKINS_REMOTING_JAVA_OPTS"
+            value: "-showversion -XshowSettings:vm -Xmx256m -Dorg.jenkinsci.remoting.engine.JnlpProtocol3.disabled=true -Dorg.jenkinsci.plugins.gitclient.CliGitAPIImpl.useSETSID=true"
+        - envVar:
+            key: "OPENJ9_JAVA_OPTIONS"
+            value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle"
+        - envVar:
+            key: "_JAVA_OPTIONS"
+            value: ""
+        volumes:
+        - persistentVolumeClaim:
+            claimName: "tools-claim-jiro-sirius"
+            mountPath: "/opt/tools"
+            readOnly: true
+        - configMapVolume:
+            configMapName: "known-hosts"
+            mountPath: "/home/jenkins/.ssh/"
+            subPath: "."
+        - emptyDirVolume:
+            memory: false
+            mountPath: "/home/jenkins/"
+        - emptyDirVolume:
+            memory: false
+            mountPath: "/home/jenkins/.m2/repository"
+        - emptyDirVolume:
+            memory: false
+            mountPath: "/home/jenkins/.m2/wrapper"
+        workspaceVolume:
+          emptyDirWorkspaceVolume:
+            memory: false
+        yaml: |
+          apiVersion: v1
+          kind: Pod
+          spec:
+            containers:
+            - name: jnlp
+              volumeMounts:
+              - name: m2-secret-dir
+                mountPath: /home/jenkins/.m2/settings-security.xml
+                subPath: settings-security.xml
+                readOnly: true
+              - name: m2-secret-dir
+                mountPath: /home/jenkins/.m2/settings.xml
+                subPath: settings.xml
+                readOnly: true
+              - name: m2-dir
+                mountPath: /home/jenkins/.m2/toolchains.xml
+                subPath: toolchains.xml
+                readOnly: true
+              - name: m2-dir
+                mountPath: /home/jenkins/.mavenrc
+                subPath: .mavenrc
+                readOnly: true
+            volumes:
+            - name: m2-secret-dir
+              secret:
+                secretName: m2-secret-dir
+            - name: m2-dir
+              configMap:
+                name: m2-dir
       - name: "centos-8"
         namespace: "sirius"
         label: "centos-latest centos-8"
@@ -452,6 +538,7 @@ security:
           projects-storage.eclipse.org,172.25.25.150 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDKbQI09/IKbvAi3n8a2nluRcaZTB5HgzXwfJv/FUUKwusSwoyMi25jxqCHJbcQco4oAS89i7UeX7YAb2EnrPDd+VebNuTtNfWewxsBjwGI1qKMUsmQc5cLut0p1pe0VRz5ZgnXQeT9FSVA3zha+mJ3OCDtl0svvu3t4jN0zgZZfrmtwz4KQZjlfVv/cPtTKy5+RhBF9Vmto0ZVG+x8DDvxxhi37w90hXjdIb2JpILO4B65A4gEv910DJuwQ6FmrRu6oyqg7+1gnqIPigha7sHKGOX5h+mVrQTYdmPFAvNVawSYpLcEeajh9RI5kKwML6ftnmS/213KkVUUArXCYf4BxBN4h8kpvWqxBOlBNXy6nBLtzuDOdLviOGJ0HbazksuCrcvrT1lV4CfjCOjPlc9zV2r61XpMKBTq/0WPfq/r7LrIkswdszn3yTzvb1/cFCyQfkCGZvkuXJsen5Doi3Ixb0mOO0u+zL17RiS7//PVFs95DszOXqXlOytyB+u9Hmk=
           projects-storage.eclipse.org,172.25.25.150 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBAOUQ8p0E/Ib3uchk+6wEZ8UtBHTBvyI2E+eA/sOXajLQPKP0XIbVyECy8x5OmrrlvOYs+LxxniGJ69UIjiYZqM=
           projects-storage.eclipse.org,172.25.25.150 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAsn6PO2Uemsr7wIUu5x0RnlRcuK36D2sbmYNe2LSKdb
+          [git.eclipse.org]:29418 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA8+KrFs55Aw6ATeoTxSIQOLiYBDALPZ4qN02mvB49a2
 
 unclassified:
   location:

diff --git a/instances/modeling.sirius/target/k8s/configmap-jenkins-config.yml b/instances/modeling.sirius/target/k8s/configmap-jenkins-config.yml
@@ -365,6 +365,92 @@ data:
                 - name: m2-dir
                   configMap:
                     name: m2-dir
+          - name: "centos-7-6gb"
+            namespace: "sirius"
+            label: "centos-7-6gb"
+            containers:
+            - name: "jnlp"
+              image: docker.io/eclipsecbi/jiro-agent-centos-7:remoting-3131.vf2b_b_798b_ce99
+              alwaysPullImage: true
+              livenessProbe:
+                failureThreshold: 0
+                initialDelaySeconds: 0
+                periodSeconds: 0
+                successThreshold: 0
+                timeoutSeconds: 0
+              resourceLimitCpu: "2000m"
+              resourceRequestCpu: "1000m"
+              resourceLimitMemory: "6144Mi"
+              resourceRequestMemory: "6144Mi"
+              ttyEnabled: true
+              command: ""
+              args: ""
+            instanceCap: -1
+            nodeUsageMode: EXCLUSIVE
+            envVars:
+            - envVar:
+                key: "JAVA_TOOL_OPTIONS"
+                value: ""
+            - envVar:
+                key: "JENKINS_REMOTING_JAVA_OPTS"
+                value: "-showversion -XshowSettings:vm -Xmx256m -Dorg.jenkinsci.remoting.engine.JnlpProtocol3.disabled=true -Dorg.jenkinsci.plugins.gitclient.CliGitAPIImpl.useSETSID=true"
+            - envVar:
+                key: "OPENJ9_JAVA_OPTIONS"
+                value: "-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle"
+            - envVar:
+                key: "_JAVA_OPTIONS"
+                value: ""
+            volumes:
+            - persistentVolumeClaim:
+                claimName: "tools-claim-jiro-sirius"
+                mountPath: "/opt/tools"
+                readOnly: true
+            - configMapVolume:
+                configMapName: "known-hosts"
+                mountPath: "/home/jenkins/.ssh/"
+                subPath: "."
+            - emptyDirVolume:
+                memory: false
+                mountPath: "/home/jenkins/"
+            - emptyDirVolume:
+                memory: false
+                mountPath: "/home/jenkins/.m2/repository"
+            - emptyDirVolume:
+                memory: false
+                mountPath: "/home/jenkins/.m2/wrapper"
+            workspaceVolume:
+              emptyDirWorkspaceVolume:
+                memory: false
+            yaml: |
+              apiVersion: v1
+              kind: Pod
+              spec:
+                containers:
+                - name: jnlp
+                  volumeMounts:
+                  - name: m2-secret-dir
+                    mountPath: /home/jenkins/.m2/settings-security.xml
+                    subPath: settings-security.xml
+                    readOnly: true
+                  - name: m2-secret-dir
+                    mountPath: /home/jenkins/.m2/settings.xml
+                    subPath: settings.xml
+                    readOnly: true
+                  - name: m2-dir
+                    mountPath: /home/jenkins/.m2/toolchains.xml
+                    subPath: toolchains.xml
+                    readOnly: true
+                  - name: m2-dir
+                    mountPath: /home/jenkins/.mavenrc
+                    subPath: .mavenrc
+                    readOnly: true
+                volumes:
+                - name: m2-secret-dir
+                  secret:
+                    secretName: m2-secret-dir
+                - name: m2-dir
+                  configMap:
+                    name: m2-dir
           - name: "centos-8"
             namespace: "sirius"
             label: "centos-latest centos-8"
@@ -475,6 +561,7 @@ data:
               projects-storage.eclipse.org,172.25.25.150 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDKbQI09/IKbvAi3n8a2nluRcaZTB5HgzXwfJv/FUUKwusSwoyMi25jxqCHJbcQco4oAS89i7UeX7YAb2EnrPDd+VebNuTtNfWewxsBjwGI1qKMUsmQc5cLut0p1pe0VRz5ZgnXQeT9FSVA3zha+mJ3OCDtl0svvu3t4jN0zgZZfrmtwz4KQZjlfVv/cPtTKy5+RhBF9Vmto0ZVG+x8DDvxxhi37w90hXjdIb2JpILO4B65A4gEv910DJuwQ6FmrRu6oyqg7+1gnqIPigha7sHKGOX5h+mVrQTYdmPFAvNVawSYpLcEeajh9RI5kKwML6ftnmS/213KkVUUArXCYf4BxBN4h8kpvWqxBOlBNXy6nBLtzuDOdLviOGJ0HbazksuCrcvrT1lV4CfjCOjPlc9zV2r61XpMKBTq/0WPfq/r7LrIkswdszn3yTzvb1/cFCyQfkCGZvkuXJsen5Doi3Ixb0mOO0u+zL17RiS7//PVFs95DszOXqXlOytyB+u9Hmk=
               projects-storage.eclipse.org,172.25.25.150 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBAOUQ8p0E/Ib3uchk+6wEZ8UtBHTBvyI2E+eA/sOXajLQPKP0XIbVyECy8x5OmrrlvOYs+LxxniGJ69UIjiYZqM=
               projects-storage.eclipse.org,172.25.25.150 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAsn6PO2Uemsr7wIUu5x0RnlRcuK36D2sbmYNe2LSKdb
+              [git.eclipse.org]:29418 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA8+KrFs55Aw6ATeoTxSIQOLiYBDALPZ4qN02mvB49a2
     
     unclassified:
       location:

diff --git a/instances/modeling.sirius/target/k8s/statefulset.json b/instances/modeling.sirius/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"
                            ]
                         }
                      }