Merge "Mention which release in commit message"

[releng/builder.git] / jjb / autorelease / autorelease-macros.yaml

diff --git a/jjb/autorelease/autorelease-macros.yaml b/jjb/autorelease/autorelease-macros.yaml
index b9edf7feb3d6b913077fd3de2235e55459c5bddb..217bdddcc184ce28cf0edc3ca6ac261a65a51a08 100644 (file)
--- a/jjb/autorelease/autorelease-macros.yaml
+++ b/jjb/autorelease/autorelease-macros.yaml
@@ -39,16 +39,6 @@
               git clean -dff
           fi
 
-- builder:
-    name: autorelease-cfp
-    builders:
-      - config-file-provider:
-          files:
-            - file-id: 'autorelease-settings'
-              variable: 'SETTINGS_FILE'
-            - file-id: 'global-settings'
-              variable: 'GLOBAL_SETTINGS_FILE'
-
 - builder:
     name: autorelease-determine-merge-order
     builders:
@@ -76,7 +66,7 @@
               -DappendOutput
               {opendaylight-infra-mvn-opts}
           java-opts:
-            - '-Xmx4096m -XX:MaxPermSize=1024m'
+            - '-Xmx4096m'
           settings: '{settings}'
           settings-type: cfp
           global-settings: '{global-settings}'