Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/278733
Change subject: Allow decoupling of npm-node-4.3 ...................................................................... Allow decoupling of npm-node-4.3 Zuul puts projects in the same merge queue whenever they are sharing a job. In lot of cases that is really unwanted. A challenge was to find a way to avoid repeating ourselves between the generic and variadic job templates. I did an experment using YAML merging on https://gerrit.wikimedia.org/r/#/c/243164/ which seems successful. Mark 'npm-node-4.3' with a YAML alias. Create job template '{name}-npm-node-4.3' that merges in the job. Override the 'name' variable in the template definition. Reapply 'triggers: - zuul' since JJB strips it in this corner case usage. This trick avoid duplication and let us define more specific jobs. Do so for the wikimedia/portals repository which only triggers npm job and asked to be decoupled (T129591) Expand the Zuul project template. We cant pass the full project name yet, will be possible later with Zuul patch: https://review.openstack.org/295237 Provide 'longname' to project templates Bug: T107529 Bug: T129591 Change-Id: I66b2a86f506bef757fa9a90ee51f9746a474a79d --- M jjb/job-templates.yaml A jjb/wikimedia.yaml M zuul/layout.yaml 3 files changed, 16 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/33/278733/1 diff --git a/jjb/job-templates.yaml b/jjb/job-templates.yaml index f316877..cfd12af 100644 --- a/jjb/job-templates.yaml +++ b/jjb/job-templates.yaml @@ -99,7 +99,7 @@ publishers: - global-teardown -- job: +- job: &job_npm-node-4_3 name: 'npm-node-4.3' node: ci-jessie-wikimedia defaults: use-remote-zuul-shallow-clone @@ -124,6 +124,13 @@ - archive-log-allow-empty - castor-save +- job-template: + !!merge : *job_npm-node-4_3 + name: '{name}-npm-node-4.3' + # Reinject Zuul parameters since JJB strip for some reason + triggers: + - zuul + - job: name: 'npm-run-doc' node: contintLabsSlave && UbuntuTrusty diff --git a/jjb/wikimedia.yaml b/jjb/wikimedia.yaml new file mode 100644 index 0000000..f01d5cb --- /dev/null +++ b/jjb/wikimedia.yaml @@ -0,0 +1,4 @@ +- project: + name: wikimedia-portals + jobs: + - '{name}-npm-node-4.3' diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 0b30cc4..163255c 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -7856,8 +7856,10 @@ - phpunit-coverage-publish - name: wikimedia/portals - template: - - name: npm-node-4.3 + test: + - wikimedia-portals-npm-node-4.3 + gate-and-submit: + - wikimedia-portals-npm-node-4.3 - name: search/extra test: -- To view, visit https://gerrit.wikimedia.org/r/278733 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I66b2a86f506bef757fa9a90ee51f9746a474a79d Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Hashar <has...@free.fr> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
