Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/197958
Change subject: [WIP] Convert MediaWiki jobs from sqlite to mysql
......................................................................
[WIP] Convert MediaWiki jobs from sqlite to mysql
Change-Id: Ib9ffa55636a5d1b5d82c303e4b2aa14b1bf382fa
---
M jjb/macro.yaml
M jjb/mediawiki.yaml
2 files changed, 20 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/58/197958/1
diff --git a/jjb/macro.yaml b/jjb/macro.yaml
index 4a4bbf5..e5c4cec 100644
--- a/jjb/macro.yaml
+++ b/jjb/macro.yaml
@@ -404,14 +404,17 @@
builders:
- shell: "/srv/deployment/integration/slave-scripts/bin/mw-setup.sh"
-# Shell script backed macro installing MediaWiki with a SQLite backend
-#
-#
# ALWAYS pair with 'mw-teardown' publisher to ensure we don't leave temporary
files behind
- builder:
name: mw-install-sqlite
builders:
- shell:
"/srv/deployment/integration/slave-scripts/bin/mw-install-sqlite.sh"
+
+# ALWAYS pair with 'mw-teardown-mysql' publisher to ensure we don't leave
temporary files behind
+- builder:
+ name: mw-install-mysql
+ builders:
+ - shell:
"/srv/deployment/integration/slave-scripts/bin/mw-install-mysql.sh"
- publisher:
name: mw-teardown
@@ -423,6 +426,16 @@
onsuccess: False
onfailure: False
+- publisher:
+ name: mw-teardown-mysql
+ publishers:
+ - postbuildscript:
+ builders:
+ - shell:
"/srv/deployment/integration/slave-scripts/bin/mw-teardown-mysql.sh"
+ # Postbuild options are confusing, setting both to false ensures the
script always runs.
+ onsuccess: False
+ onfailure: False
+
# This macro is OBSOLETE
#
# Instead one should use Zuul cloner:
diff --git a/jjb/mediawiki.yaml b/jjb/mediawiki.yaml
index 8949b22..a1f465c 100644
--- a/jjb/mediawiki.yaml
+++ b/jjb/mediawiki.yaml
@@ -20,7 +20,7 @@
- jsonlint
- job-template:
- name: 'mediawiki-core-qunit'
+ name: 'krinkle-mwcore-mysql-qunit'
node: contintLabsSlave && UbuntuPrecise
concurrent: true
logrotate:
@@ -32,12 +32,12 @@
projects: >
mediawiki/core
mediawiki/vendor
- - mw-install-sqlite
+ - mw-install-mysql
- mw-apply-settings
- qunit
publishers:
- qunit-cleanup
- - mw-teardown
+ - mw-teardown-mysql
- archive-log-dir
- job-template:
@@ -345,7 +345,7 @@
- zend
jobs:
- 'mediawiki-core-jslint'
- - 'mediawiki-core-qunit'
+ - 'krinkle-mwcore-mysql-qunit'
- 'mediawiki-core-qunit-karma'
- 'mediawiki-core-jsduck'
- '{name}-npm'
--
To view, visit https://gerrit.wikimedia.org/r/197958
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib9ffa55636a5d1b5d82c303e4b2aa14b1bf382fa
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Krinkle <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
