From e5e9c33a16e20dca130dd43f8efafca7786f6e5e Mon Sep 17 00:00:00 2001 From: Doug Hellmann Date: Wed, 29 Aug 2018 16:50:04 -0400 Subject: [PATCH] fix validation of stable branches for independent deliverables The wrong variable was being used to check for the existing branch. Add some debug messages to show what we do find and fix that variable so the right branch name is checked. Change-Id: I758f6aa3fd0b983af1b83a922b40c3181ae48014 Signed-off-by: Doug Hellmann --- openstack_releases/cmds/validate.py | 2 +- openstack_releases/gitutils.py | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/openstack_releases/cmds/validate.py b/openstack_releases/cmds/validate.py index 25f70de1d8..b66b8043f9 100644 --- a/openstack_releases/cmds/validate.py +++ b/openstack_releases/cmds/validate.py @@ -1404,7 +1404,7 @@ def validate_stable_branches(deliv, context): gitutils.stable_branch_exists( context.workdir, repo, - deliv.series + series, ) for repo in deliv.known_repo_names ) diff --git a/openstack_releases/gitutils.py b/openstack_releases/gitutils.py index fb58799516..7cb9b46dc3 100644 --- a/openstack_releases/gitutils.py +++ b/openstack_releases/gitutils.py @@ -165,6 +165,8 @@ def stable_branch_exists(workdir, repo, series): cwd=os.path.join(workdir, repo), ).decode('utf-8') ) + LOG.debug('looking for %s', remote_match) + LOG.debug('found branches: %s', containing_branches) return (remote_match in containing_branches) except processutils.CalledProcessError as e: LOG.error('failed checking for branch: %s [%s]', e, e.output.strip())