jenkins-bot has submitted this change and it was merged.
Change subject: mediawiki-core-qunit-karma: Use mysql instead of sqlite
......................................................................
mediawiki-core-qunit-karma: Use mysql instead of sqlite
Bug: T57788
Change-Id: Ib9ffa55636a5d1b5d82c303e4b2aa14b1bf382fa
---
M jjb/macro.yaml
M jjb/mediawiki.yaml
2 files changed, 19 insertions(+), 6 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/jjb/macro.yaml b/jjb/macro.yaml
index 4a4bbf5..c64beae 100644
--- a/jjb/macro.yaml
+++ b/jjb/macro.yaml
@@ -194,7 +194,7 @@
name: assert-phpflavor
builders:
- shell: |
- #!/bin/bash -e -u
+ #!/bin/bash -eu
PHP_VERSION=`php --version`
case "{phpflavor}" in
@@ -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..6477265 100644
--- a/jjb/mediawiki.yaml
+++ b/jjb/mediawiki.yaml
@@ -57,12 +57,12 @@
projects: >
mediawiki/core
mediawiki/vendor
- - mw-install-sqlite
+ - mw-install-mysql
- mw-apply-settings
- qunit-karma
publishers:
- qunit-cleanup
- - mw-teardown
+ - mw-teardown-mysql
- archive-log-dir
- job-template:
--
To view, visit https://gerrit.wikimedia.org/r/197958
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib9ffa55636a5d1b5d82c303e4b2aa14b1bf382fa
Gerrit-PatchSet: 8
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Krinkle <krinklem...@gmail.com>
Gerrit-Reviewer: Hashar <has...@free.fr>
Gerrit-Reviewer: Krinkle <krinklem...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
