From 0781e3bc4ec94f0857fa31f90a4605ed845ec842 Mon Sep 17 00:00:00 2001 From: Allain Magyar Date: Thu, 31 Oct 2024 09:42:11 -0300 Subject: [PATCH] test: fixes docker script Signed-off-by: Allain Magyar --- .github/workflows/integration-tests.yml | 18 +++++++++--------- tests/didcomm-tests/docker/run.sh | 2 +- tests/didcomm-tests/docker/stop.sh | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 4de32395ce..20a5222848 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -81,15 +81,6 @@ jobs: run: | ./gradlew test --tests "IntegrationTestsRunner" - - name: Run didcomm tests - working-directory: "tests/didcomm-tests" - env: - AGENT_VERSION: ${{ steps.build_local_cloud_agent.outputs.agent_version }} - run: | - ./docker/run.sh "$AGENT_VERSION" - node dist/suite.spec.js - ./docker/stop.sh - - name: Make report of integration tests if: always() env: @@ -168,3 +159,12 @@ jobs: SLACK_TITLE: "Identus Cloud Agent Integration Tests: ${{ steps.analyze_test_results.outputs.conclusion }}" SLACK_USERNAME: circleci SLACK_WEBHOOK: ${{ secrets.E2E_TESTS_SLACK_WEBHOOK }} + + - name: Run didcomm tests + working-directory: "tests/didcomm-tests" + env: + AGENT_VERSION: ${{ steps.build_local_cloud_agent.outputs.agent_version }} + run: | + ./docker/run.sh "$AGENT_VERSION" + node dist/suite.spec.js + ./docker/stop.sh diff --git a/tests/didcomm-tests/docker/run.sh b/tests/didcomm-tests/docker/run.sh index c62a61d19e..aeab5f57be 100755 --- a/tests/didcomm-tests/docker/run.sh +++ b/tests/didcomm-tests/docker/run.sh @@ -7,5 +7,5 @@ CLOUD_AGENT_VERSION=$1 PORT="$PRISM_PORT" \ CLOUD_AGENT_VERSION="$CLOUD_AGENT_VERSION" \ docker compose \ - -f "docker-compose.yml" \ + -f "docker/docker-compose.yml" \ up -d --wait diff --git a/tests/didcomm-tests/docker/stop.sh b/tests/didcomm-tests/docker/stop.sh index 006cf9748e..043fafca79 100755 --- a/tests/didcomm-tests/docker/stop.sh +++ b/tests/didcomm-tests/docker/stop.sh @@ -4,5 +4,5 @@ set -e CLOUD_AGENT_VERSION="$CLOUD_AGENT_VERSION" \ docker compose \ - -f "docker-compose.yml" \ + -f "./docker/docker-compose.yml" \ down -v