X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fautorelease%2Fprepare-release.sh;h=51248b15e3f104bf30c48644ad272e3ecd0d5d8c;hb=5bb4581c51fde9a78d259d7460a48608ea5185b1;hp=0b025ec9b6cd1a4d4b395323364249a736e24ddc;hpb=0d72f2240aa3559dcd939f64dd53ccd9c6bafb80;p=releng%2Fbuilder.git

diff --git a/jjb/autorelease/prepare-release.sh b/jjb/autorelease/prepare-release.sh
index 0b025ec9b..51248b15e 100644
--- a/jjb/autorelease/prepare-release.sh
+++ b/jjb/autorelease/prepare-release.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# @License EPL-1.0 <http://spdx.org/licenses/EPL-1.0>
+# SPDX-License-Identifier: EPL-1.0
 ##############################################################################
 # Copyright (c) 2015, 2017 The Linux Foundation and others.
 #
@@ -17,6 +17,8 @@
 
 # RELEASE_TAG=Beryllium-SR1  # Example
 
+echo "---> prepare-release.sh"
+
 # Set release tag as $STREAM, when no release tag is passed
 RELEASE_TAG="${RELEASE_TAG:-${STREAM^}}"
 # Ensure that the first letter of RELEASE_TAG is uppercase.
@@ -26,12 +28,20 @@ RELEASE_TAG="${RELEASE_TAG^}"
 PATCH_DIR="$WORKSPACE/archives/patches"
 mkdir -p "$PATCH_DIR"
 
+# Get the current submodule commit hashes.
+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} \
+    | 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*)
+    Carbon*)
         lftools version release "$RELEASE_TAG"
         ;;
     *)
@@ -41,15 +51,18 @@ esac
 git submodule foreach "git commit -am \"Release $RELEASE_TAG\" || true"
 git commit -am "Release $RELEASE_TAG"
 
-# 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/$BRANCH" > "$PATCH_DIR/${module//\//-}.patch"
+    # TODO: Remove once stable/nitrogen is no longer supported.
+    if [ "$GERRIT_BRANCH" == "stable/nitrogen" ] && [ "$module" == "yangtools" ]; then
+        git format-patch --stdout "origin/v1.2.x" > "$PATCH_DIR/${module//\//-}.patch"
+    else
+        git format-patch --stdout "origin/$GERRIT_BRANCH" > "$PATCH_DIR/${module//\//-}.patch"
+    fi
     git bundle create "$PATCH_DIR/${module//\//-}.bundle" "origin/master..HEAD"
     popd
 done
 
-tar cvzf "$PATCH_DIR/patches.tar.gz" -C "$WORKSPACE/archives" patches
+tar cvzf "$WORKSPACE/archives/patches.tar.gz" -C "$WORKSPACE/archives" patches
 rm "$PATCH_DIR"/*.bundle