Merge "Switch to using global-jjb mvn macros"

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

diff --git a/jjb/autorelease/autorelease-macros.yaml b/jjb/autorelease/autorelease-macros.yaml
index f06583210ac81a1b3232201a49d5effca32f8e6d..eab728fb963216663446a94bc1303b555c80a972 100644 (file)
--- a/jjb/autorelease/autorelease-macros.yaml
+++ b/jjb/autorelease/autorelease-macros.yaml
@@ -8,14 +8,6 @@
           default: '{release-tag}'
           description: "The Release train tag to use eg. Beryllium-SR1"
 
-- parameter:
-    name: autorelease-release-branch
-    parameters:
-      - string:
-          name: RELEASE_BRANCH
-          default: '{release-branch}'
-          description: "The Release train branch to base build off eg. stable/beryllium"
-
 - wrapper:
     name: autorelease-build-timeout
     wrappers:
@@ -129,7 +121,7 @@
     builders:
       - shell: !include-raw:
           - ../global-jjb/shell/lftools-install.sh
-          - include-raw-autorelease-release-versions.sh
+          - prepare-release.sh
 
 - builder:
     name: autorelease-get-integration-test-variables
@@ -157,12 +149,11 @@
           fi
 
 - publisher:
-    # include-raw-autorelease-notify-build-failure.sh searches console log for
-    # failures and emails the status to the release mailing list.
+    # Search console log for failures and email status to the release mailing list.
     name: opendaylight-infra-notify-status
     publishers:
       - postbuildscript:
           builders:
-            - shell: !include-raw: include-raw-autorelease-notify-build-failure.sh
-          script-only-if-succeeded: 'False'
-          script-only-if-failed: 'True'
+            - shell: !include-raw: notify-build-failure.sh
+          script-only-if-succeeded: false
+          script-only-if-failed: true