jenkins-bot has submitted this change and it was merged.
Change subject: Implement mw-install-mysql and mw-teardown-mysql
......................................................................
Implement mw-install-mysql and mw-teardown-mysql
Bug: T57788
Change-Id: Ib770fe4188874b93fee714353f6fe3282231a9e3
---
D bin/mw-install-mysql.sh
A bin/mw-install-mysql.sh
M bin/mw-install-sqlite.sh
M bin/mw-set-env.sh
A bin/mw-teardown-mysql.sh
5 files changed, 47 insertions(+), 4 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/bin/mw-install-mysql.sh b/bin/mw-install-mysql.sh
deleted file mode 120000
index 0fdaf41..0000000
--- a/bin/mw-install-mysql.sh
+++ /dev/null
@@ -1 +0,0 @@
-not-implemented.sh
\ No newline at end of file
diff --git a/bin/mw-install-mysql.sh b/bin/mw-install-mysql.sh
new file mode 100755
index 0000000..e381a3a
--- /dev/null
+++ b/bin/mw-install-mysql.sh
@@ -0,0 +1,22 @@
+#!/bin/bash -ex
+
+. /srv/deployment/integration/slave-scripts/bin/mw-setup.sh
+
+mysql -u root <<EOS
+DROP DATABASE IF EXISTS ${MW_DB};
+CREATE DATABASE ${MW_DB};
+GRANT ALL ON ${MW_DB}.* to '${MW_DB_USER}'@'${MW_DB_HOST}' identified by
'${MW_DB_PASS}';
+EOS
+
+# Run MediaWiki installer
+cd "$MW_INSTALL_PATH"
+php maintenance/install.php \
+ --confpath "$MW_INSTALL_PATH" \
+ --dbtype=mysql \
+ --dbserver="$MW_DB_HOST" \
+ --dbuser="$MW_DB_USER" \
+ --dbpass="$MW_DB_PASS" \
+ --dbname="$MW_DB" \
+ --pass testpass \
+ TestWiki \
+ WikiAdmin
diff --git a/bin/mw-install-sqlite.sh b/bin/mw-install-sqlite.sh
index 98b2363..94e2632 100755
--- a/bin/mw-install-sqlite.sh
+++ b/bin/mw-install-sqlite.sh
@@ -5,12 +5,12 @@
# Run MediaWiki installer
cd "$MW_INSTALL_PATH"
php maintenance/install.php \
- --confpath "${MW_INSTALL_PATH}" \
+ --confpath "$MW_INSTALL_PATH" \
--dbtype=sqlite \
- --dbname="my_wiki" \
--dbpath="$MW_TMPDIR" \
+ --dbname="$MW_DB" \
--pass testpass \
- sqlitetest \
+ TestWiki \
WikiAdmin
# Installer creates files as 644 jenkins:jenkins
diff --git a/bin/mw-set-env.sh b/bin/mw-set-env.sh
index 89570ac..618e5a4 100755
--- a/bin/mw-set-env.sh
+++ b/bin/mw-set-env.sh
@@ -24,6 +24,16 @@
export MW_TMPDIR="$WORKSPACE/data"
fi
+# Predicitable database credentials
+# MySQL dbname maxlength: 62 (no spaces or dashes)
+# Note: Use EXECUTOR_NUMBER instead BUILD_TAG as the latter risks being too
long.
+# https://wiki.jenkins-ci.org/display/JENKINS/Building+a+software+project
+export MW_DB="jenkins_u${EXECUTOR_NUMBER}_mw"
+export MW_DB_HOST="localhost"
+# MySQL username maxlength: 16
+export MW_DB_USER="jenkins_u${EXECUTOR_NUMBER}"
+export MW_DB_PASS="pw_jenkins_u${EXECUTOR_NUMBER}"
+
export LOG_DIR="$WORKSPACE/log"
# Create logs direcotry
diff --git a/bin/mw-teardown-mysql.sh b/bin/mw-teardown-mysql.sh
new file mode 100755
index 0000000..ccfdf66
--- /dev/null
+++ b/bin/mw-teardown-mysql.sh
@@ -0,0 +1,12 @@
+#!/bin/bash -ex
+
+. /srv/deployment/integration/slave-scripts/bin/mw-setup.sh
+
+mysql -u root <<EOS
+DROP DATABASE IF EXISTS ${MW_DB};
+EOS
+
+mysql -u root <<EOS
+REVOKE ALL PRIVILEGES, GRANT OPTION FROM '${MW_DB_USER}'@'${MW_DB_HOST}';
+DROP USER '${MW_DB_USER}'@'${MW_DB_HOST}';
+EOS
--
To view, visit https://gerrit.wikimedia.org/r/197847
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib770fe4188874b93fee714353f6fe3282231a9e3
Gerrit-PatchSet: 2
Gerrit-Project: integration/jenkins
Gerrit-Branch: master
Gerrit-Owner: Krinkle <[email protected]>
Gerrit-Reviewer: AndyRussG <[email protected]>
Gerrit-Reviewer: Awight <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
