remove redis installation and redis usage to check if the oracle is running

.circleci/config.yml

@@ -51,28 +51,25 @@ orbs:
               paths:
                 - ~/.cache/yarn
       wait-for-oracle:
-        parameters:
-          redis-key:
-            type: string
         steps:
-          - run:
-              name: Install redis tools
-              command: sudo apt-get install -y redis-tools
           - run:
               name: Wait for the Oracle to start
               command: |
-                set +e
                 i=0
-                while [[ $(redis-cli GET << parameters.redis-key >> ) ]]; do
+                while : 
-                  ((i++))
+                do
-                  if [ "$i" -gt 30 ]
+                  (echo > /dev/tcp/127.0.0.1/6379) >/dev/null 2>&1
-                  then
+                  if [[ $? -eq 0 ]]; then
-                    exit -1
+                    break
+                  fi
+                  ((i++))
+                  if [ "$i" -gt 30 ]; then
+                    echo "Redis has not open the port"
+                    exit 1
                   fi
-
                   echo "Sleeping..."
                   sleep 3
-                done
+                done                
     executors:
       docker-node:
         docker:
@@ -225,9 +222,6 @@ jobs:
       scenario-name:
         description: "Molecule scenario name used to create the infrastructure"
         type: string
-      redis-key:
-        description: "Redis key checked for non-emptiness to assert if Oracle is running"
-        type: string
       ui-e2e-grep:
         description: "Mocha grep string used to run ui-e2e tests specific to given type of bridge"
         default: ''
@@ -247,8 +241,7 @@ jobs:
           name: Prepare the infrastructure
           command: e2e-commons/up.sh deploy << parameters.scenario-name >> blocks
           no_output_timeout: 50m
-      - tokenbridge-orb/wait-for-oracle:
+      - tokenbridge-orb/wait-for-oracle
-          redis-key: << parameters.redis-key >>
       - when:
           condition: << parameters.ui-e2e-grep >>
           steps:
@@ -297,25 +290,20 @@ workflows:
       - ultimate:
           name: "ultimate: native to erc"
           scenario-name: native-to-erc
-          redis-key: native-erc-collected-signatures:lastProcessedBlock
           ui-e2e-grep: "NATIVE TO ERC"
       - ultimate:
           name: "ultimate: erc to native"
           scenario-name: erc-to-native
-          redis-key: erc-native-collected-signatures:lastProcessedBlock
           ui-e2e-grep: "ERC TO NATIVE"
       - ultimate:
           name: "ultimate: erc to erc"
           scenario-name: erc-to-erc
-          redis-key: erc-erc-collected-signatures:lastProcessedBlock
           ui-e2e-grep: "ERC TO ERC"
       - ultimate:
           name: "ultimate: amb"
           scenario-name: amb
-          redis-key: amb-collected-signatures:lastProcessedBlock
           oracle-e2e-script: "amb"
       - ultimate:
           name: "ultimate: amb stake erc to erc"
           scenario-name: ultimate-amb-stake-erc-to-erc
-          redis-key: amb-collected-signatures:lastProcessedBlock
           ui-e2e-grep: "AMB-STAKE-ERC-TO-ERC"

deployment-e2e/molecule/ultimate-commons/oracle-add-docker-external-network.yml

@@ -24,3 +24,10 @@
   copy:
     content: "{{ docker_compose_parsed | to_yaml }}"
     dest: "/home/poadocker/bridge/oracle/{{ file }}.yml"
+
+- name: Get updated docker file
+  shell: cat "/home/poadocker/bridge/oracle/{{ file }}.yml"
+  register: catout
+
+- debug: var=catout.stdout_lines
+

deployment-e2e/molecule/ultimate-commons/oracle-docker-compose.yml

@@ -3,9 +3,30 @@
   hosts: oracle
   become: true
   tasks:
+  - name: get statuses for docker containers
+    shell: docker ps -a
+    register: docker1out
+
+  - debug: var=docker1out.stdout_lines
+
+  - name: get status for poabridge
+    shell: /etc/init.d/poabridge status
+    register: serviceout
+
+  - debug: var=serviceout.stdout_lines
+
   - name: stop the service
     shell: service poabridge stop
 
+  - name: force to stop redis and rabit
+    shell: docker rm -f oracle_rabbit_1 oracle_redis_1 || true
+
+  - name: get statuses for docker containers
+    shell: docker ps -a
+    register: docker2out
+
+  - debug: var=docker2out.stdout_lines
+
   - name: Build current oracle image
     shell: docker build -t oracle:ultimate-testing --file oracle/Dockerfile .
     delegate_to: 127.0.0.1
@@ -32,4 +53,14 @@
       loop_var: file
 
   - name: start the service
-    shell: service poabridge start
+    #shell: service poabridge start
+    shell: /etc/init.d/poabridge start
+    register: startout
+
+  - debug: var=startout.stdout_lines
+
+  - name: get statuses for docker containers
+    shell: docker ps -a
+    register: docker3out
+
+  - debug: var=docker3out.stdout_lines

monitor/docker-compose-build.yml

@@ -3,4 +3,6 @@ version: '2.4'
 services:
   monitor:
     image: poanetwork/tokenbridge-monitor
-    build: .
+    build:
+      context: ..
+      dockerfile: monitor/Dockerfile