Hashar has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/339388 )
Change subject: Delete composer*php53
......................................................................
Delete composer*php53
Replace composer-php53 and composer-package-php53 with php55 versions.
Hack Zuul meta jobs to update the skip-if statement and let the Zend 5.5
version to run on all branches.
Bug: T158652
Change-Id: I090d91807aa49d18bf85b067e037081cbdafdb6a
---
M jjb/php.yaml
M tests/test_zuul_scheduler.py
M zuul/layout.yaml
3 files changed, 26 insertions(+), 96 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/88/339388/1
diff --git a/jjb/php.yaml b/jjb/php.yaml
index 0924a03..44bc029 100644
--- a/jjb/php.yaml
+++ b/jjb/php.yaml
@@ -63,50 +63,6 @@
- build-discarder:
days-to-keep: 15
-# Generic job that runs "composer update" and "composer test"
-# Runs on Ubuntu Precise that ships Zend 5.3.
-- job-template:
- name: 'composer-php53'
- node: 'contintLabsSlave && phpflavor-php53'
- defaults: use-remote-zuul-shallow-clone
- concurrent: true
-
- triggers:
- - zuul
- builders:
- - composer-validate:
- dir: '.'
- - composer-update:
- dir: '.'
- - composer-test
- properties:
- - build-discarder:
- days-to-keep: 15
-
-# Run composer update and composer test
-# Intended for libraries that are published as composer packages
-# Runs on Ubuntu Precise that ships Zend 5.3.
-- job-template:
- name: 'composer-package-php53'
- node: 'contintLabsSlave && phpflavor-php53'
- defaults: use-remote-zuul-shallow-clone
- concurrent: true
- triggers:
- - zuul
- builders:
- - composer-validate-package
- - composer-update:
- dir: '.'
- - composer-test
-
-# Zend 5.3 is only on Ubuntu Precise
-# Other PHP flavors are on Nodepool instances.
-- project:
- name: 'composer-php53'
- jobs:
- - 'composer-php53'
- - 'composer-package-php53'
-
# Runs "composer update" and "composer test" but on disposable instances
# maintained by Nodepool.
- job-template: &job_composer-phpflavor-image
diff --git a/tests/test_zuul_scheduler.py b/tests/test_zuul_scheduler.py
index 3db149d..6fa50ff 100644
--- a/tests/test_zuul_scheduler.py
+++ b/tests/test_zuul_scheduler.py
@@ -587,7 +587,7 @@
self.getPipeline('test').job_trees.iteritems()
if p.name == 'wikimedia/fundraising/SmashPig'][0]
for job in jobs_tree.getJobs():
- if job.name in ['composer-php53', 'composer-hhvm-jessie']:
+ if job.name in ['composer-php55', 'composer-hhvm-jessie']:
self.assertFalse(
job.changeMatches(change),
msg='%s should not trigger for branch %s' % (
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 0d9bd50..fb53d3f 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -738,6 +738,15 @@
skip-if:
- project: '^mediawiki/.*$'
branch: (?!.*)
+ # composer-php53 is gone. Same hack
+ - name: ^composer-php55-trusty$
+ skip-if:
+ - project: '^mediawiki/.*$'
+ branch: (?!.*)
+ - name: ^composer-package-php55-trusty$
+ skip-if:
+ - project: '^mediawiki/.*$'
+ branch: (?!.*)
- name: ^.*php70.*$
branch: (?!REL1_2[3-6]|fundraising/REL1_2[3-6]$)
@@ -951,7 +960,6 @@
- mwext-qunit-composer-jessie
- npm-node-6-jessie
- composer-hhvm-jessie
- - composer-php53
- composer-php55-trusty
- composer-php70-jessie
@@ -972,7 +980,6 @@
experimental:
- mwext-qunit-composer-jessie
- composer-hhvm-jessie
- - composer-php53
- composer-php55-trusty
- composer-php70-jessie
@@ -1004,7 +1011,6 @@
- mwext-testextension-hhvm-composer
- npm-node-6-jessie
- composer-hhvm-jessie
- - composer-php53
- composer-php55-trusty
- composer-php70-jessie
- mwext-php70-phan-jessie
@@ -1032,7 +1038,6 @@
- mwext-testextension-hhvm-composer
- npm-node-6-jessie
- composer-hhvm-jessie
- - composer-php53
- composer-php55-trusty
- composer-php70-jessie
@@ -1124,26 +1129,10 @@
experimental:
- npm-node-6-jessie
- composer-hhvm-jessie
- - composer-php53
- composer-php55-trusty
- composer-php70-jessie
- name: composer-test
- check:
- - php55lint
- - composer-validate
- test:
- - composer-php53
- - composer-php55-trusty
- - composer-hhvm-jessie
- gate-and-submit:
- - composer-php53
- - composer-php55-trusty
- - composer-hhvm-jessie
- experimental:
- - composer-php70-jessie
-
- - name: composer-test55
check:
- php55lint
- composer-validate
@@ -1181,21 +1170,6 @@
- php55lint
- name: composer-test-package
- check:
- - composer-package-validate
- - php55lint
- test:
- - composer-package-hhvm-jessie
- - composer-package-php53
- - composer-package-php55-trusty
- gate-and-submit:
- - composer-package-hhvm-jessie
- - composer-package-php53
- - composer-package-php55-trusty
- experimental:
- - composer-package-php70-jessie
-
- - name: composer-test-package55
check:
- composer-package-validate
- php55lint
@@ -1668,7 +1642,7 @@
- name: labs/tools/stewardbots
template:
- - name: composer-test55
+ - name: composer-test
- name: tox-jessie
- name: labs/tools/wikibugs2
@@ -2529,12 +2503,12 @@
- name: wikimedia/fundraising/php-queue
test:
- php55lint
- - composer-php53
+ - composer-php55
- composer-hhvm-jessie
- composer-validate
gate-and-submit:
- php55lint
- - composer-php53
+ - composer-php55
- composer-hhvm-jessie
- composer-validate
@@ -2544,7 +2518,7 @@
- name: wikimedia/fundraising/SmashPig
template:
- - name: composer-test55
+ - name: composer-test
- name: wikimedia/iegreview
template:
@@ -2556,7 +2530,7 @@
template:
- name: jshint
- name: jsonlint
- - name: composer-test55
+ - name: composer-test
- name: wikimedia/textcat
template:
@@ -8707,7 +8681,7 @@
- name: mediawiki/extensions/WikiLexicalData
template:
- - name: composer-test55
+ - name: composer-test
- name: extension-unittests-non-voting
- name: jshint
- name: jsonlint
@@ -8996,7 +8970,7 @@
- name: purtle
template:
- - name: composer-test-package55
+ - name: composer-test-package
postmerge:
- doxygen-publish
- phpunit-coverage-publish
@@ -9023,7 +8997,7 @@
- name: css-sanitizer
template:
- - name: composer-test-package55
+ - name: composer-test-package
postmerge:
- doxygen-publish
- phpunit-coverage-publish
@@ -9063,7 +9037,7 @@
- name: WrappedString
template:
- - name: composer-test-package55
+ - name: composer-test-package
postmerge:
- doxygen-publish
- phpunit-coverage-publish
@@ -9077,42 +9051,42 @@
- name: HtmlFormatter
template:
- - name: composer-test-package55
+ - name: composer-test-package
postmerge:
- doxygen-publish
- phpunit-coverage-publish
- name: mediawiki/libs/Assert
template:
- - name: composer-test-package55
+ - name: composer-test-package
postmerge:
#- doxygen-publish
- phpunit-coverage-publish
- name: mediawiki/libs/RemexHtml
template:
- - name: composer-test-package55
+ - name: composer-test-package
postmerge:
- doxygen-publish
- remexhtml-phpunit-coverage-publish
- name: mediawiki/libs/ScopedCallback
template:
- - name: composer-test-package55
+ - name: composer-test-package
postmerge:
- doxygen-publish
- phpunit-coverage-publish
- name: mediawiki/libs/Timestamp
template:
- - name: composer-test-package55
+ - name: composer-test-package
postmerge:
- doxygen-publish
- phpunit-coverage-publish
- name: mediawiki/libs/WaitConditionLoop
template:
- - name: composer-test-package55
+ - name: composer-test-package
postmerge:
- doxygen-publish
- phpunit-coverage-publish
@@ -9191,7 +9165,7 @@
- name: oojs/ui
template:
- - name: composer-test-package55
+ - name: composer-test-package
test:
- oojs-ui-npm-node-6-jessie
- oojs-ui-rake-jessie
--
To view, visit https://gerrit.wikimedia.org/r/339388
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I090d91807aa49d18bf85b067e037081cbdafdb6a
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
