Revert "Drop controller/magnesium jobs to 4c-4g"

This reverts commit 2c2994c421af76af0221b64d1f32ae3dfbd8b2d8, as
we are running out of memory in verify jobs. We will need to
investigate this further.

Change-Id: I3db785135bf5bf1a80cf7c67185c129ccbfc6d78
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml
index 9d254e29e587b2cb47657b2ea25369d917c7951f..50471c9faf8cbce346eb2162034f5fc77dad2fdc 100644 (file)
--- a/jjb/controller/controller.yaml
+++ b/jjb/controller/controller.yaml
@@ -47,7 +47,8 @@
     java-version: 'openjdk11'
     mvn-settings: 'controller-settings'
     mvn-goals: 'clean deploy -Pintegrationtests,docs'
-    mvn-opts: '-Xmx3072m -Dmaven.compile.fork=true'
+    mvn-opts: '-Xmx4096m -Dmaven.compile.fork=true'
+    build-node: centos7-builder-8c-8g
     build-timeout: 90
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}'
     email-upstream: '[controller] [odlparent] [yangtools] [aaa]'