PR#546: Fix getting distinct results for composes - greenwave

Lukas Holecek • 4 years ago

be62179

file modified

+1 -1

		`@@ -5,5 +5,5 @@`
		`# {"productmd.compose.id": ITEM}`
		`item_key: "productmd.compose.id"`
		`latest_result_unique_keys:`
		`- - arch_variant`
		`+ - system_variant`
		`- system_architecture`

functional-tests/test_api_v1.py

file modified

+15 -7

		`@@ -1043,21 +1043,29 @@`
		`assert result.status_code == 200`


		`+ @pytest.mark.parametrize(('variant1', 'variant2'), (`
		`+ (`
		`+ dict(variant='BaseOS', architecture='ppc64'),`
		`+ dict(variant='BaseOS', architecture='x86_64'),`
		`+ ),`
		`+ (`
		`+ dict(variant='BaseOS', architecture='ppc64'),`
		`+ dict(variant='Cloud_Base', architecture='ppc64'),`
		`+ ),`
		`+ ))`
		`def test_make_a_decision_about_compose_all_variants_architectures(`
		`- requests_session, greenwave_server, testdatabuilder):`
		`+ variant1, variant2, requests_session, greenwave_server, testdatabuilder):`
		`compose_id = testdatabuilder.unique_compose_id()`

		`failed_results = testdatabuilder.create_rtt_compose_result(`
		`compose_id=compose_id,`
		`- variant='BaseOS',`
		`- architecture='ppc64',`
		`- outcome='FAILED')`
		`+ outcome='FAILED',`
		`+ **variant1)`

		`testdatabuilder.create_rtt_compose_result(`
		`compose_id=compose_id,`
		`- variant='BaseOS',`
		`- architecture='x86_64',`
		`- outcome='PASSED')`
		`+ outcome='PASSED',`
		`+ **variant2)`

		`data = {`
		`'decision_context': 'rtt_compose_gate',`

greenwave/resources.py

file modified

+1 -1

		`@@ -66,7 +66,7 @@`
		`return []`

		`params = {`
		`- '_distinct_on': 'scenario,system_architecture'`
		`+ '_distinct_on': 'scenario,system_architecture,system_variant'`
		`}`
		`if self.since:`
		`params.update({'since': self.since})`