X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fautorelease%2Fprepare-release.sh;h=59c0a94eeacf5b5492d44aa9994e84749d0f37c7;hb=1d9d9b093795c802057ae279ab017ce45984264d;hp=1208da836663cbce8a7e80a60c1d721ea435316d;hpb=e781ea36786462732170fb4ead81b39d930fc9bd;p=releng%2Fbuilder.git

diff --git a/jjb/autorelease/prepare-release.sh b/jjb/autorelease/prepare-release.sh
index 1208da836..59c0a94ee 100644
--- a/jjb/autorelease/prepare-release.sh
+++ b/jjb/autorelease/prepare-release.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -l
 # SPDX-License-Identifier: EPL-1.0
 ##############################################################################
 # Copyright (c) 2015, 2017 The Linux Foundation and others.
@@ -33,30 +33,25 @@ echo autorelease "$(git rev-parse --verify HEAD)" "${RELEASE_TAG}" \
     | tee -a "$PATCH_DIR/taglist.log"
 # Disable SC2154 because we want $path to be the submodule parameter not the shell.
 # shellcheck disable=SC2154
-git submodule foreach "echo \$path $(git rev-parse --verify HEAD) ${RELEASE_TAG} \
+git submodule foreach "echo \$path \$(git rev-parse --verify HEAD) ${RELEASE_TAG} \
     | tee -a $PATCH_DIR/taglist.log"
 
 echo "$RELEASE_TAG"
-# Remove this case statement when Carbon is no longer supported.
-# Nitrogen onwards we do not want to use the release tag so simply need to
-# strip xml files of -SNAPSHOT tags.
-case "$RELEASE_TAG" in
-    Boron*|Carbon*)
-        lftools version release "$RELEASE_TAG"
-        ;;
-    *)
-        find . -name "*.xml" -print0 | xargs -0 sed -i 's/-SNAPSHOT//'
-        ;;
-esac
+find . -name "*.xml" -print0 | xargs -0 sed -i 's/-SNAPSHOT//'
+
+# Ignore changes to Final distribution since that will be released separately
+pushd integration/distribution || exit 1
+    git checkout -f opendaylight/pom.xml
+popd || exit 1
 git submodule foreach "git commit -am \"Release $RELEASE_TAG\" || true"
 git commit -am "Release $RELEASE_TAG"
 
 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"
+    pushd "$module" || exit
     git format-patch --stdout "origin/$GERRIT_BRANCH" > "$PATCH_DIR/${module//\//-}.patch"
     git bundle create "$PATCH_DIR/${module//\//-}.bundle" "origin/master..HEAD"
-    popd
+    popd || exit
 done
 
 tar cvzf "$WORKSPACE/archives/patches.tar.gz" -C "$WORKSPACE/archives" patches