diff --git a/.circleci/config.yml b/.circleci/config.yml index 3d552a03..b3da4238 100644 --- a/.circleci/config.yml +++ b/.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: diff --git a/README.md b/README.md index 16d82c6b..9604a0cb 100644 --- a/README.md +++ b/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 | diff --git a/deployment/molecule/Dockerfile b/deployment-e2e/Dockerfile similarity index 86% rename from deployment/molecule/Dockerfile rename to deployment-e2e/Dockerfile index dcfb6200..a2c39d2b 100644 --- a/deployment/molecule/Dockerfile +++ b/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 diff --git a/deployment/molecule/TESTING.md b/deployment-e2e/README.md similarity index 96% rename from deployment/molecule/TESTING.md rename to deployment-e2e/README.md index 2153cb9c..a01f47f0 100644 --- a/deployment/molecule/TESTING.md +++ b/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). diff --git a/deployment/molecule/docker-compose.yml b/deployment-e2e/docker-compose.yml similarity index 74% rename from deployment/molecule/docker-compose.yml rename to deployment-e2e/docker-compose.yml index 36220751..b2dc6e8a 100644 --- a/deployment/molecule/docker-compose.yml +++ b/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 diff --git a/deployment/molecule/molecule.sh b/deployment-e2e/molecule.sh similarity index 100% rename from deployment/molecule/molecule.sh rename to deployment-e2e/molecule.sh diff --git a/deployment/molecule/monitor/Dockerfile.j2 b/deployment-e2e/molecule/monitor/Dockerfile.j2 similarity index 100% rename from deployment/molecule/monitor/Dockerfile.j2 rename to deployment-e2e/molecule/monitor/Dockerfile.j2 diff --git a/deployment/molecule/monitor/molecule.yml b/deployment-e2e/molecule/monitor/molecule.yml similarity index 95% rename from deployment/molecule/monitor/molecule.yml rename to deployment-e2e/molecule/monitor/molecule.yml index 5e5c74f7..5bce0e8c 100644 --- a/deployment/molecule/monitor/molecule.yml +++ b/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: diff --git a/deployment/molecule/monitor/tests/test_monitor.py b/deployment-e2e/molecule/monitor/tests/test_monitor.py similarity index 100% rename from deployment/molecule/monitor/tests/test_monitor.py rename to deployment-e2e/molecule/monitor/tests/test_monitor.py diff --git a/deployment/molecule/oracle/Dockerfile.j2 b/deployment-e2e/molecule/oracle/Dockerfile.j2 similarity index 100% rename from deployment/molecule/oracle/Dockerfile.j2 rename to deployment-e2e/molecule/oracle/Dockerfile.j2 diff --git a/deployment/molecule/oracle/molecule.yml b/deployment-e2e/molecule/oracle/molecule.yml similarity index 95% rename from deployment/molecule/oracle/molecule.yml rename to deployment-e2e/molecule/oracle/molecule.yml index e632805b..786855c1 100644 --- a/deployment/molecule/oracle/molecule.yml +++ b/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: diff --git a/deployment/molecule/oracle/prepare.yml b/deployment-e2e/molecule/oracle/prepare.yml similarity index 100% rename from deployment/molecule/oracle/prepare.yml rename to deployment-e2e/molecule/oracle/prepare.yml diff --git a/deployment/molecule/oracle/tests/test_oracle.py b/deployment-e2e/molecule/oracle/tests/test_oracle.py similarity index 100% rename from deployment/molecule/oracle/tests/test_oracle.py rename to deployment-e2e/molecule/oracle/tests/test_oracle.py diff --git a/deployment/molecule/prepare.yml b/deployment-e2e/molecule/prepare.yml similarity index 100% rename from deployment/molecule/prepare.yml rename to deployment-e2e/molecule/prepare.yml diff --git a/deployment/molecule/tests/test_all.py b/deployment-e2e/molecule/tests/test_all.py similarity index 100% rename from deployment/molecule/tests/test_all.py rename to deployment-e2e/molecule/tests/test_all.py diff --git a/deployment/molecule/ui/Dockerfile.j2 b/deployment-e2e/molecule/ui/Dockerfile.j2 similarity index 100% rename from deployment/molecule/ui/Dockerfile.j2 rename to deployment-e2e/molecule/ui/Dockerfile.j2 diff --git a/deployment/molecule/ui/molecule.yml b/deployment-e2e/molecule/ui/molecule.yml similarity index 95% rename from deployment/molecule/ui/molecule.yml rename to deployment-e2e/molecule/ui/molecule.yml index 308bef11..4302a9c6 100644 --- a/deployment/molecule/ui/molecule.yml +++ b/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: diff --git a/deployment/molecule/ui/tests/test_ui.py b/deployment-e2e/molecule/ui/tests/test_ui.py similarity index 100% rename from deployment/molecule/ui/tests/test_ui.py rename to deployment-e2e/molecule/ui/tests/test_ui.py diff --git a/deployment/molecule/ultimate-commons/converge.yml b/deployment-e2e/molecule/ultimate-commons/converge.yml similarity index 82% rename from deployment/molecule/ultimate-commons/converge.yml rename to deployment-e2e/molecule/ultimate-commons/converge.yml index a5df477a..23630e5b 100644 --- a/deployment/molecule/ultimate-commons/converge.yml +++ b/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 diff --git a/deployment/molecule/ultimate-commons/oracle-docker-compose.yml b/deployment-e2e/molecule/ultimate-commons/oracle-docker-compose.yml similarity index 100% rename from deployment/molecule/ultimate-commons/oracle-docker-compose.yml rename to deployment-e2e/molecule/ultimate-commons/oracle-docker-compose.yml diff --git a/deployment/molecule/ultimate-commons/ui-docker-compose.yml b/deployment-e2e/molecule/ultimate-commons/ui-docker-compose.yml similarity index 100% rename from deployment/molecule/ultimate-commons/ui-docker-compose.yml rename to deployment-e2e/molecule/ultimate-commons/ui-docker-compose.yml diff --git a/deployment/molecule/ultimate-erc-to-erc/Dockerfile.j2 b/deployment-e2e/molecule/ultimate-erc-to-erc/Dockerfile.j2 similarity index 100% rename from deployment/molecule/ultimate-erc-to-erc/Dockerfile.j2 rename to deployment-e2e/molecule/ultimate-erc-to-erc/Dockerfile.j2 diff --git a/deployment/molecule/ultimate-erc-to-erc/molecule.yml b/deployment-e2e/molecule/ultimate-erc-to-erc/molecule.yml similarity index 100% rename from deployment/molecule/ultimate-erc-to-erc/molecule.yml rename to deployment-e2e/molecule/ultimate-erc-to-erc/molecule.yml diff --git a/deployment/molecule/ultimate-erc-to-native/Dockerfile.j2 b/deployment-e2e/molecule/ultimate-erc-to-native/Dockerfile.j2 similarity index 100% rename from deployment/molecule/ultimate-erc-to-native/Dockerfile.j2 rename to deployment-e2e/molecule/ultimate-erc-to-native/Dockerfile.j2 diff --git a/deployment/molecule/ultimate-erc-to-native/molecule.yml b/deployment-e2e/molecule/ultimate-erc-to-native/molecule.yml similarity index 100% rename from deployment/molecule/ultimate-erc-to-native/molecule.yml rename to deployment-e2e/molecule/ultimate-erc-to-native/molecule.yml diff --git a/deployment/molecule/ultimate-native-to-erc/Dockerfile.j2 b/deployment-e2e/molecule/ultimate-native-to-erc/Dockerfile.j2 similarity index 100% rename from deployment/molecule/ultimate-native-to-erc/Dockerfile.j2 rename to deployment-e2e/molecule/ultimate-native-to-erc/Dockerfile.j2 diff --git a/deployment/molecule/ultimate-native-to-erc/molecule.yml b/deployment-e2e/molecule/ultimate-native-to-erc/molecule.yml similarity index 100% rename from deployment/molecule/ultimate-native-to-erc/molecule.yml rename to deployment-e2e/molecule/ultimate-native-to-erc/molecule.yml diff --git a/deployment/README.md b/deployment/README.md index d4f64320..d4c21d9c 100644 --- a/deployment/README.md +++ b/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 diff --git a/e2e-commons/up.sh b/e2e-commons/up.sh index fc97d86c..da998775 100755 --- a/e2e-commons/up.sh +++ b/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