From 092bc57dbaa93b4fb0f122d02334a5e0916ad82a Mon Sep 17 00:00:00 2001 From: Doug Hellmann Date: Thu, 14 Mar 2019 12:14:42 -0400 Subject: [PATCH] use the new redirect target for constraints when branching Rather than pointing to the git server, point to a redirect on the releases.openstack.org server that we can update easily when a branch closes. Change-Id: Iab3b36cafdce48a84e23a3c8fd94a1b8b844a147 Signed-off-by: Doug Hellmann --- .../files/release-tools/functions | 23 +++++++------------ 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/roles/copy-release-tools-scripts/files/release-tools/functions b/roles/copy-release-tools-scripts/files/release-tools/functions index 1f7bc85c69..ddd2649b87 100644 --- a/roles/copy-release-tools-scripts/files/release-tools/functions +++ b/roles/copy-release-tools-scripts/files/release-tools/functions @@ -77,9 +77,8 @@ defaultbranch=$branch" function update_upper_constraints { typeset branch="$1" - typeset uc_server='git.openstack.org' - typeset uc_path='cgit/openstack/requirements/plain/upper-constraints.txt' - typeset uc_url="https://${uc_server}/${uc_path}?h=${branch}" + typeset redirect_branch=$(basename $branch) + typeset uc_url="https://releases.openstack.org/constraints/upper/${redirect_branch}" echo "Updating tox.ini for upper-constraints" git checkout $branch @@ -91,19 +90,13 @@ function update_upper_constraints { if ! git diff --exit-code >/dev/null 2>&1 ; then git add tox.ini msg="Update UPPER_CONSTRAINTS_FILE for $branch" - body="The new stable upper-constraints file is only available -after the openstack/requirements repository is branched. -This will happen around the RC1 timeframe. + body="Update the URL to the upper-constraints file to point to the redirect +rule on releases.openstack.org so that anyone working on this branch +will switch to the correct upper-constraints list automatically when +the requirements repository branches. -Recheck and merge this change once the requirements -repository has been branched. - -The CI system will work with this patch before the requirements -repository is branched because zuul configues the job to run -with a local copy of the file and defaults to the master branch. -However, accepting the patch will break the test configuration -on developers' local systems, so please wait until after the -requirements repository is branched to merge the patch." +Until the requirements repository has as $branch branch, tests will +continue to use the upper-constraints list on master." git commit -m "$msg" -m "$body" git show local shortbranch=$(basename $branch)