diff options
| author |   Tim Rozet <trozet@redhat.com> | 2018-06-04 21:19:22 -0400 |
|---|---|---|
| committer | Tim Rozet <trozet@redhat.com> | 2018-06-14 16:25:19 -0400 |
| commit | f07870e4a3933cc7e78e6dc6457724bb49cad4f8 (patch) | |
| tree | 29258209ef54270f70483977410782328b89377d /apex/build_utils.py | |
| parent | bd292a3c44dbe385974e4ee41dcb8149558f0be4 (diff) | |
Fixes deployment failure with allNodesConfig
This pulls in upstream patch to revert a bad commit that causes the
"Unknown Property controller_ips". Also includes a fix for being able to
detect if patches that are merged upstream are also promoted into
TripleO images or container images. This happens by comparing the time
the patch was submitted to the time when the TripleO Image or Docker
Image was last updated.
JIRA: APEX-610
JIRA: APEX-612
Change-Id: I1c2ab7fb4425b407acd7b6d9ebab914ed3a24478
Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'apex/build_utils.py')
| -rw-r--r-- | apex/build_utils.py | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/apex/build_utils.py b/apex/build_utils.py index 1c413dfd..213ae115 100644 --- a/apex/build_utils.py +++ b/apex/build_utils.py @@ -27,7 +27,7 @@ def get_change(url, repo, branch, change_id): :param repo: name of repo :param branch: branch of repo :param change_id: SHA change id - :return: change if found and not abandoned, closed, or merged + :return: change if found and not abandoned, closed """ rest = GerritRestAPI(url=url) change_path = "{}~{}~{}".format(quote_plus(repo), quote_plus(branch), @@ -37,12 +37,8 @@ def get_change(url, repo, branch, change_id): try: assert change['status'] not in 'ABANDONED' 'CLOSED', \ 'Change {} is in {} state'.format(change_id, change['status']) - if change['status'] == 'MERGED': - logging.info('Change {} is merged, ignoring...' - .format(change_id)) - return None - else: - return change + logging.debug('Change found: {}'.format(change)) + return change except KeyError: logging.error('Failed to get valid change data structure from url ' |