From 16b1216d3c092a393c98737035874e36ee647fbe Mon Sep 17 00:00:00 2001
From: Antonio Morrone <antonio@iovlabs.org>
Date: Fri, 27 Oct 2023 13:43:19 +0200
Subject: [PATCH] ci: rename docker-compose-runner.yml and fix ci

---
 .github/workflows/ci-iov-sim-tool.yml            |  2 +-
 .github/workflows/ci-iov.yml                     | 16 ++++++++--------
 bin/ci_run                                       |  2 +-
 ...tests.yml => docker-compose.ci.unit-tests.yml |  0
 ...r-compose-runner.yml => docker-compose.ci.yml |  2 +-
 docker/rskj/node.conf                            |  2 +-
 6 files changed, 12 insertions(+), 12 deletions(-)
 rename docker-compose-runner.unit-tests.yml => docker-compose.ci.unit-tests.yml (100%)
 rename docker-compose-runner.yml => docker-compose.ci.yml (90%)

diff --git a/.github/workflows/ci-iov-sim-tool.yml b/.github/workflows/ci-iov-sim-tool.yml
index 6a2af2dfa0..dfc577195c 100644
--- a/.github/workflows/ci-iov-sim-tool.yml
+++ b/.github/workflows/ci-iov-sim-tool.yml
@@ -20,7 +20,7 @@ jobs:
 
       - name: start-services
         run: |
-          docker-compose -f docker-compose-runner.yml up --build -d zk
+          docker-compose -f docker-compose.ci.yml up --build -d zk
 
       - name: init
         run: |
diff --git a/.github/workflows/ci-iov.yml b/.github/workflows/ci-iov.yml
index 339eb6a755..4d865b1042 100644
--- a/.github/workflows/ci-iov.yml
+++ b/.github/workflows/ci-iov.yml
@@ -24,9 +24,9 @@ jobs:
 
       - name: start-services
         run: |
-          docker-compose -f docker-compose-runner.yml down
-          docker-compose -f docker-compose-runner.yml pull
-          docker-compose -f docker-compose-runner.yml -f docker-compose-runner.unit-tests.yml up --build -d rskj postgres zk 
+          docker-compose -f docker-compose.ci.yml down
+          docker-compose -f docker-compose.ci.yml pull
+          docker-compose -f docker-compose.ci.yml -f docker-compose.ci.unit-tests.yml up --build -d rskj postgres zk 
           ci_run sccache --start-server &
             
       - name: generate SSL certificates
@@ -70,9 +70,9 @@ jobs:
 
       - name: start-services (rskj, postgres, zk)
         run: |
-          docker-compose -f docker-compose-runner.yml down
-          docker-compose -f docker-compose-runner.yml pull
-          docker-compose -f docker-compose-runner.yml up --build -d rskj postgres zk 
+          docker-compose -f docker-compose.ci.yml down
+          docker-compose -f docker-compose.ci.yml pull
+          docker-compose -f docker-compose.ci.yml up --build -d rskj postgres zk 
           ci_run sccache --start-server &
 
       - name: run zk init
@@ -81,7 +81,7 @@ jobs:
           ci_run zk init
 
       - name: restart dev-ticker
-        run: docker-compose -f docker-compose-runner.yml restart dev-ticker
+        run: docker-compose -f docker-compose.ci.yml restart dev-ticker
 
       - name: run-services
         run: |
@@ -113,7 +113,7 @@ jobs:
           ci_run cat dummy_prover.log
           ci_run mkdir -p ./target/release/coverage/
           ci_run "grcov . --binary-path ./target/release/deps/ -s . -t lcov --branch --ignore-not-existing --ignore '../*' --ignore '/*' -o ./target/release/coverage/lcov.info"
-          docker compose -f docker-compose-runner.yml cp zk:/usr/src/zksync/target/release/coverage/lcov.info lcov.info
+          docker compose -f docker-compose.ci.yml cp zk:/usr/src/zksync/target/release/coverage/lcov.info lcov.info
           du lcov.info
       
       - uses: codecov/codecov-action@v3
diff --git a/bin/ci_run b/bin/ci_run
index 6df0ebff87..7b1fb86341 100755
--- a/bin/ci_run
+++ b/bin/ci_run
@@ -3,4 +3,4 @@
 # Runs the command from within CI docker-compose environment.
 export ZKSYNC_HOME=$(pwd) && \
 cd $ZKSYNC_HOME || exit 1 && \
-docker-compose -f docker-compose-runner.yml exec -T zk $@
+docker-compose -f docker-compose.ci.yml exec -T zk $@
diff --git a/docker-compose-runner.unit-tests.yml b/docker-compose.ci.unit-tests.yml
similarity index 100%
rename from docker-compose-runner.unit-tests.yml
rename to docker-compose.ci.unit-tests.yml
diff --git a/docker-compose-runner.yml b/docker-compose.ci.yml
similarity index 90%
rename from docker-compose-runner.yml
rename to docker-compose.ci.yml
index 31f3298d0b..802c9a7070 100644
--- a/docker-compose-runner.yml
+++ b/docker-compose.ci.yml
@@ -19,7 +19,7 @@ services:
   dev-ticker:
     image: "rsksmart/rollup-dev-ticker:1.1.2-beta"
     env_file:
-      - ./etc/env/${ZKSYNC_ENV-dev}.env
+      - ./etc/env/${ZKSYNC_ENV-deploy}.env # default to deploy instead of dev.env, since dev.env is not versioned
       - ./etc/env/docker.env
     environment:
       - ZKSYNC_HOME=/
diff --git a/docker/rskj/node.conf b/docker/rskj/node.conf
index 5a16400cc6..8afda71eb1 100644
--- a/docker/rskj/node.conf
+++ b/docker/rskj/node.conf
@@ -60,7 +60,7 @@ rpc {
                 hosts = [
                     "localhost", 
                     "127.0.0.1", 
-                    "rskj", # rskj is the service name in docker-compose-runner.ymlfor CI
+                    "rskj", # rskj is the service name in docker-compose.ci.yml for CI
                     "host.docker.internal", # host.docker.internal localhost from container Windows and Mac
                     "172.17.0.1" # 172.17.0.1 localhost from container Linux
                     ]