From 36de0aee7bc8fd7f3d742dab6317e11cf14de81f Mon Sep 17 00:00:00 2001
From: Anthony Lapenna <lapenna.anthony@gmail.com>
Date: Tue, 29 Oct 2019 11:38:38 +1300
Subject: [PATCH] feat(test): update e2e setup

---
 test/e2e/docker-compose.yml | 49 ++++++++++++++++++++++++++++++++++++-
 test/e2e/run-e2e.sh         | 23 +++++++++++++++++
 2 files changed, 71 insertions(+), 1 deletion(-)
 create mode 100755 test/e2e/run-e2e.sh

diff --git a/test/e2e/docker-compose.yml b/test/e2e/docker-compose.yml
index b0953671a..89b878a3c 100644
--- a/test/e2e/docker-compose.yml
+++ b/test/e2e/docker-compose.yml
@@ -5,15 +5,62 @@ services:
     container_name: e2e-portainer
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
+    networks:
+      - e2e-ci
 
   cypress:
     image: cypress/included:3.5.0
     container_name: e2e-cypress
+    # command: --record --browser chrome
     depends_on:
       - portainer
     working_dir: /e2e
     environment:
-      - CYPRESS_baseUrl=http://e2e-portainer:9000
+      CYPRESS_baseUrl: http://e2e-portainer:9000
+      # CYPRESS_RECORD_KEY:
     volumes:
       - ./cypress:/e2e/cypress
       - ./cypress.json:/e2e/cypress.json
+    networks:
+      - e2e-ci
+
+  manager1:
+    image: docker:dind
+    privileged: true
+    environment:
+      DOCKER_TLS_CERTDIR:
+    hostname: manager1
+    networks:
+      - e2e-ci
+    depends_on:
+      - manager2
+      - worker1
+      - worker2
+  manager2:
+    image: docker:dind
+    privileged: true
+    environment:
+      DOCKER_TLS_CERTDIR:
+    hostname: manager2
+    networks:
+      - e2e-ci
+  worker1:
+    image: docker:dind
+    privileged: true
+    environment:
+      DOCKER_TLS_CERTDIR:
+    hostname: worker1
+    networks:
+      - e2e-ci
+  worker2:
+    image: docker:dind
+    privileged: true
+    environment:
+      DOCKER_TLS_CERTDIR:
+    hostname: worker2
+    networks:
+      - e2e-ci
+
+networks:
+  e2e-ci:
+    driver: bridge
diff --git a/test/e2e/run-e2e.sh b/test/e2e/run-e2e.sh
new file mode 100755
index 000000000..7d017c0fd
--- /dev/null
+++ b/test/e2e/run-e2e.sh
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+exec_in() { docker-compose exec -T $@; }
+
+# Up all dinds nodes
+docker-compose up -d manager1 manager2 worker1 worker2
+
+# Manager1 init
+exec_in manager1 docker swarm init
+TOKEN_WORKER="$(exec_in manager1 docker swarm join-token -q worker)"
+TOKEN_MANAGER="$(exec_in manager1 docker swarm join-token -q manager)"
+
+# Manager2 join
+exec_in manager2 docker swarm join --token $TOKEN_MANAGER manager1:2377
+
+# Worker1 join
+exec_in worker1 docker swarm join --token $TOKEN_WORKER manager1:2377
+
+# Worker2 join
+exec_in worker2 docker swarm join --token $TOKEN_WORKER manager1:2377
+
+# Up portainer
+docker-compose up --exit-code-from cypress