fix: jcasc node configuration for equinox

Signed-off-by: sebastien.heurtematte <[email protected]>
eclipse-cbi · Jul 11, 2024 · a0df7ff · a0df7ff
1 parent 7be3a3c
commit a0df7ff
Show file tree

Hide file tree

Showing 6 changed files with 628 additions and 84 deletions.
diff --git a/instances/eclipse.equinox/config.jsonnet b/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",
     ],
   },
 }
diff --git a/instances/eclipse.equinox/target/config.json b/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"