From 8896e493f9903ead3293d945d23f80cc9b32f240 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Jakes=CC=8C?= <jan@jakes.pro>
Date: Mon, 2 Sep 2019 17:15:03 +0200
Subject: [PATCH] Simplify multisite acceptance tests setup

[MAILPOET-2302]
---
 .circleci/config.yml                          | 54 +++++++------------
 tests/docker/codeception/docker-entrypoint.sh |  2 +-
 2 files changed, 20 insertions(+), 36 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 13c529bd0e..0f8517c11e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -154,6 +154,9 @@ jobs:
     parameters:
       index:
         type: integer
+      multisite:
+        type: integer
+        default: 0
     steps:
       - attach_workspace:
           at: /home/circleci/mailpoet
@@ -165,7 +168,7 @@ jobs:
           command: |
               mkdir -m 777 -p tests/_output/exceptions
               cd tests/docker
-              docker-compose run -e SKIP_DEPS=1 codeception -g acceptance_group_<< parameters.index >> --steps --debug -vvv --html --xml
+              docker-compose run -e SKIP_DEPS=1 -e MULTISITE=<< parameters.multisite >> codeception -g acceptance_group_<< parameters.index >> --steps --debug -vvv --html --xml
       - run:
           name: Check exceptions
           command: |
@@ -177,35 +180,6 @@ jobs:
           path: tests/_output
       - store_test_results:
           path: tests/_output
-  acceptance_tests_multisite:
-    working_directory: /home/circleci/mailpoet
-    machine: true
-    parameters:
-      index:
-        type: integer
-    steps:
-      - attach_workspace:
-          at: /home/circleci/mailpoet
-      - run:
-          name: "Set up virtual host"
-          command: echo 127.0.0.1 mailpoet.loc | sudo tee -a /etc/hosts
-      - run:
-          name: Run acceptance tests
-          command: |
-              mkdir -m 777 -p tests/_output/exceptions
-              cd tests/docker
-              docker-compose run -e SKIP_DEPS=1 -e MULTISITE=1 codeception -g acceptance_group_<< parameters.index >> --steps --debug -vvv --html --xml
-      - run:
-          name: Check exceptions
-          command: |
-            if [ "$(ls tests/_output/exceptions/*.html)" ]; then
-              echo "There were some exceptions during the tests run"
-              exit 1
-            fi
-      - store_artifacts:
-          path: tests/_output
-      - store_test_results:
-          path: tests/_output
   php7_unit:
     resource_class: small
     working_directory: /home/circleci/mailpoet
@@ -394,36 +368,46 @@ workflows:
       - php7_integration:
           requires:
             - php7_unit
-      - acceptance_tests_multisite:
+      - acceptance_tests:
           index: 1
+          multisite: 1
+          name: acceptance_tests_multisite_1
           requires:
             - php5_unit
           filters:
             branches:
               only: master
-      - acceptance_tests_multisite:
+      - acceptance_tests:
           index: 2
+          multisite: 1
+          name: acceptance_tests_multisite_2
           requires:
             - php5_unit
           filters:
             branches:
               only: master
-      - acceptance_tests_multisite:
+      - acceptance_tests:
           index: 3
+          multisite: 1
+          name: acceptance_tests_multisite_3
           requires:
             - php5_unit
           filters:
             branches:
               only: master
-      - acceptance_tests_multisite:
+      - acceptance_tests:
           index: 4
+          multisite: 1
+          name: acceptance_tests_multisite_4
           requires:
             - php5_unit
           filters:
             branches:
               only: master
-      - acceptance_tests_multisite:
+      - acceptance_tests:
           index: 5
+          multisite: 1
+          name: acceptance_tests_multisite_5
           requires:
             - php5_unit
           filters:
diff --git a/tests/docker/codeception/docker-entrypoint.sh b/tests/docker/codeception/docker-entrypoint.sh
index a8c0f9bdde..a5e7b48cd3 100755
--- a/tests/docker/codeception/docker-entrypoint.sh
+++ b/tests/docker/codeception/docker-entrypoint.sh
@@ -36,7 +36,7 @@ mysqladmin --host=mysql --user=root --password=wordpress create wordpress --forc
 
 # install WordPress
 WP_CORE_INSTALL_PARAMS="--url=test.local --title=tests --admin_user=admin --admin_email=test@test.com --admin_password=password --skip-email"
-if [ -z "${MULTISITE}" ]; then
+if [[ -z "$MULTISITE" || "$MULTISITE" -eq "0" ]]; then
   echo 'Installing WordPress (single site mode)'
   wp core install $WP_CORE_INSTALL_PARAMS
 else