X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fautorelease%2Fautorelease-macros.yaml;h=cdfe01cdc6339c754c83bf5b169326274c9c9308;hb=3f3205fc8940fcc4c42eeec9f2aef438c74c7879;hp=60e3cfd9da0e5137d6161e0c56528d5d6f61beed;hpb=d07556fe6e126c6f010c0bfff0246b67a9437353;p=releng%2Fbuilder.git

diff --git a/jjb/autorelease/autorelease-macros.yaml b/jjb/autorelease/autorelease-macros.yaml
index 60e3cfd9d..cdfe01cdc 100644
--- a/jjb/autorelease/autorelease-macros.yaml
+++ b/jjb/autorelease/autorelease-macros.yaml
@@ -5,7 +5,7 @@
     parameters:
       - string:
           name: RELEASE_TAG
-          default: '{release-tag}'
+          default: "{release-tag}"
           description: "The Release train tag to use eg. Beryllium-SR1"
 
 - wrapper:
@@ -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
+          python3 -m venv $WORKSPACE/venv
           source $WORKSPACE/venv/bin/activate
           PYTHON="$WORKSPACE/venv/bin/python"
           $PYTHON -m pip install --upgrade networkx
@@ -63,33 +54,24 @@
           deactivate
           rm -rf $WORKSPACE/venv
 
-- builder:
-    name: autorelease-maven-deploy
-    builders:
-      - shell: !include-raw: autorelease-maven-deploy.sh
-
 - builder:
     name: autorelease-maven-sources
     builders:
       - maven-target:
-          maven-version: '{maven-version}'
-          pom: 'pom.xml'
+          maven-version: "{maven-version}"
+          pom: "pom.xml"
           goals: |
-              dependency:sources
-              --quiet
-              -DoutputFile=$WORKSPACE/sources.log
-              -DappendOutput
-              {opendaylight-infra-mvn-opts}
+            dependency:sources
+            --quiet
+            -DoutputFile=$WORKSPACE/sources.log
+            -DappendOutput
+            {opendaylight-infra-mvn-opts}
           java-opts:
-            - '-Xmx4096m -XX:MaxPermSize=1024m'
-          settings: '{settings}'
+            - "-Xmx4096m"
+          settings: "{settings}"
           settings-type: cfp
-          global-settings: '{global-settings}'
+          global-settings: "{global-settings}"
           global-settings-type: cfp
-
-- builder:
-    name: autorelease-maven-sources-post-process
-    builders:
       - shell: |
           awk '/The following files have NOT been resolved:/,/^$/' sources.log > missing-sources.log