Ori.livneh has submitted this change and it was merged.
Change subject: Removed features flagged around MW_SCAP_BETA
......................................................................
Removed features flagged around MW_SCAP_BETA
* Kept the ENV var and exports, since it might be useful later
Change-Id: I6b856b5c22d28957c74cba56c87d4bea99029a0a
---
M files/scap/scap
M files/scap/scap-2
2 files changed, 3 insertions(+), 24 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/files/scap/scap b/files/scap/scap
index c5203bf..4c7ba37 100755
--- a/files/scap/scap
+++ b/files/scap/scap
@@ -97,11 +97,9 @@
dsh -F30 -cM -f "$NODEFILE" -o -oSetupTimeout=10 -- "$DSH_EXPORTS
/usr/local/bin/scap-1 \""$RSYNC_SERVERS"\""
echo 'Finished'
-if [[ "$MW_SCAP_BETA" == "1" ]]; then
- echo 'Rebuilding CDB files from /upstream...'
- dsh -cM -g mediawiki-installation -o -oSetupTimeout=10 -- "$DSH_EXPORTS
/usr/local/bin/scap-rebuild-cdbs"
- echo 'Finished'
-fi
+echo 'Rebuilding CDB files from /upstream...'
+dsh -cM -g mediawiki-installation -o -oSetupTimeout=10 -- "$DSH_EXPORTS
/usr/local/bin/scap-rebuild-cdbs"
+echo 'Finished'
# Builds wikiversions.cdb and syncs it to the apaches with the dat file
sync-wikiversions || die
diff --git a/files/scap/scap-2 b/files/scap/scap-2
index 46dfc76..7e16985 100755
--- a/files/scap/scap-2
+++ b/files/scap/scap-2
@@ -29,22 +29,3 @@
exit 1
fi
-if [ "$MW_SCAP_BETA" != "1" ]; then
- # Leave some of the cores free for apache processes
- CPUS=`grep -c 'model name' /proc/cpuinfo`
- THREADS=`expr $CPUS / 2`
-
- # Only looks at certain MW version if specified
- if [ -n "$MW_VERSIONS_SYNC" ]; then
- mwVersions=$MW_VERSIONS_SYNC
- else
- mwVersions=$($BINDIR/mwversionsinuse)
- fi
-
- # Rebuild the CDB files from the JSON versions
- # Regenerate the extension message file list for all active MediaWiki
versions
- for mwVerNum in ${mwVersions[@]}; do
- $BINDIR/mergeCdbFileUpdates
--directory="$MW_COMMON/php-$mwVerNum/cache/l10n" \
- --trustmtime --threads=$THREADS
- done
-fi
--
To view, visit https://gerrit.wikimedia.org/r/106451
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6b856b5c22d28957c74cba56c87d4bea99029a0a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Aaron Schulz <[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
