Do not include local.setting.php in CI envs.

acquia · Mar 5, 2018 · 6eb49d2 · 6eb49d2
1 parent 69a360f
commit 6eb49d2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/settings/blt.settings.php b/settings/blt.settings.php
@@ -79,7 +79,7 @@
 /**
  * Local envs.
  */
-$is_local_env = !$is_ah_env && !$is_pantheon_env;
+$is_local_env = !$is_ah_env && !$is_pantheon_env && !$is_ci_env;
 
 /**
  * Common variables.
@@ -314,7 +314,7 @@
  *
  * Keep this code block at the end of this file to take full effect.
  */
-if ($is_local_env) {
+if ($is_local_env || getenv('BLT_ENV') == 'LOCAL') {
   // Load local settings for all sites.
   if (file_exists(DRUPAL_ROOT . "/sites/settings/local.settings.php")) {
     require DRUPAL_ROOT . "/sites/settings/local.settings.php";

diff --git a/tests/phpunit/BltProject/MultiSiteTest.php b/tests/phpunit/BltProject/MultiSiteTest.php
@@ -16,6 +16,7 @@ class MultiSiteTest extends BltProjectTestBase {
    * Tests multisite.
    */
   public function testMultisiteGenerate() {
+    putenv("BLT_ENV=LOCAL");
     $this->prepareMultisites($this->site1Dir, $this->site2Dir, $this->sandboxInstance, $this->sandboxInstanceClone);
 
     // Make sure we prepared thing correctly.