Krinkle has uploaded a new change for review. https://gerrit.wikimedia.org/r/196234
Change subject: Remove MediaWiki REL1_21 and REL1_22 triggers ...................................................................... Remove MediaWiki REL1_21 and REL1_22 triggers https://www.mediawiki.org/wiki/Version_lifecycle Change-Id: I9f646963d8495632c3e0e13479bbe88187111c57 --- M jjb/integration.yaml M jjb/mediawiki-extensions.yaml M zuul/layout.yaml 3 files changed, 24 insertions(+), 30 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/34/196234/1 diff --git a/jjb/integration.yaml b/jjb/integration.yaml index 7cc75da..3ee3fa6 100644 --- a/jjb/integration.yaml +++ b/jjb/integration.yaml @@ -147,7 +147,6 @@ name: 'integration-phpunit' mwbranch: - master - - REL1_22 - REL1_23 - REL1_24 jobs: diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml index bc4ac48..5ddee88 100644 --- a/jjb/mediawiki-extensions.yaml +++ b/jjb/mediawiki-extensions.yaml @@ -1025,9 +1025,6 @@ - master # Commented out since they are not triggered for now. # - REL1_23 -# - REL1_22 -# - REL1_21 -# - REL1_20 # - REL1_19 jobs: diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 6d64f32..835915b 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -526,11 +526,11 @@ - name: ^mediawiki.*-hhvm$ # Release branches do not support hhvm. Hopefully REL1_25 will. - branch: (?!REL1_19|REL1_22|REL1_23|REL1_24|fundraising/REL1_23) + branch: (?!REL1_19|REL1_23|REL1_24|fundraising/REL1_23) - name: ^mwext.*-hhvm$ # Release branches do not support hhvm. Hopefully REL1_25 will. - branch: (?!REL1_19|REL1_22|REL1_23|REL1_24|fundraising/REL1_23) + branch: (?!REL1_19|REL1_23|REL1_24|fundraising/REL1_23) # Jobs testing multiple extensions together # @@ -538,48 +538,48 @@ # Extensions tested together, since 1.25alpha ... - name: ^mediawiki-extensions-(hhvm|zend)$ - branch: (?!REL1_19|REL1_22|REL1_23|REL1_24|fundraising/REL1_23) + branch: (?!REL1_19|REL1_23|REL1_24|fundraising/REL1_23) queue-name: mediawiki # ... older branches get the legacy job - name: ^mwext-AbuseFilter-testextension-zend$ - branch: (REL1_19|REL1_22|REL1_23|REL1_24|fundraising/REL1_23) + branch: (REL1_19|REL1_23|REL1_24|fundraising/REL1_23) - name: ^mwext-Babel-testextension-zend$ - branch: (REL1_19|REL1_22|REL1_23|REL1_24|fundraising/REL1_23) + branch: (REL1_19|REL1_23|REL1_24|fundraising/REL1_23) - name: ^mwext-CheckUser-testextension-zend$ - branch: (REL1_19|REL1_22|REL1_23|REL1_24|fundraising/REL1_23) + branch: (REL1_19|REL1_23|REL1_24|fundraising/REL1_23) - name: ^mwext-cldr-testextension-zend$ - branch: (REL1_19|REL1_22|REL1_23|REL1_24|fundraising/REL1_23) + branch: (REL1_19|REL1_23|REL1_24|fundraising/REL1_23) - name: ^mwext-ConfirmEdit-testextension-zend$ - branch: (REL1_19|REL1_22|REL1_23|REL1_24|fundraising/REL1_23) + branch: (REL1_19|REL1_23|REL1_24|fundraising/REL1_23) - name: ^mwext-Echo-testextension-zend$ - branch: (REL1_19|REL1_22|REL1_23|REL1_24|fundraising/REL1_23) + branch: (REL1_19|REL1_23|REL1_24|fundraising/REL1_23) - name: ^mwext-EventLogging-testextension-zend$ - branch: (REL1_19|REL1_22|REL1_23|REL1_24|fundraising/REL1_23) + branch: (REL1_19|REL1_23|REL1_24|fundraising/REL1_23) - name: ^mwext-Gather-testextension-zend$ - branch: (REL1_19|REL1_22|REL1_23|REL1_24|fundraising/REL1_23) + branch: (REL1_19|REL1_23|REL1_24|fundraising/REL1_23) - name: ^mwext-JsonConfig-testextension-zend$ - branch: (REL1_19|REL1_22|REL1_23|REL1_24|fundraising/REL1_23) + branch: (REL1_19|REL1_23|REL1_24|fundraising/REL1_23) - name: ^mwext-Mantle-testextension-zend$ - branch: (REL1_19|REL1_22|REL1_23|REL1_24|fundraising/REL1_23) + branch: (REL1_19|REL1_23|REL1_24|fundraising/REL1_23) - name: ^mwext-MobileApp-testextension-zend$ - branch: (REL1_19|REL1_22|REL1_23|REL1_24|fundraising/REL1_23) + branch: (REL1_19|REL1_23|REL1_24|fundraising/REL1_23) - name: ^mwext-MobileFrontend-testextension-zend$ - branch: (REL1_19|REL1_22|REL1_23|REL1_24|fundraising/REL1_23) + branch: (REL1_19|REL1_23|REL1_24|fundraising/REL1_23) - name: ^mwext-SpamBlacklist-testextension-zend$ - branch: (REL1_19|REL1_22|REL1_23|REL1_24|fundraising/REL1_23) + branch: (REL1_19|REL1_23|REL1_24|fundraising/REL1_23) - name: ^mwext-Thanks-testextension-zend$ - branch: (REL1_19|REL1_22|REL1_23|REL1_24|fundraising/REL1_23) + branch: (REL1_19|REL1_23|REL1_24|fundraising/REL1_23) - name: ^mwext-UniversalLanguageSelector-testextension-zend$ - branch: (REL1_19|REL1_22|REL1_23|REL1_24|fundraising/REL1_23) + branch: (REL1_19|REL1_23|REL1_24|fundraising/REL1_23) - name: ^mwext-VisualEditor-testextension-zend$ - branch: (REL1_19|REL1_22|REL1_23|REL1_24|fundraising/REL1_23) + branch: (REL1_19|REL1_23|REL1_24|fundraising/REL1_23) - name: ^mwext-WikiGrok-testextension-zend$ - branch: (REL1_19|REL1_22|REL1_23|REL1_24|fundraising/REL1_23) + branch: (REL1_19|REL1_23|REL1_24|fundraising/REL1_23) - name: ^mwext-ZeroBanner-testextension-zend$ - branch: (REL1_19|REL1_22|REL1_23|REL1_24|fundraising/REL1_23) + branch: (REL1_19|REL1_23|REL1_24|fundraising/REL1_23) - name: ^mwext-ZeroPortal-testextension-zend$ - branch: (REL1_19|REL1_22|REL1_23|REL1_24|fundraising/REL1_23) + branch: (REL1_19|REL1_23|REL1_24|fundraising/REL1_23) - name: mwext-cldr-phpcs-HEAD voting: true @@ -1769,10 +1769,10 @@ voting: false - name: mediawiki-core-jsduck - branch: ^(REL1_21|REL1_22|REL1_23|REL1_24|master)$ + branch: ^(REL1_23|REL1_24|master)$ - name: mediawiki-core-jsduck-publish - branch: ^(REL1_21|REL1_22|REL1_23|REL1_24|master)$ + branch: ^(REL1_23|REL1_24|master)$ # Exceptions for projects not yet passing phpunit tests @@ -2006,12 +2006,10 @@ - name: integration/phpunit test: - - integration-phpunit-mediawiki-REL1_22 - integration-phpunit-mediawiki-REL1_23 - integration-phpunit-mediawiki-REL1_24 - integration-phpunit-mediawiki-master gate-and-submit: - - integration-phpunit-mediawiki-REL1_22 - integration-phpunit-mediawiki-REL1_23 - integration-phpunit-mediawiki-REL1_24 - integration-phpunit-mediawiki-master -- To view, visit https://gerrit.wikimedia.org/r/196234 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9f646963d8495632c3e0e13479bbe88187111c57 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Krinkle <krinklem...@gmail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits