jenkins-bot has submitted this change and it was merged.
Change subject: mwext-mw-selenium jobs on Nodepool
......................................................................
mwext-mw-selenium jobs on Nodepool
Previously sent as d9b9e86. This time introduce the Nodepool jobs in
addition of the one running on permanent slaves. They are only triggered
in experimental pipeline or made non voting.
Add a JJB macro mw-selenium-nodepool which is an adaptation of
mw-selenium macro, though lighter and appropriate when running in fresh
env, namely:
- drop GEM_HOME and GEM_PATH mangling
- use bundler from Jessie instead of installing it from gem
- copy pasted the cucumber line. Should be replaced by 'rake selenium'
mediawiki-selenium-integration-jessie is added as a non voting job.
Create:
mediawiki-selenium-integration-jessie
mwext-mw-selenium-composer-jessie
mwext-mw-selenium-jessie
Bug: T137112
Change-Id: I699d5be1ad3d57637f49add0dbfbfd94a23ff536
---
M jjb/macro.yaml
M jjb/mediawiki-extensions.yaml
M jjb/ruby-jobs.yaml
M tests/test_zuul_ext_dependencies.py
M zuul/layout.yaml
5 files changed, 95 insertions(+), 4 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/jjb/macro.yaml b/jjb/macro.yaml
index 6b6e1e5..86bcd17 100644
--- a/jjb/macro.yaml
+++ b/jjb/macro.yaml
@@ -382,6 +382,23 @@
- mw-selenium-with-dir:
tests-dir: 'src/extensions/$EXT_NAME/tests/browser'
+- builder:
+ name: mw-selenium-nodepool
+ builders:
+ - prepare-localhost
+ - shell: |
+ # Change to the working directory. EXT_NAME is set by Zuul parameters
+ # functions
+ cd "src/extensions/$EXT_NAME/tests/browser"
+ . '/srv/deployment/integration/slave-scripts/bin/mw-selenium-setup.sh'
+ bundle install --verbose
+ bundle exec cucumber \
+ --color \
+ --tags @integration \
+ --tags ~@skip \
+ --format pretty \
+ --format junit --out $WORKSPACE/log/junit
+
# Cleans up anything left under /tmp/jenkins-$EXECUTOR_NUMBER
#
# Note that once the bug with Xvfb and TMPDIR is resolved, this can be
diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml
index e52b2db..65fac66 100644
--- a/jjb/mediawiki-extensions.yaml
+++ b/jjb/mediawiki-extensions.yaml
@@ -170,6 +170,27 @@
days-to-keep: 15
artifact-days-to-keep: 3
+# Same as mwext-mw-selenium but on Nodepool T137112
+- job:
+ name: 'mwext-mw-selenium-jessie'
+ node: ci-jessie-wikimedia
+ concurrent: true
+ triggers:
+ - zuul
+ builders:
+ - castor-load
+ - prepare-mediawiki-zuul-project
+ - zuul-cloner:
+ projects: mediawiki/skins/Vector
+ - mw-selenium-nodepool
+ publishers:
+ - castor-save
+ - archive-log-dir
+ properties:
+ - build-discarder:
+ days-to-keep: 15
+ artifact-days-to-keep: 3
+
# Generic mw-selenium job for extensions.
- job:
name: 'mwext-mw-selenium-composer'
@@ -192,6 +213,27 @@
days-to-keep: 15
artifact-days-to-keep: 3
+# Same as mwext-mw-selenium-composer but on Nodepool T137112
+- job:
+ name: 'mwext-mw-selenium-composer-jessie'
+ node: ci-jessie-wikimedia
+ concurrent: true
+ triggers:
+ - zuul
+ builders:
+ - castor-load
+ - prepare-mediawiki-zuul-project-no-vendor
+ - zuul-cloner:
+ projects: mediawiki/skins/Vector
+ - mw-selenium-nodepool
+ publishers:
+ - castor-save
+ - archive-log-dir
+ properties:
+ - build-discarder:
+ days-to-keep: 15
+ artifact-days-to-keep: 3
+
- job-template:
name: 'mwext-{name}-whitespaces'
node: contintLabsSlave && UbuntuTrusty
diff --git a/jjb/ruby-jobs.yaml b/jjb/ruby-jobs.yaml
index 46a44cb..33e4759 100644
--- a/jjb/ruby-jobs.yaml
+++ b/jjb/ruby-jobs.yaml
@@ -134,3 +134,24 @@
- localhost-cleanup
- mw-teardown-mysql
- archive-log-dir
+
+# Same as mediawiki-selenium-integration but on Nodepool T137112
+- job:
+ name: 'mediawiki-selenium-integration-jessie'
+ node: ci-jessie-wikimedia
+ concurrent: true
+ triggers:
+ - zuul
+ builders:
+ - castor-load
+ - zuul-cloner:
+ projects: >
+ mediawiki/core
+ mediawiki/vendor
+ - mw-install-mysql
+ - mw-apply-settings
+ - mw-selenium-with-dir:
+ tests-dir: '.'
+ publishers:
+ - castor-save
+ - archive-log-dir
diff --git a/tests/test_zuul_ext_dependencies.py
b/tests/test_zuul_ext_dependencies.py
index 4c13e6a..d9c798f 100644
--- a/tests/test_zuul_ext_dependencies.py
+++ b/tests/test_zuul_ext_dependencies.py
@@ -56,7 +56,9 @@
self.assertHasDependencies(self.fetch_dependencies(
job_name='mwext-qunit-composer-jessie'))
self.assertHasDependencies(self.fetch_dependencies(
- job_name='mwext-mw-selenium'))
+ job_name='mwext-mw-selenium-composer-jessie'))
+ self.assertHasDependencies(self.fetch_dependencies(
+ job_name='mwext-mw-selenium-jessie'))
self.assertMissingDependencies(self.fetch_dependencies(
job_name='mediawiki-core-phplint'))
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 0f4f5a6..7732d36 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -889,6 +889,9 @@
branch: ^master$
- name: 'mediawiki-ruby-api-bundle-yard-publish'
branch: ^master$
+ - name: 'mediawiki-selenium-integration-jessie'
+ # Experimental T137112
+ voting: false
- name: mediawiki-core-doxygen-publish
branch: ^(master|REL.*|refs/tags/(?!wmf).*)$ # REL is bug 50325
@@ -1051,6 +1054,8 @@
- mwext-mw-selenium
postmerge:
- mwext-mw-selenium
+ experimental:
+ - mwext-mw-selenium-jessie
- name: extension-gate
test:
@@ -1731,6 +1736,8 @@
- name: rake
test:
- mediawiki-selenium-integration
+ # Non voting work in progress T137112
+ - mediawiki-selenium-integration-jessie
gate-and-submit:
- mediawiki-selenium-integration
postmerge:
@@ -2681,7 +2688,7 @@
- jsonlint
- jshint
experimental:
- - mwext-mw-selenium-composer
+ - mwext-mw-selenium-composer-jessie
- name: mediawiki/extensions/Arrays
template:
@@ -3405,7 +3412,7 @@
- jshint
- jsonlint
experimental:
- - mwext-mw-selenium
+ - mwext-mw-selenium-jessie
postmerge:
- mwext-jsduck-publish
@@ -6730,7 +6737,7 @@
gate-and-submit:
- composer-package-validate
experimental:
- - mwext-mw-selenium-composer
+ - mwext-mw-selenium-composer-jessie
- name: mediawiki/extensions/WikiLabels
template:
@@ -8093,6 +8100,8 @@
- mwext-Wikibase-repo-tests-sqlite-php55
- mwext-Wikibase-client-tests-mysql-php55
- mwext-Wikibase-client-tests-sqlite-php55
+ # Will switch to Nodepool eventually T137112
+ - mwext-mw-selenium-composer-jessie
postmerge:
- mwext-doxygen-publish
- mwext-jsduck-publish
--
To view, visit https://gerrit.wikimedia.org/r/293096
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I699d5be1ad3d57637f49add0dbfbfd94a23ff536
Gerrit-PatchSet: 6
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar <has...@free.fr>
Gerrit-Reviewer: Hashar <has...@free.fr>
Gerrit-Reviewer: Zfilipin <zfili...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
