[MediaWiki-commits] [Gerrit] Script tweaks; use standard env var names in multiversion/ch... - change (operations/mediawiki-config)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Script tweaks; use standard env var names in 
multiversion/checkoutMediaWiki
......................................................................


Script tweaks; use standard env var names in multiversion/checkoutMediaWiki

Replace $commonHomeDir / $commonLocalDir vars with MULTIVER_COMMON_HOME
/ MULTIVER_COMMON_APACHE constants, for consistency with deployment scripts,

Calls to updateBitsBranchPointers.php embedded in checkoutMediawiki and
deleteMediawiki.

Change-Id: I3f390c4c3bafa1a349411b9bf52955f8b58212e1
---
M multiversion/checkoutMediaWiki
M multiversion/deleteMediaWiki
2 files changed, 22 insertions(+), 18 deletions(-)

Approvals:
  Reedy: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/multiversion/checkoutMediaWiki b/multiversion/checkoutMediaWiki
index d84e1ae..d69fe04 100755
--- a/multiversion/checkoutMediaWiki
+++ b/multiversion/checkoutMediaWiki
@@ -1,6 +1,9 @@
 #!/usr/bin/env php
 <?php
 error_reporting( E_ALL );
+require_once './defines.php';
+require_once './updateBitsBranchPointers.php';
+
 
 /**
  * Automatically git clone a MediaWiki version and do some basic wmf setup.
@@ -19,8 +22,6 @@
  */
 function checkoutMediaWiki() {
        global $argv;
-       $commonHomeDir = '/a/common';
-       $commonLocalDir = '/usr/local/apache/common-local';
 
        $argsValid = false;
        if ( count( $argv ) >= 3 ) {
@@ -37,7 +38,7 @@
        }
 
        # MW install path
-       $destIP = "$commonHomeDir/$dstVersion";
+       $destIP = MULTIVER_COMMON_HOME . "/$dstVersion";
 
        if ( !file_exists( $destIP ) ) {
                passthru( 'git clone -n ' .
@@ -106,37 +107,37 @@
        createSymlink( $path, $link, "Created StartProfiler.php symlink." );
 
        # Create static- symlinks for bits.wikimedia.org...
-       $bitsStaticDir = "$commonHomeDir/docroot/bits/static-$dstVersionNum";
+       $bitsStaticDir = MULTIVER_COMMON_HOME . 
"/docroot/bits/static-$dstVersionNum";
        if ( !file_exists( $bitsStaticDir ) ) {
                mkdir( $bitsStaticDir, 0775 );
        }
-       $path = "$commonHomeDir/docroot/bits/static-$dstVersionNum/skins";
-       $link = "$commonLocalDir/php-$dstVersionNum/skins/";
+       $path = MULTIVER_COMMON_HOME . 
"/docroot/bits/static-$dstVersionNum/skins";
+       $link = MULTIVER_COMMON_APACHE . "/php-$dstVersionNum/skins/";
        createSymlink( $path, $link, "Created bits/static-$dstVersionNum/skins 
symlink." );
 
-       $path = "$commonHomeDir/docroot/bits/static-$dstVersionNum/extensions";
-       $link = "$commonLocalDir/php-$dstVersionNum/extensions";
+       $path = MULTIVER_COMMON_HOME . 
"/docroot/bits/static-$dstVersionNum/extensions";
+       $link = MULTIVER_COMMON_APACHE . "/php-$dstVersionNum/extensions";
        createSymlink( $path, $link, "Created 
bits/static-$dstVersionNum/extensions symlink." );
 
-       $path = "$commonHomeDir/docroot/bits/static-$dstVersionNum/resources";
-       $link = "$commonLocalDir/php-$dstVersionNum/resources";
+       $path = MULTIVER_COMMON_HOME . 
"/docroot/bits/static-$dstVersionNum/resources";
+       $link = MULTIVER_COMMON_APACHE . "/php-$dstVersionNum/resources";
        createSymlink( $path, $link, "Created 
bits/static-$dstVersionNum/resources symlink." );
 
        # Create static- symlinks for /w...
-       $liveStaticDir = "$commonHomeDir/w/static-$dstVersionNum";
+       $liveStaticDir = MULTIVER_COMMON_HOME . "/w/static-$dstVersionNum";
        if ( !file_exists( $liveStaticDir ) ) {
                mkdir( $liveStaticDir, 0775 );
        }
-       $path = "$commonHomeDir/w/static-$dstVersionNum/skins";
-       $link = "$commonLocalDir/php-$dstVersionNum/skins";
+       $path = MULTIVER_COMMON_HOME . "/w/static-$dstVersionNum/skins";
+       $link = MULTIVER_COMMON_APACHE . "/php-$dstVersionNum/skins";
        createSymlink( $path, $link, "Created /w/static-$dstVersionNum/skins 
symlink." );
 
-       $path = "$commonHomeDir/w/static-$dstVersionNum/extensions";
-       $link = "$commonLocalDir/php-$dstVersionNum/extensions";
+       $path = MULTIVER_COMMON_HOME . "/w/static-$dstVersionNum/extensions";
+       $link = MULTIVER_COMMON_APACHE . "/php-$dstVersionNum/extensions";
        createSymlink( $path, $link, "Created 
/w/static-$dstVersionNum/extensions symlink." );
 
-       $path = "$commonHomeDir/w/static-$dstVersionNum/resources";
-       $link = "$commonLocalDir/php-$dstVersionNum/resources";
+       $path = MULTIVER_COMMON_HOME . "/w/static-$dstVersionNum/resources";
+       $link = MULTIVER_COMMON_APACHE . "/php-$dstVersionNum/resources";
        createSymlink( $path, $link, "Created 
/w/static-$dstVersionNum/resources symlink." );
 
        # Create l10n cache dir
@@ -167,3 +168,4 @@
 }
 
 checkoutMediaWiki();
+updateBitsBranchPointers();
diff --git a/multiversion/deleteMediaWiki b/multiversion/deleteMediaWiki
index d920151..4799937 100755
--- a/multiversion/deleteMediaWiki
+++ b/multiversion/deleteMediaWiki
@@ -2,7 +2,8 @@
 <?php
 error_reporting( E_ALL );
 
-require_once( dirname( __FILE__ ) . '/defines.php' );
+require_once( './defines.php' );
+require_once './updateBitsBranchPointers.php';
 
 /**
  * Delete various symlinks created by checkoutMediaWiki.
@@ -91,3 +92,4 @@
 }
 
 deleteMediaWiki();
+updateBitsBranchPointers();

-- 
To view, visit https://gerrit.wikimedia.org/r/90083
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I3f390c4c3bafa1a349411b9bf52955f8b58212e1
Gerrit-PatchSet: 4
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: Reedy <re...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits