fix jcasc node configuration for equinox

instances/eclipse.equinox/config.jsonnet

@@ -1,15 +1,15 @@
 {
   project+: {
     fullName: "eclipse.equinox",
-    displayName: "Eclipse Equinox"
+    displayName: "Eclipse Equinox",
     # remoteFSSuffix must be individual among all JIPPs which link the eclipse.platform.releng/jenkins/configuration.yml
     remoteFSSuffix: "equinox",
   },
   jenkins+: {
     plugins+: [
-      "gerrit-code-review",
       "github-checks",
       "git-forensics",
+      "mail-watcher-plugin",
     ],
   },
 }

instances/eclipse.equinox/jiro.jsonnet

@@ -2,25 +2,5 @@ local jiro = import '../../templates/jiro.libsonnet';
 
 jiro+ {
   "config.json"+: import "config.jsonnet",
-  "k8s/statefulset.json"+: {
-    spec+: {
-      template+: {
-        spec+: {
-          containers: [
-            container + {
-              env: [
-                # Required for gerrit-code-review https://github.com/jenkinsci/gerrit-code-review-plugin/releases/tag/gerrit-code-review-0.4.6,
-                if (env.name == "JAVA_OPTS") then
-                  env + {
-                    value: env.value + " -Dhudson.remoting.ClassFilter=com.google.gerrit.extensions.common.AvatarInfo,com.google.gerrit.extensions.common.ReviewerUpdateInfo,com.google.gerrit.extensions.common.ActionInfo,com.google.gerrit.extensions.common.TrackingIdInfo,com.google.gerrit.extensions.common.LabelInfo,com.google.gerrit.extensions.common.ApprovalInfo,com.google.gerrit.extensions.common.RevisionInfo,com.google.gerrit.extensions.common.ChangeInfo,com.google.gerrit.extensions.common.FetchInfo,com.google.gerrit.extensions.common.CommitInfo,com.google.gerrit.extensions.common.WebLinkInfo,com.google.gerrit.extensions.common.GitPerson,com.google.gerrit.extensions.common.FileInfo,com.google.gerrit.extensions.common.VotingRangeInfo"
-                  } else
-                  env
-                for env in super.env
-              ]
-            } for container in super.containers
-          ],
-        },
-      },
-    },
-  },
+  "k8s/statefulset.json"+: import "../eclipse.platform.releng/k8s/statefulset.jsonnet",
 }

instances/eclipse.equinox/k8s/master-known-hosts.yml

