jenkins-bot has submitted this change and it was merged.
Change subject: Don't rely on MWRealm.sh
......................................................................
Don't rely on MWRealm.sh
Change-Id: I34bee796a2a7f917e7d4c63f65cd7a6ebf93b3f9
---
M flaggedrevs-periodic-update.sh
M storage/make-all-blobs
2 files changed, 6 insertions(+), 5 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/flaggedrevs-periodic-update.sh b/flaggedrevs-periodic-update.sh
index d7543b9..ef744b6 100644
--- a/flaggedrevs-periodic-update.sh
+++ b/flaggedrevs-periodic-update.sh
@@ -1,7 +1,6 @@
#!/bin/bash
-. /srv/mediawiki/multiversion/MWRealm.sh
-FILE=`getRealmSpecificFilename /srv/mediawiki/dblists/flaggedrevs.dblist`
+FILE="/srv/mediawiki/dblists/flaggedrevs.dblist"
for db in `<$FILE`;do
echo $db
diff --git a/storage/make-all-blobs b/storage/make-all-blobs
index 219eff2..367ed68 100755
--- a/storage/make-all-blobs
+++ b/storage/make-all-blobs
@@ -1,5 +1,4 @@
#!/bin/bash
-
if [ -z $1 ];then
echo "Usage: make-all-blobs <server> [<table name>]"
exit 1
@@ -11,8 +10,11 @@
table=$2
fi
-. /srv/mediawiki/multiversion/MWRealm.sh
-FILE=`getRealmSpecificFilename /srv/mediawiki/dblists/all.dblist`
+if hostname --domain | grep -q wmflabs ; then
+ FILE="$MEDIAWIKI_STAGING_DIR/dblists/all-labs.dblist"
+else
+ FILE="$MEDIAWIKI_STAGING_DIR/dblists/all.dblist"
+fi
for db in `<$FILE`;do
echo "CREATE DATABASE IF NOT EXISTS $db" | mysql -u wikiadmin
-p`wikiadmin_pass` -h $server && \
--
To view, visit https://gerrit.wikimedia.org/r/250290
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I34bee796a2a7f917e7d4c63f65cd7a6ebf93b3f9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaMaintenance
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
