Use existing behaviour by default, and opt in to bringing up mailhog

inviqa · Apr 9, 2021 · d50c9d9 · d50c9d9
1 parent 3da20aa
commit d50c9d9
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git 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
@@ -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
@@ -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)
             }