Revert "Make controller jobs use 16GB nodes"

This reverts commit 54574339603cad1d125418ba144bb5b7e5529192.

Change-Id: I6913e1d90b8f0a0dc7e24c64857a3f6066e62eed
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml
index a18d7d4794023e5a389804dca76f11a9a9f8928c..f9debfbb76fb86fe9717229c972f345d95c0508e 100644 (file)
--- a/jjb/controller/controller.yaml
+++ b/jjb/controller/controller.yaml
@@ -24,8 +24,6 @@
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}'
     email-upstream: '[controller] [odlparent] [yangtools] [aaa]'
     archive-artifacts: ''
-    # Temporary workaround for SFT failure with karaf4-features
-    build-node: centos7-java-builder-4c-16g
 
 - project:
     name: controller-boron