starlingx/tools
Code Issues Proposed changes

Remove default value of TAG from branch-stx.sh

Browse Source 
This turned out to be less useful and more painful than anticipated
so do not set a default value for TAG.  Also remove the -b option
that was used to hack around this default value.

Change-Id: I7b268e6798a4e9b6adf845401f8dcc89a4be32ac
Signed-off-by: Dean Troyer <dtroyer@gmail.com>
This commit is contained in:
Dean Troyer 2019-01-30 08:23:07 -06:00
parent e871ca90d9
commit 8a7d023278
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
release/branch-stx.sh
View File

@ -6,8 +6,6 @@
# --dry-run|-n Do all work except pushing back to the remote repo.
# Useful to validate everything locally before pushing.
#
# -b Set branch only (sets TAG="")
#
# -l List the repo URLS that would be processed and exit
#
# -m <manifest> Extract the repo list from <manifest> for starlingx
@ -37,8 +35,8 @@
# branch is not named 'master'. When SRC_BRANCH == BRANCH this is effectively
# a tag-only operation.
#
# TAG is the release tag that represents the actual release, derived by adding
# a 'patch' version to SERIES, initially '0'. If TAG is unset no tag is created.
# TAG is the release tag that represents the actual release. If TAG is unset
# no tag is created.
#
# Notes:
# * This script is used for creating milestone, release and feature branches.
@ -73,7 +71,8 @@ while getopts "$optspec" o; do
esac
;;
b)
BRANCH_ONLY=1
:
# left for backward-compatibility, unused
;;
l)
LIST=1
@ -105,16 +104,11 @@ SERIES=${SERIES:-$(date '+%Y.%m')}
BRANCH=${BRANCH:-m/$SERIES}
# tag: YYYY.MM.0
TAG=${TAG:-$SERIES.0}
TAG=${TAG:-""}
# The list of remotes to extract from MANIFEST
REMOTES="starlingx stx-staging"
if [[ -n $BRANCH_ONLY ]]; then
# Force tag to be empty
TAG=""
fi
if [[ -n $TAG_ONLY ]]; then
# Force source and target branches to be the same
SRC_BRANCH=${BRANCH}
@ -226,7 +220,7 @@ fi
for i in $repo_list; do
if [[ -z $LIST ]]; then
branch_repo $i HEAD $BRANCH $TAG
branch_repo "$i" HEAD "$BRANCH" "$TAG"
else
echo "$i"
fi