jenkins-bot has submitted this change and it was merged. Change subject: Fold gatedextensions list ......................................................................
Fold gatedextensions list Change the list of extensions in the gated jobs from literal (ie with newlines) to folded (space separated). The reason for this change is JJB change they way it handles newlines (https://review.openstack.org/#/c/243871/ bf88fe32c). See PyYAML documentation about scalars at: http://pyyaml.org/wiki/PyYAMLDocumentation#Scalars Adjust test in consequence since list went from newline separated to space separated with a trailing newline. Change-Id: I216b845529d81a8ebc93f73970ffe7da208b1aba --- M jjb/mediawiki.yaml M tests/test_zuul_scheduler.py 2 files changed, 3 insertions(+), 3 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/jjb/mediawiki.yaml b/jjb/mediawiki.yaml index 3130f60..7c339d4 100644 --- a/jjb/mediawiki.yaml +++ b/jjb/mediawiki.yaml @@ -383,7 +383,7 @@ - 'mediawiki-phpunit-parsertests-{phpflavor}' - 'mediawiki-phpunit-{phpflavor}-composer' - 'mediawiki-extensions-{phpflavor}': - dependencies: &gatedextensions | + dependencies: &gatedextensions > AbuseFilter Babel Cards diff --git a/tests/test_zuul_scheduler.py b/tests/test_zuul_scheduler.py index 10dc486..1c08618 100644 --- a/tests/test_zuul_scheduler.py +++ b/tests/test_zuul_scheduler.py @@ -580,8 +580,8 @@ for job in mw_project['jobs'] if isinstance(job, dict) and job.keys()[0] == 'mediawiki-extensions-{phpflavor}') - # List of extensions basenames - jjb_deps = set(jjb_gate_template['dependencies'].splitlines()) + # List of extensions basenames. Space separted in the YAML definition. + jjb_deps = set(jjb_gate_template['dependencies'].rstrip().split(' ')) # Grab projects having the gate job 'mediawiki-extensions-hhvm' gated_in_zuul = set([ -- To view, visit https://gerrit.wikimedia.org/r/274399 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I216b845529d81a8ebc93f73970ffe7da208b1aba Gerrit-PatchSet: 3 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Hashar <[email protected]> Gerrit-Reviewer: Hashar <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
