Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions osbs/tekton.py
Original file line number Diff line number Diff line change
Expand Up @@ -570,12 +570,17 @@ def get_final_platforms(self):

task_results = self.get_task_results()

if 'binary-container-prebuild' not in task_results:
return None

if 'platforms_result' in task_results['binary-container-prebuild']:
platforms = json.loads(task_results['binary-container-prebuild']['platforms_result'])
return platforms['platforms']
if 'binary-container-prebuild' in task_results:
if 'platforms_result' in task_results['binary-container-prebuild']:
platforms = json.loads(
task_results['binary-container-prebuild']['platforms_result'])
return platforms['platforms']

if 'binary-container-init' in task_results:
if 'platforms_result' in task_results['binary-container-init']:
platforms = json.loads(
task_results['binary-container-init']['platforms_result'])
return platforms['platforms']

return None

Expand Down
8 changes: 6 additions & 2 deletions tests/test_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -1066,15 +1066,19 @@ def test_get_build_error_message(self, osbs_binary):
@pytest.mark.parametrize('platforms_result', [
'{"platforms": ["x86_64", "ppc64le"]}',
])
def test_get_final_platforms(self, osbs_binary, platforms_result):
@pytest.mark.parametrize('task', [
'binary-container-prebuild',
'binary-container-init',
])
def test_get_final_platforms(self, osbs_binary, platforms_result, task):
taskstatus = {'conditions': [{'reason': 'Succeeded'}],
'taskResults': [{'name': 'platforms_result',
'value': platforms_result}],
'startTime': '2022-04-26T15:58:42Z'}
childrefs = [{'name': 'task_run_name', 'kind': 'TaskRun'}]

resp1 = {'metadata': {'name': 'run_name'}, 'status': {'childReferences': childrefs}}
resp2 = {'metadata': {'labels': {'tekton.dev/pipelineTask': 'binary-container-prebuild'}},
resp2 = {'metadata': {'labels': {'tekton.dev/pipelineTask': task}},
'status': taskstatus}

flexmock(PipelineRun).should_receive('get_info').and_return(resp1)
Expand Down
Loading