@@ -0,0 +1,31 @@
+#*******************************************************************************
+# Copyright (c) 2019 Eclipse Foundation and others.
+# This program and the accompanying materials are made available
+# under the terms of the Eclipse Public License 2.0
+# which is available at http://www.eclipse.org/legal/epl-v20.html,
+# or the MIT License which is available at https://opensource.org/licenses/MIT.
+# SPDX-License-Identifier: EPL-2.0 OR MIT
+#*******************************************************************************
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  labels:
+    org.eclipse.cbi.jiro/project.shortname: "equinox"
+    org.eclipse.cbi.jiro/project.fullName: "eclipse.platform.equinox"
+    org.eclipse.cbi.jiro/kind: "master"
+  annotations:
+    org.eclipse.cbi.jiro/jenkins.version: "latest"
+    org.eclipse.cbi.jiro/jenkins.actualVersion: "2.190.1"
+    org.eclipse.cbi.jiro/kubernetes.master.namespace: "equinox"
+    org.eclipse.cbi.jiro/project.sponsorshipLevel: "S0"
+  namespace: "equinox"
+  name: master-known-hosts
+data:
+  known_hosts: |-
+    208.52.161.179 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC3Mo4/c9Hn6sA594UEGHVxCKbu/QtophcofQIfrX1cJwkxfx/MGjMhllrWw49SfpNPh/VOlR4T7r3xeFq9TM+sDXAii54deTENpqg5q1uBOx9hi+7W8MhKpuJEhwL37kTQHSjcnIcexpm76Tbyd3QtHU3xQzMCjfREfqIAWkWaKbdzNVu1JJRcwqRXDDzPNkoLfYUZtdQi/XiROlX5zYh3/GpQctGkL3y8mdkeUY7RGUDKTjd7osAK59IR30H2KFRfewey9YnMnIKM0cokA8t3KDvAwmXFLQ+iAxG1RFLZQ88iz7agO1clNYFR3+2ersXcMu/AZUoA6sBsBXIJ9419
+    199.229.252.222 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDIDpuYI9V+tjtHK8Tty9ZNgYnkWgCRI4lprI8eRxj8zeJhXH4nZvK2od8dR5N0StvQEt/rzKTlxGm3roF4ibGHQEHyBG1M99LG8/vim9JvogR2sKys6goNHmBICxP99vPo6GTJ8pcb2pmYdY6ZwW05NaFcgaslzg0fdGlJrFYIauERFVGON/+KXPs3u4RBbSm+0sDZB83Sf6ME7OgFRp9EXVIcombNv8smRcb+VTIR+JK2NXvKfFPR8xWrnE9q8h73J8HPi25KRJvuiwQPrYvVrE1oxifxawwHiBxGWr+pSh1KIJiatg71f514vOpFrKK8CuPKRYbRRfzbnzj/i90b
+    199.229.252.231 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDIDpuYI9V+tjtHK8Tty9ZNgYnkWgCRI4lprI8eRxj8zeJhXH4nZvK2od8dR5N0StvQEt/rzKTlxGm3roF4ibGHQEHyBG1M99LG8/vim9JvogR2sKys6goNHmBICxP99vPo6GTJ8pcb2pmYdY6ZwW05NaFcgaslzg0fdGlJrFYIauERFVGON/+KXPs3u4RBbSm+0sDZB83Sf6ME7OgFRp9EXVIcombNv8smRcb+VTIR+JK2NXvKfFPR8xWrnE9q8h73J8HPi25KRJvuiwQPrYvVrE1oxifxawwHiBxGWr+pSh1KIJiatg71f514vOpFrKK8CuPKRYbRRfzbnzj/i90b
+    35.196.120.228 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDWh6lJpuNxDVvfSfLjdjfF6DygBspcxp+rnrv2hHVh16MRAF/qtsMru6kBMPiMaMASUl5d4FfsZnbBIpg51hPY5HaUYx71KQM5QevlXnUqqxkkvHpZxLt1M8Xh+cvo3RPHoFCE00MbMmVFPatUtRMprga7z5SgEKeKdyxcKirwyTHu8zVQmBLrctiIplNII594GphiJr3MUBK/oEf1AoQS+P/r2WFJZlbvlAwlpQ+BHlW1jQUGCAVZcGpfTE4KIAc4/GHUiEDcNR3ZH2/U4DmH0r1F8CqQpAqDw5+aM/dYS4GSaml774XOV4esNfPQYHkkIdfaqFk0S6WQyvHba05P
+    207.254.46.148 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCejyvfy3TfWh2CwKcEwj3BdLRb5ZpCw1k846vwpq/RzKEpIWFXarfH3KcDSDFUXQFSxxDCOokbfvPYxG+MyqmkQZ+g8nAahVX07rKIZu7AudHVPmYNOr8+iwKst38MuBB77UEKWwIaAov8UcM4bC6xPGc7SDVW59bMa151GN/dSDKHqTgKz2vMS62tdUG4D/bVYVYzmwSDOs85wnsX+oZe8TXABEt94jy10uDpgSkABdzNl/0m/C1boSIi3hOBrWuIk676PNj2lcUWz69SSUlmFElI7q9Mo+1TxuA0KQxy9D87mkRQ6lesZv/+CQJMhVuIso+APktrQ9uw3RhAbGoVq3MtANEoy3yv005HKIxnsVhUhkSCB1/EFSerbVBLndVXqY/3R7NgJDI0kbYg8VLLRWCoALveiO40Ss7tiHrTHXY2hFBsrhAzPTCZGLUbCjVc6tN+at1hjXhSJoB0h5uInywgMc1TfiJapihvrFoJlU+OhkJ/+oP6BgwVWDohiGE=
+    35.196.82.59 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCcc2k3hDeh60ivTJCTmFJCbsN5maW3M30lHjs1LH8MMY5Xl2m0bg65mEVwgXH4w3oStDFdxCkXIcQf2pvhLcGYxhIhZj0thju14kGyPEm4lYdQhqEKn1o1ThRR9LAVANBFduE7nb+ohiZQFDpvhxEQzMi4BNCHxGdiriT0TteR044CZEtTtYO5DANZgNzQ0hqYzV2ooaE3ZeswcBQ7KF/aARB6SiAj3QDVvf5TUYtYFlgCwXRwSv9aHWkstrnRgQWI2hZ577BH6NcsDVb6inWIgJyi1o8ykKtoLX7x26HL5MyP854FT7pOhlU/QV84W/o3hdxknDpcaXwX6fukLNYf
+

