docker-compose fix db name and running tests in apps workflow

zeeshanakram3 · Jul 13, 2023 · 3ec8eeb · 3ec8eeb
1 parent b33e3bd
commit 3ec8eeb
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 12 deletions.
diff --git a/.github/workflows/joystream-apps-docker.yml b/.github/workflows/joystream-apps-docker.yml
@@ -74,9 +74,14 @@ jobs:
         run: |
           yarn build:packages
           cp docker-compose-no-bind-volumes.yml docker-compose.yml
-          docker compose up -d db processor indexer hydra-indexer-gateway graphql-server
+          ./tests/network-tests/run-test-node-docker.sh
+          sleep 15
+          docker compose up -d db indexer hydra-indexer-gateway processor graphql-server
           sleep 30
-          NO_QN=true ./tests/network-tests/run-tests.sh content-directory
+          ./tests/network-tests/start-storage.sh
+          export REUSE_KEYS=true
+          export SKIP_STORAGE_AND_DISTRIBUTION=true
+          IGNORE_HIRED_LEADS=true ./tests/network-tests/run-test-scenario.sh content-directory
 
       - name: Push new versions
         if: github.event_name == 'workflow_dispatch'

diff --git a/docker-compose-no-bind-volumes.yml b/docker-compose-no-bind-volumes.yml
@@ -204,12 +204,9 @@ services:
       - "127.0.0.1:${PROCESSOR_STATE_APP_PORT}:${PROCESSOR_STATE_APP_PORT}"
     depends_on:
       - db
-    volumes:
-      - type: bind
-        source: .
-        target: /joystream
     working_dir: /joystream
-    command: ['yarn', 'workspace', 'query-node-root', 'query-node:start:prod:with-instrumentation']
+    entrypoint: ['yarn']
+    command: ['workspace', 'query-node-root', 'query-node:start:prod:with-instrumentation']
 
   processor:
     image: joystream/query-node
@@ -226,16 +223,12 @@ services:
       - QUEUE_FACTOR=1
       - QUEUE_MAX_CAP_FACTOR=4
       - WARTHOG_DB_HOST=db
-      - WARTHOG_DB_DATABASE=${PROCESSOR_DB_NAME}
+      - WARTHOG_DB_DATABASE=${DB_NAME}
       - WARTHOG_DB_USERNAME=${DB_USER}
       - WARTHOG_DB_PASSWORD=${DB_PASS}
       - WARTHOG_APP_PORT=4002
     depends_on:
       - db
-    volumes:
-      - type: bind
-        source: .
-        target: /joystream
     working_dir: /joystream
     entrypoint: sh
     command: >