Simplify autorelease to not use release tags

Release tags for carbon, nitrogen and future releases are set as
the stream and no longer uses the format `Carbon-SR1`. Only for boron
the same format is preserved if any hotfix has to be released.
Therefore, pass stream as the default release tag for all releases
except for boron. Also the scripts are modified to set the release tag
as $STREAM by default.

https://lists.opendaylight.org/pipermail/release/2017-July/011619.html
Jira: releng-323
Change-Id: I7ecc4d3962bab741bc31efa636beb986b4b15476
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml
index 32ad768a8a238da6c48dd524d2a9c170edc75af4..7d8b97fb5e71abf7ff201d5541f4aa67260b6ea4 100644 (file)
--- a/jjb/autorelease/autorelease-projects.yaml
+++ b/jjb/autorelease/autorelease-projects.yaml
@@ -10,12 +10,14 @@
 
     stream:
       - nitrogen:
-          next-release-tag: Nitrogen
+          # todo: After boron EOL remove next-release-tag and directy pass
+          # '{stream}' to autorelease-release-tag parameter
+          next-release-tag: '{stream}'
           branch: 'master'
           jdk: 'openjdk8'
           integration-test: nitrogen
       - carbon:
-          next-release-tag: Carbon
+          next-release-tag: '{stream}'
           branch: 'stable/carbon'
           jdk: 'openjdk8'
           integration-test: carbon

diff --git a/jjb/autorelease/include-raw-autorelease-release-versions.sh b/jjb/autorelease/include-raw-autorelease-release-versions.sh
index 8369a9fa68b7f4b8fadb5ccc6da081aa6a40b5a9..bb50bec4170fb9fc897d975209ea113c60d01617 100644 (file)
--- a/jjb/autorelease/include-raw-autorelease-release-versions.sh
+++ b/jjb/autorelease/include-raw-autorelease-release-versions.sh
@@ -12,6 +12,11 @@
 # 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^}}"
+# Ensure that the first letter of RELEASE_TAG is uppercase.
+RELEASE_TAG="${RELEASE_TAG^}"
+
 # Directory to put git format-patches
 PATCH_DIR="$WORKSPACE/patches"
 

diff --git a/jjb/autorelease/version-bump.sh b/jjb/autorelease/version-bump.sh
index 65f106354121758d7c1b9f1c71bb11f0ba10186a..c0d70af2c9f41540d7e8515aebfc4851612c986d 100644 (file)
--- a/jjb/autorelease/version-bump.sh
+++ b/jjb/autorelease/version-bump.sh
@@ -12,6 +12,11 @@
 # This script performs version bumping activities for an ODL release.
 echo "---> version-bump.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.
+RELEASE_TAG="${RELEASE_TAG^}"
+
 mkdir -p "$WORKSPACE/archives"
 LOG_FILE="$WORKSPACE/archives/version-bump.log"
 BRANCH="$GERRIT_BRANCH"