airship
/
shipyard
Code Issues Proposed changes

Merge "Update DeckhandOperator to do filtering/sorting server-side"

This commit is contained in:
Bryan Strassner 2017-12-01 17:31:56 -05:00 committed by Gerrit Code Review
parent bf0c648043 40677d60e3
commit aff9036c19
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
shipyard_airflow/plugins/deckhand_operator.py
View File

@ -119,8 +119,10 @@ class DeckhandOperator(BaseOperator):
logging.info("Retrieving revisions information...") logging.info("Retrieving revisions information...")
try: try:
query_params = {'tag': 'committed', 'sort': 'id', 'order': 'desc'}
revisions = yaml.safe_load(requests.get( revisions = yaml.safe_load(requests.get(
revision_endpoint, headers=x_auth_token).text) revision_endpoint, headers=x_auth_token,
params=query_params).text)
except requests.exceptions.RequestException as e: except requests.exceptions.RequestException as e:
raise AirflowException(e) raise AirflowException(e)
@ -133,14 +135,10 @@ class DeckhandOperator(BaseOperator):
# Initialize Committed Version # Initialize Committed Version
committed_ver = None committed_ver = None
# Construct revision_list
revision_list = revisions.get('results', [])
# Search for the last committed version and save it as xcom # Search for the last committed version and save it as xcom
for revision in reversed(revision_list): revision_list = revisions.get('results', [])
if 'committed' in revision.get('tags'): if revision_list:
committed_ver = revision.get('id') committed_ver = revision_list[-1].get('id')
break
if committed_ver: if committed_ver:
logging.info("Last committed revision is %d", committed_ver) logging.info("Last committed revision is %d", committed_ver)