starlingx/tools
Code Issues Proposed changes

Detect opendev.org repos and skip staging repos

Browse Source 
StarlingX's Gerrit repos are now in opendev.org domain,
handle both in case we still have the old domain in the
manifest and fall back on the redirects.

Only branch the Gerrit repos by default, the staging repos
ae now treated like other third-party repos and selected via
the specific version/branch used.

Change-Id: Ic23ffa25bb88eaa5d8014a636b97f5b0d751561a
Signed-off-by: Dean Troyer <dtroyer@gmail.com>
This commit is contained in:
Dean Troyer 2019-08-02 11:08:12 -05:00
parent 5f33a3d68a
commit 01b64fd654
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
release/branch-stx.sh
View File

@ -38,6 +38,11 @@
# TAG is the release tag that represents the actual release. If TAG is unset # TAG is the release tag that represents the actual release. If TAG is unset
# no tag is created. # no tag is created.
# #
# REMOTES is the list of remotes to select from a manifest file if -m is used.
# The default is "starlingx". For release 1.0 (aka 2018.10) the default was
# "starlingx stx-staging" however the staging repos are no longer branched in
# the same manner, they are treated as third-party repos for release purposes.
#
# Notes: # Notes:
# * This script is used for creating milestone, release and feature branches. # * This script is used for creating milestone, release and feature branches.
# * The default action is to create a milestone branch with prefix 'm/'. # * The default action is to create a milestone branch with prefix 'm/'.
@ -107,7 +112,7 @@ BRANCH=${BRANCH:-m/$SERIES}
TAG=${TAG:-""} TAG=${TAG:-""}
# The list of remotes to extract from MANIFEST # The list of remotes to extract from MANIFEST
REMOTES="starlingx stx-staging" REMOTES=${REMOTES:-"starlingx"}
if [[ -n $TAG_ONLY ]]; then if [[ -n $TAG_ONLY ]]; then
# Force source and target branches to be the same # Force source and target branches to be the same
@ -171,7 +176,7 @@ function branch_repo {
fi fi
# Push the new goodness back up # Push the new goodness back up
if [[ "$repo" =~ "git.starlingx.io" ]]; then if [[ "$repo" =~ "git.starlingx.io" || "$repo" =~ "opendev.org" ]]; then
# Do the Gerrit way # Do the Gerrit way
# set up gerrit remote # set up gerrit remote