From d50c9d90feccb537a85e62807ef57bd887e731ff Mon Sep 17 00:00:00 2001
From: Kieren Evans <kevans@inviqa.com>
Date: Fri, 9 Apr 2021 14:54:43 +0300
Subject: [PATCH] Use existing behaviour by default, and opt in to bringing up
 mailhog

---
 src/_base/application/overlay/Jenkinsfile.twig   | 4 ++++
 src/_base/harness/attributes/common.yml          | 1 +
 src/drupal8/application/overlay/Jenkinsfile.twig | 4 ++++
 3 files changed, 9 insertions(+)

diff --git a/src/_base/application/overlay/Jenkinsfile.twig b/src/_base/application/overlay/Jenkinsfile.twig
index ddf425463..8a3ae889a 100644
--- a/src/_base/application/overlay/Jenkinsfile.twig
+++ b/src/_base/application/overlay/Jenkinsfile.twig
@@ -46,7 +46,11 @@ pipeline {
 {% if @('jenkins.tests.isolated') %}
         stage('Build') {
             steps {
+{% if @('jenkins.tests.use_global_services') %}
                 sh 'ws install'
+{% else %}
+                sh 'ws enable'
+{% endif %}
                 milestone(30)
             }
         }
diff --git a/src/_base/harness/attributes/common.yml b/src/_base/harness/attributes/common.yml
index 290e64f5f..cf2e05867 100644
--- a/src/_base/harness/attributes/common.yml
+++ b/src/_base/harness/attributes/common.yml
@@ -30,6 +30,7 @@ attributes.default:
         enabled: true
     tests:
       isolated: true
+      use_global_services: false
 
   pipeline:
     base:
diff --git a/src/drupal8/application/overlay/Jenkinsfile.twig b/src/drupal8/application/overlay/Jenkinsfile.twig
index dacc11ef4..b09c5abb5 100644
--- a/src/drupal8/application/overlay/Jenkinsfile.twig
+++ b/src/drupal8/application/overlay/Jenkinsfile.twig
@@ -45,7 +45,11 @@ pipeline {
 {% if @('jenkins.tests.isolated') %}
         stage('Build') {
             steps {
+{% if @('jenkins.tests.use_global_services') %}
                 sh 'ws install'
+{% else %}
+                sh 'ws enable'
+{% endif %}
                 sh 'ws exec app composer:development_dependencies'
                 milestone(30)
             }