Ori.livneh has submitted this change and it was merged.
Change subject: Remove usage of MWRealm.sh
......................................................................
Remove usage of MWRealm.sh
Test for labs via `hostname -d | grep -q wmflabs` instead of using MWRealm.sh.
Change-Id: I147d114d4ffd6fc9126719559265af3e1b03c87c
---
M modules/scap/files/foreachwiki
M modules/scap/files/l10nupdate-1
2 files changed, 12 insertions(+), 11 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/scap/files/foreachwiki b/modules/scap/files/foreachwiki
index c3ef5cc..645cc4e 100755
--- a/modules/scap/files/foreachwiki
+++ b/modules/scap/files/foreachwiki
@@ -12,14 +12,10 @@
. /etc/profile.d/mediawiki.sh
-# Let us vary mediawiki-config files by realm
-. $MEDIAWIKI_STAGING_DIR/multiversion/MWRealm.sh
-
-# Get the all.dblist to be used depending on the realm we are on. This is made
-# possible by multiversion/MWRealm.sh
-#
-# On production the call will return all.dblist
-# On labs: all-labs.dblist
-ALL_DBLIST=$(getRealmSpecificFilename
$MEDIAWIKI_STAGING_DIR'/dblists/all.dblist')
+if hostname --domain | grep -q wmflabs ; then
+ ALL_DBLIST="$MEDIAWIKI_STAGING_DIR/dblists/all-labs.dblist"
+else
+ ALL_DBLIST="$MEDIAWIKI_STAGING_DIR/dblists/all.dblist"
+fi
exec "$(dirname "$0")/foreachwikiindblist" "$ALL_DBLIST" "${@}"
diff --git a/modules/scap/files/l10nupdate-1 b/modules/scap/files/l10nupdate-1
index b5288cf..dcc2635 100755
--- a/modules/scap/files/l10nupdate-1
+++ b/modules/scap/files/l10nupdate-1
@@ -2,7 +2,6 @@
# This script belongs in /usr/local/bin/.
. /etc/profile.d/mediawiki.sh
-. $MEDIAWIKI_STAGING_DIR/multiversion/MWRealm.sh
BINDIR=/usr/local/bin
SCAPDIR=/srv/deployment/scap/scap/bin
@@ -127,7 +126,13 @@
# Clear the ResourceLoader cached messages
echo "Refreshing ResourceLoader caches"
-ALLDB=`getRealmSpecificFilename "$MEDIAWIKI_STAGING_DIR/dblists/all.dblist"`
+
+if hostname --domain | grep -q wmflabs ; then
+ ALLDB="$MEDIAWIKI_STAGING_DIR/dblists/all-labs.dblist"
+else
+ ALLDB="$MEDIAWIKI_STAGING_DIR/dblists/all.dblist"
+fi
+
for wiki in `<"$ALLDB"`; do
/usr/local/bin/mwscript
extensions/WikimediaMaintenance/refreshMessageBlobs.php --wiki="$wiki"
done
--
To view, visit https://gerrit.wikimedia.org/r/250289
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I147d114d4ffd6fc9126719559265af3e1b03c87c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
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
