Fix logs and start block parameters in oracle deployment (#235)

* Update start block env vars in oracle deployment * Set logger to remote server for docker-compose-transfer.yml * avoid calculating start block parameter if provided in oracle deployment config * set home and foreign start block in erc20-native e2e * set home and foreign start block in erc20-native ultimate test
omni · Nov 15, 2019 · 8d4eb86 · 8d4eb86
1 parent cc6afb3
commit 8d4eb86
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 2 deletions.
diff --git a/deployment-e2e/molecule/ultimate-erc-to-native/molecule.yml b/deployment-e2e/molecule/ultimate-erc-to-native/molecule.yml
@@ -36,6 +36,8 @@ provisioner:
         COMMON_FOREIGN_RPC_URL: "http://parity2:8545"
         ORACLE_VALIDATOR_ADDRESS: "0xaaB52d66283F7A1D5978bcFcB55721ACB467384b"
         ORACLE_VALIDATOR_ADDRESS_PRIVATE_KEY: "8e829f695aed89a154550f30262f1529582cc49dc30eff74a6b491359e0230f9"
+        ORACLE_HOME_START_BLOCK: 1
+        ORACLE_FOREIGN_START_BLOCK: 1
       ui-erc-to-native-host:
         COMMON_HOME_RPC_URL: "http://localhost:8541"
         COMMON_FOREIGN_RPC_URL: "http://localhost:8542"

diff --git a/deployment/roles/oracle/tasks/logging.yml b/deployment/roles/oracle/tasks/logging.yml
@@ -18,6 +18,25 @@
     content: "{{ docker_compose_parsed | to_yaml }}"
     dest: "{{ bridge_path }}/oracle/docker-compose.yml"
 
+- name: Slurp docker compose extended file
+  slurp:
+    src: "{{ bridge_path }}/oracle/docker-compose-transfer.yml"
+  register: docker_compose_extended_slurp
+
+- name: Parse docker compose extended file
+  set_fact:
+    docker_compose_extended_parsed: "{{ docker_compose_extended_slurp['content'] | b64decode | from_yaml }}"
+
+- name: Set logger to remote server for extended file
+  set_fact:
+    docker_compose_extended_parsed: "{{ docker_compose_extended_parsed |combine({'services': {item: {'logging': {'driver': 'syslog','options': {'tag': '{{.Name}}/{{.ID}}'}}}}}, recursive=True) }}"
+  with_items: "{{ docker_compose_extended_parsed.services }}"
+
+- name: Write new docker-compose-extended file
+  copy:
+    content: "{{ docker_compose_extended_parsed | to_yaml }}"
+    dest: "{{ bridge_path }}/oracle/docker-compose-transfer.yml"
+
 - name: Set the local container logs configuration file
   template:
     src: 31-oracle-docker.conf.j2

diff --git a/deployment/roles/oracle/tasks/post_config.yml b/deployment/roles/oracle/tasks/post_config.yml
@@ -5,14 +5,16 @@
   args:
     chdir: "{{ bridge_path }}/oracle"
   register: BLOCKS
+  when: (ORACLE_HOME_START_BLOCK is not defined) or (ORACLE_FOREIGN_START_BLOCK is not defined)
 
 - name: Write blocks
   blockinfile:
     path: "{{ bridge_path }}/oracle/.env"
     marker: "## {mark} Calculated by scripts/getValidatorStartBlocks.js"
     block: |
-      HOME_START_BLOCK={{ (BLOCKS.stdout | from_json).homeStartBlock }}
-      FOREIGN_START_BLOCK={{ (BLOCKS.stdout | from_json).foreignStartBlock }}
+      ORACLE_HOME_START_BLOCK={{ (BLOCKS.stdout | from_json).homeStartBlock }}
+      ORACLE_FOREIGN_START_BLOCK={{ (BLOCKS.stdout | from_json).foreignStartBlock }}
+  when: (ORACLE_HOME_START_BLOCK is not defined) or (ORACLE_FOREIGN_START_BLOCK is not defined)
 
 - name: Get validator address
   become_user: "{{ compose_service_user }}"

diff --git a/deployment/roles/oracle/templates/.env.j2 b/deployment/roles/oracle/templates/.env.j2
@@ -47,3 +47,10 @@ COMMON_FOREIGN_GAS_PRICE_FACTOR={{ COMMON_FOREIGN_GAS_PRICE_FACTOR }}
 ORACLE_ALLOW_HTTP_FOR_RPC={{ "yes" if ORACLE_ALLOW_HTTP_FOR_RPC else "no" }}
 ORACLE_QUEUE_URL={{ ORACLE_QUEUE_URL }}
 ORACLE_REDIS_URL={{ ORACLE_REDIS_URL }}
+
+{% if ORACLE_HOME_START_BLOCK | default('') != '' %}
+ORACLE_HOME_START_BLOCK={{ ORACLE_HOME_START_BLOCK }}
+{% endif %}
+{% if ORACLE_FOREIGN_START_BLOCK | default('') != '' %}
+ORACLE_FOREIGN_START_BLOCK={{ ORACLE_FOREIGN_START_BLOCK }}
+{% endif %}
diff --git a/e2e-commons/components-envs/oracle-erc20-native.env b/e2e-commons/components-envs/oracle-erc20-native.env
@@ -21,3 +21,5 @@ COMMON_FOREIGN_GAS_PRICE_FACTOR=0.1
 ORACLE_HOME_RPC_POLLING_INTERVAL=500
 ORACLE_FOREIGN_RPC_POLLING_INTERVAL=500
 ORACLE_ALLOW_HTTP_FOR_RPC=yes
+ORACLE_HOME_START_BLOCK=1
+ORACLE_FOREIGN_START_BLOCK=1