Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/81228
Change subject: get rid of -merge jobs (no more triggered)
......................................................................
get rid of -merge jobs (no more triggered)
Our Zuul setup no more trigger merge jobs since it will fails whenever
it is not able to merge a patchset. This simply remove the merge jobs
in Jenkins.
Bug: 51395
Change-Id: I0491793b8949eb205b1418fb42c0cd2460569fdb
---
M mediawiki-extensions.yaml
M mediawiki.yaml
2 files changed, 0 insertions(+), 18 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config
refs/changes/28/81228/1
diff --git a/mediawiki-extensions.yaml b/mediawiki-extensions.yaml
index 7b0ae68..5e3ab05 100644
--- a/mediawiki-extensions.yaml
+++ b/mediawiki-extensions.yaml
@@ -1,10 +1,4 @@
- job-template:
- name: '{name}-{ext-name}-merge'
- defaults: use-zuul-for-mw-ext
- triggers:
- - zuul
-
-- job-template:
# TODO: Use global '{name}-phplint' template instead
name: '{name}-{ext-name}-lint'
node: hasSlaveScripts
@@ -158,7 +152,6 @@
- job-group:
name: mwext-check-jobs
jobs:
- - '{name}-{ext-name}-merge'
- '{name}-{ext-name}-lint'
- '{name}-{ext-name}-whitespaces'
- '{name}-{ext-name}-jslint'
diff --git a/mediawiki.yaml b/mediawiki.yaml
index 5050e12..c94fafc 100644
--- a/mediawiki.yaml
+++ b/mediawiki.yaml
@@ -7,16 +7,6 @@
# use a specific git macro to prevents Jenkins from updating all the
# submodules we do not care about. See bug 42455.
-# Basic jobs used to merge the change against the latest
-# version in the repository.
-- job-template:
- name: '{name}-merge'
- defaults: use-zuul
- scm:
- - git-mwcore-nosubmodules
- triggers:
- - zuul
-
- job-template:
name: '{name}-lint'
node: hasSlaveScripts
@@ -133,7 +123,6 @@
- job-group:
name: mediawiki-jobs
jobs:
- - '{name}-merge'
- '{name}-lint'
- '{name}-jslint'
- '{name}-qunit'
--
To view, visit https://gerrit.wikimedia.org/r/81228
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0491793b8949eb205b1418fb42c0cd2460569fdb
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-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
