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

diff --git a/jjb/autorelease/autorelease-macros.yaml b/jjb/autorelease/autorelease-macros.yaml
index e6bf110b6..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:
@@ -20,7 +20,7 @@
     name: autorelease-checkout-gerrit-patch
     builders:
       - shell: |
-          #!/bin/bash
+          #!/bin/bash -l
           set -eu -o pipefail
 
           # If the project is autorelease then we do not need to cd
@@ -39,57 +39,39 @@
               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: |
-          virtualenv --system-site-packages $WORKSPACE/venv
+          #!/bin/bash -l
+          set -xe -o pipefail
+          python3 -m venv $WORKSPACE/venv
           source $WORKSPACE/venv/bin/activate
           PYTHON="$WORKSPACE/venv/bin/python"
-          $PYTHON -m pip install --upgrade "pip<10.0.0" setuptools
           $PYTHON -m pip install --upgrade networkx
           $PYTHON -m pip freeze
           ./scripts/determine-merge-order.py
           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
 
@@ -98,7 +80,7 @@
     builders:
       - integration-set-variables
       - shell: |
-          #!/bin/bash
+          #!/bin/bash -l
           set +e  # DO NOT fail build if copying fails.
 
           cp -vf "$WORKSPACE/archives/patches/taglist.log" \
@@ -112,7 +94,7 @@
     # Generate versions.csv containing version of all mvn artifacts in this build.
     builders:
       - shell: |
-          #!/bin/bash
+          #!/bin/bash -l
           set -eu -o pipefail
           ./scripts/generate-artifact-versions.sh
           mkdir -p "$WORKSPACE/archives"
@@ -122,7 +104,6 @@
     name: autorelease-generate-release-patches
     builders:
       - shell: !include-raw:
-          - ../global-jjb/shell/lftools-install.sh
           - prepare-release.sh
 
 - builder: