Decode Base64 before parsing Gerrit comment

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

diff --git a/jjb/autorelease/autorelease-macros.yaml b/jjb/autorelease/autorelease-macros.yaml
index e66dc54b666d246aed896307430c97457daf16f5..a1ab67240d25d3d05c23d53144427b6fb6de22b0 100644 (file)
--- a/jjb/autorelease/autorelease-macros.yaml
+++ b/jjb/autorelease/autorelease-macros.yaml
@@ -39,22 +39,13 @@
               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:
       - shell: |
           #!/bin/bash -l
-          virtualenv --system-site-packages $WORKSPACE/venv
+          set -xe -o pipefail
+          virtualenv -p python3 --system-site-packages $WORKSPACE/venv
           source $WORKSPACE/venv/bin/activate
           PYTHON="$WORKSPACE/venv/bin/python"
           $PYTHON -m pip install --upgrade networkx
@@ -63,11 +54,6 @@
           deactivate
           rm -rf $WORKSPACE/venv
 
-- builder:
-    name: autorelease-maven-deploy
-    builders:
-      - shell: !include-raw: autorelease-maven-deploy.sh
-
 - builder:
     name: autorelease-maven-sources
     builders:
@@ -81,7 +67,7 @@
               -DappendOutput
               {opendaylight-infra-mvn-opts}
           java-opts:
-            - '-Xmx4096m -XX:MaxPermSize=1024m'
+            - '-Xmx4096m'
           settings: '{settings}'
           settings-type: cfp
           global-settings: '{global-settings}'