Merge "Use lf-infra-parameters"

diff --combined jjb/autorelease/autorelease-macros.yaml
index 4a34eaf5a46c023c2ff1445c0715b7b0ed205227,83653e4e54736ec55fac413d3e27d4e7c3d74933..eab728fb963216663446a94bc1303b555c80a972
--- 1/jjb/autorelease/autorelease-macros.yaml
--- 2/jjb/autorelease/autorelease-macros.yaml
+++ b/jjb/autorelease/autorelease-macros.yaml
@@@ -8,14 -8,6 +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:
@@@ -157,11 -149,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

diff --combined jjb/autorelease/prepare-release.sh
index d9c92e7377113915ad27eaab6dfe5299b81da995,661dcd7fa2ab820a534506cd6010700bff6a2a40..0b025ec9b6cd1a4d4b395323364249a736e24ddc
--- 1/jjb/autorelease/prepare-release.sh
--- 2/jjb/autorelease/prepare-release.sh
+++ b/jjb/autorelease/prepare-release.sh
@@@ -16,7 -16,6 +16,6 @@@
  # 4) Create tarball for distribution.
  
  # RELEASE_TAG=Beryllium-SR1  # Example
- # RELEASE_BRANCH=stable/beryllium  # Example
  
  # Set release tag as $STREAM, when no release tag is passed
  RELEASE_TAG="${RELEASE_TAG:-${STREAM^}}"
@@@ -24,8 -23,7 +23,8 @@@
  RELEASE_TAG="${RELEASE_TAG^}"
  
  # Directory to put git format-patches
 -PATCH_DIR="$WORKSPACE/patches"
 +PATCH_DIR="$WORKSPACE/archives/patches"
 +mkdir -p "$PATCH_DIR"
  
  echo "$RELEASE_TAG"
  # Remove this case statement when Carbon is no longer supported.
@@@ -42,15 -40,16 +41,15 @@@ esa
  git submodule foreach "git commit -am \"Release $RELEASE_TAG\" || true"
  git commit -am "Release $RELEASE_TAG"
  
 -mkdir patches
  # TODO: Fix this workaround so that scripts will ensure that taglist.log exists and archived.
  mv taglist.log "$PATCH_DIR" || true
  modules=$(xmlstarlet sel -N x=http://maven.apache.org/POM/4.0.0 -t -m '//x:modules' -v '//x:module' pom.xml)
  for module in $modules; do
      pushd "$module"
-     git format-patch --stdout "origin/$RELEASE_BRANCH" > "$PATCH_DIR/${module//\//-}.patch"
+     git format-patch --stdout "origin/$BRANCH" > "$PATCH_DIR/${module//\//-}.patch"
      git bundle create "$PATCH_DIR/${module//\//-}.bundle" "origin/master..HEAD"
      popd
  done
  
 -tar cvzf patches.tar.gz -C "$WORKSPACE" patches
 +tar cvzf "$PATCH_DIR/patches.tar.gz" -C "$WORKSPACE/archives" patches
  rm "$PATCH_DIR"/*.bundle