[ci] #4303: Fix Docker Compose path for tests

Signed-off-by: BAStos525 <jungle.vas@yandex.ru>
hyperledger · Feb 20, 2024 · efd07d9 · efd07d9
1 parent ac3d4c9
commit efd07d9
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 12 deletions.
diff --git a/.github/workflows/iroha2-dev.yml b/.github/workflows/iroha2-dev.yml
@@ -6,6 +6,7 @@ on:
 
 env:
   CARGO_TERM_COLOR: always
+  DOCKER_COMPOSE_PATH: configs/docker_compose
 
 jobs:
   registry:
@@ -32,16 +33,16 @@ jobs:
           cache-to: type=gha,mode=max
       - name: Test docker-compose.single.yml before pushing
         run: |
-          docker compose -f docker-compose.single.yml up --wait || exit 1
-          docker compose -f docker-compose.single.yml down
+          docker compose -f ${{ env.DOCKER_COMPOSE_PATH }}/docker-compose.single.yml up --wait || exit 1
+          docker compose -f ${{ env.DOCKER_COMPOSE_PATH }}/docker-compose.single.yml down
       - name: Test docker-compose.local.yml before pushing
         run: |
-          docker compose -f docker-compose.local.yml up --wait || exit 1
-          docker compose -f docker-compose.local.yml down
+          docker compose -f ${{ env.DOCKER_COMPOSE_PATH }}/docker-compose.local.yml up --wait || exit 1
+          docker compose -f ${{ env.DOCKER_COMPOSE_PATH }}/docker-compose.local.yml down
       - name: Test docker-compose.yml before pushing
         run: |
-          docker compose -f docker-compose.yml up --wait || exit 1
-          docker compose -f docker-compose.yml down
+          docker compose -f ${{ env.DOCKER_COMPOSE_PATH }}/docker-compose.yml up --wait || exit 1
+          docker compose -f ${{ env.DOCKER_COMPOSE_PATH }}/docker-compose.yml down
       - name: Login to DockerHub
         uses: docker/login-action@v3
         with:

diff --git a/.github/workflows/iroha2-release.yml b/.github/workflows/iroha2-release.yml
@@ -6,6 +6,7 @@ on:
 
 env:
   CARGO_TERM_COLOR: always
+  DOCKER_COMPOSE_PATH: configs/docker_compose
 
 jobs:
   registry:
@@ -42,16 +43,16 @@ jobs:
           cache-to: type=gha,mode=max
       - name: Test docker-compose.single.yml before pushing
         run: |
-          docker compose -f docker-compose.single.yml up --wait || exit 1
-          docker compose -f docker-compose.single.yml down
+          docker compose -f ${{ env.DOCKER_COMPOSE_PATH }}/docker-compose.single.yml up --wait || exit 1
+          docker compose -f ${{ env.DOCKER_COMPOSE_PATH }}/docker-compose.single.yml down
       - name: Test docker-compose.local.yml before pushing
         run: |
-          docker compose -f docker-compose.local.yml up --wait || exit 1
-          docker compose -f docker-compose.local.yml down
+          docker compose -f ${{ env.DOCKER_COMPOSE_PATH }}/docker-compose.local.yml up --wait || exit 1
+          docker compose -f ${{ env.DOCKER_COMPOSE_PATH }}/docker-compose.local.yml down
       - name: Test docker-compose.yml before pushing
         run: |
-          docker compose -f docker-compose.yml up --wait || exit 1
-          docker compose -f docker-compose.yml down
+          docker compose -f ${{ env.DOCKER_COMPOSE_PATH }}/docker-compose.yml up --wait || exit 1
+          docker compose -f ${{ env.DOCKER_COMPOSE_PATH }}/docker-compose.yml down
       - name: Login to DockerHub
         uses: docker/login-action@v3
         with:

diff --git a/configs/swarm/client.toml → configs/docker_compose/client.toml b/configs/swarm/client.toml → configs/docker_compose/client.toml
diff --git a/configs/swarm/docker-compose.local.yml → ...s/docker_compose/docker-compose.local.yml b/configs/swarm/docker-compose.local.yml → ...s/docker_compose/docker-compose.local.yml
diff --git a/configs/swarm/docker-compose.single.yml → .../docker_compose/docker-compose.single.yml b/configs/swarm/docker-compose.single.yml → .../docker_compose/docker-compose.single.yml
diff --git a/configs/swarm/docker-compose.yml → configs/docker_compose/docker-compose.yml b/configs/swarm/docker-compose.yml → configs/docker_compose/docker-compose.yml
diff --git a/configs/swarm/executor.wasm → configs/docker_compose/executor.wasm b/configs/swarm/executor.wasm → configs/docker_compose/executor.wasm
diff --git a/configs/swarm/genesis.json → configs/docker_compose/genesis.json b/configs/swarm/genesis.json → configs/docker_compose/genesis.json