instances/eclipse.equinox/target/config.json

@@ -45,6 +45,7 @@
                },
                "home": "/home/jenkins",
                "kubernetes": {
+                  "inheritYamlMergeStrategy": true,
                   "resources": {
                      "cpu": {
                         "limit": "2000m",
@@ -88,7 +89,8 @@
                         ],
                         "name": "m2-dir"
                      }
-                  ]
+                  ],
+                  "yamlMergeStrategy": "merge"
                },
                "labels": [
                   "basic"
@@ -138,6 +140,7 @@
                },
                "home": "/home/jenkins",
                "kubernetes": {
+                  "inheritYamlMergeStrategy": true,
                   "resources": {
                      "cpu": {
                         "limit": "2000m",
@@ -181,7 +184,8 @@
                         ],
                         "name": "m2-dir"
                      }
-                  ]
+                  ],
+                  "yamlMergeStrategy": "merge"
                },
                "labels": [
                   "basic-ubuntu"
@@ -231,6 +235,7 @@
                },
                "home": "/home/jenkins",
                "kubernetes": {
+                  "inheritYamlMergeStrategy": true,
                   "resources": {
                      "cpu": {
                         "limit": "2000m",
@@ -274,7 +279,8 @@
                         ],
                         "name": "m2-dir"
                      }
-                  ]
+                  ],
+                  "yamlMergeStrategy": "merge"
                },
                "labels": [
                   "migration",
@@ -326,6 +332,7 @@
                },
                "home": "/home/jenkins",
                "kubernetes": {
+                  "inheritYamlMergeStrategy": true,
                   "resources": {
                      "cpu": {
                         "limit": "2000m",
@@ -369,7 +376,8 @@
                         ],
                         "name": "m2-dir"
                      }
-                  ]
+                  ],
+                  "yamlMergeStrategy": "merge"
                },
                "labels": [
                   "centos-latest",
@@ -482,9 +490,9 @@
          }
       ],
       "plugins": [
-         "gerrit-code-review",
          "github-checks",
-         "git-forensics"
+         "git-forensics",
+         "mail-watcher-plugin"
       ],
       "pluginsForceUpgrade": true,
       "staticAgentCount": 0,
@@ -515,6 +523,7 @@
          "authorize-project",
          "bouncycastle-api",
          "build-timeout",
+         "cloudbees-disk-usage-simple",
          "cloudbees-folder",
          "command-launcher",
          "config-file-provider",
@@ -666,6 +675,7 @@
    "project": {
       "displayName": "Eclipse Equinox",
       "fullName": "eclipse.equinox",
+      "remoteFSSuffix": "equinox",
       "resourcePacks": 1,
       "shortName": "equinox",
       "unixGroupName": "eclipse.equinox"