Move molecule to deployment-e2e (#196)

* Moved deployment/molecule to deployment-e2e

* Update paths and readmes

* Nested molecule

* Corrected paths

* paths

* path

* Moved docker up

.circleci/config.yml

@@ -170,19 +170,19 @@ jobs:
     steps:
       - checkout
       - run: git submodule update --init
-      - run: deployment/molecule/molecule.sh oracle
+      - run: deployment-e2e/molecule.sh oracle
   deployment-ui:
     executor: tokenbridge-orb/machine-with-docker-caching
     steps:
       - checkout
       - run: git submodule update --init
-      - run: deployment/molecule/molecule.sh ui
+      - run: deployment-e2e/molecule.sh ui
   deployment-monitor:
     executor: tokenbridge-orb/machine-with-docker-caching
     steps:
       - checkout
       - run: git submodule update --init
-      - run: deployment/molecule/molecule.sh monitor
+      - run: deployment-e2e/molecule.sh monitor
   ultimate:
     executor: tokenbridge-orb/machine-with-docker-caching
     parameters:

README.md

@@ -26,6 +26,7 @@ Sub-repositories maintained within this monorepo are listed below.
 | [Oracle-E2E](oracle-e2e/README.md) | End to end tests for the Oracle |
 | [Monitor-E2E](monitor-e2e/README.md) | End to end tests for the Monitor |
 | [UI-E2E](ui-e2e/README.md) | End to end tests for the UI |
+| [Deployment-E2E](deployment-e2e/README.md) | End to end tests for the Deployment |
 | [Commons](commons/README.md) | Interfaces, constants and utilities shared between the sub-repositories |
 | [E2E-Commons](e2e-commons/README.md) | Common utilities and configuration used in end to end tests |
 

deployment-e2e/Dockerfile

@@ -2,4 +2,4 @@ FROM python:3.7-stretch
 RUN apt-get update && apt-get install -y rsync
 RUN curl -fsSL https://get.docker.com | sh
 RUN pip3 install docker molecule==2.22rc1 molecule[docker] flake8
-WORKDIR mono/deployment
+WORKDIR mono/deployment-e2e

deployment-e2e/README.md

@@ -33,4 +33,4 @@ ui | Deploys and checks standalone UI on Ubuntu host
 
 ## Ultimate E2E tests
 
-For information on the Ultimate tests, please refer to [Ultimate](../../e2e-commons/ULTIMATE.md).
+For information on the Ultimate tests, please refer to [Ultimate](../e2e-commons/ULTIMATE.md).

deployment-e2e/docker-compose.yml

@@ -4,9 +4,9 @@ services:
   molecule_runner:
     build:
       context: ..
-      dockerfile: molecule/Dockerfile
+      dockerfile: deployment-e2e/Dockerfile
     restart: 'no'
     privileged: true
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
-      - ../..:/mono
+      - ..:/mono

deployment-e2e/molecule/monitor/molecule.yml

@@ -29,7 +29,7 @@ provisioner:
       r: ["bug"]
   playbooks:
     prepare: ../prepare.yml
-    converge: ../../site.yml
+    converge: ../../../deployment/site.yml
   inventory:
     host_vars:
       monitor-host:

deployment-e2e/molecule/oracle/molecule.yml

@@ -29,7 +29,7 @@ provisioner:
       r: ["bug"]
   playbooks:
     prepare: ../prepare.yml
-    converge: ../../site.yml
+    converge: ../../../deployment/site.yml
   inventory:
     host_vars:
       oracle-host:

deployment-e2e/molecule/ui/molecule.yml

@@ -29,7 +29,7 @@ provisioner:
       r: ["bug"]
   playbooks:
     prepare: ../prepare.yml
-    converge: ../../site.yml
+    converge: ../../../deployment/site.yml
   inventory:
     host_vars:
       ui-host:

deployment-e2e/molecule/ultimate-commons/converge.yml

@@ -1,5 +1,5 @@
 ---
-- import_playbook: ../../site.yml
+- import_playbook: ../../../deployment/site.yml
 # The docker-compose files have to be modified, in order to join the docker containers over network with the parity containers
 - import_playbook: ./oracle-docker-compose.yml
 - import_playbook: ./ui-docker-compose.yml

deployment/README.md

@@ -16,7 +16,7 @@ Please refer to [Execution](./EXECUTION.md).
 
 ## Testing
 
-Please refer to [Testing](./molecule/TESTING.md).
+Please refer to [Deployment-E2E](../deployment-e2e/README.md).
 
 ## Contributing
 

e2e-commons/up.sh

@@ -45,15 +45,15 @@ while [ "$1" != "" ]; do
   fi
 
   if [ "$1" == "native-to-erc" ]; then
-    ../deployment/molecule/molecule.sh ultimate-native-to-erc
+    ../deployment-e2e/molecule.sh ultimate-native-to-erc
   fi
 
   if [ "$1" == "erc-to-native" ]; then
-    ../deployment/molecule/molecule.sh ultimate-erc-to-native
+    ../deployment-e2e/molecule.sh ultimate-erc-to-native
   fi
 
   if [ "$1" == "erc-to-erc" ]; then
-    ../deployment/molecule/molecule.sh ultimate-erc-to-erc
+    ../deployment-e2e/molecule.sh ultimate-erc-to-erc
   fi
 
   shift # Shift all the parameters down by one