Use the MW_QUIBBLE_CI constant over $wgWikimediaJenkinsCI

Also don't bother setting this in the Jenkins' specific
configuration ourselves, this is Quibble's/ the CI's
responsibility.
This should be merged together with the EntitySchema
change: I28bd84d4a2d98ef581e55341e105df2c85a1bf10

Bug: T366243
Change-Id: Ie8b39c1a43118d4c5edf6f189d776a7a5c93da6e

Author: mariushoch

Wikibase.php

@@ -12,15 +12,15 @@
 if ( $wgEnableWikibaseRepo ?? true ) {
 	wfLoadExtension( 'WikibaseRepository', __DIR__ . '/extension-repo.json' );
 
-	if ( $wgWikimediaJenkinsCI ?? false ) {
+	if ( defined( 'MW_QUIBBLE_CI' ) ) {
 		require_once __DIR__ . '/repo/config/Wikibase.ci.php';
 	}
 }
 
 if ( $wgEnableWikibaseClient ?? true ) {
 	wfLoadExtension( 'WikibaseClient', __DIR__ . '/extension-client.json' );
 
-	if ( $wgWikimediaJenkinsCI ?? false ) {
+	if ( defined( 'MW_QUIBBLE_CI' ) ) {
 		require_once __DIR__ . '/client/config/WikibaseClient.ci.php';
 	}
 }

build/ci-scripts/mw-apply-wb-settings.sh

@@ -19,7 +19,8 @@ function apply_repo_settings {
 function apply_common_before_settings {
   echo 'error_reporting(E_ALL| E_STRICT);' >> LocalSettings.php
   echo 'ini_set("display_errors", 1);' >> LocalSettings.php
-  echo '$wgWikimediaJenkinsCI = true;' >> LocalSettings.php
+  # For re-using the Wikimedia CI settings, pretend we're running in quibble
+  echo 'if ( !defined( "MW_QUIBBLE_CI" ) ) define( "MW_QUIBBLE_CI", true );' >> LocalSettings.php
   echo '$wgShowExceptionDetails = true;' >> LocalSettings.php
   echo '$wgDevelopmentWarnings = true;' >> LocalSettings.php
   echo '$wgLanguageCode = "'$LANG'";' >> LocalSettings.php

build/jenkins/mw-apply-wb-settings.sh

@@ -34,8 +34,6 @@ function apply_client_settings {
 // mw-apply-wb-settings.php:
 $wgEnableWikibaseRepo = false;
 $wgEnableWikibaseClient = true;
-// $wgWikimediaJenkinsCI is usually set by Jenkins/Quibble
-$wgWikimediaJenkinsCI = true;
 PHP
   echo -n '?>' >> LocalSettings.php
   cat LocalSettings-$$.php >> LocalSettings.php
@@ -51,8 +49,6 @@ function apply_repo_settings {
 // mw-apply-wb-settings.php:
 $wgEnableWikibaseRepo = true;
 $wgEnableWikibaseClient = true;
-// $wgWikimediaJenkinsCI is usually set by Jenkins/Quibble
-$wgWikimediaJenkinsCI = true;
 PHP
   echo -n '?>' >> LocalSettings.php
   cat LocalSettings-$$.php >> LocalSettings.php