diff --git a/.github/workflows/e2e-test-express-checkout.yml b/.github/workflows/e2e-test-express-checkout.yml index 195af205b..2442526a3 100644 --- a/.github/workflows/e2e-test-express-checkout.yml +++ b/.github/workflows/e2e-test-express-checkout.yml @@ -27,10 +27,10 @@ jobs: - uses: actions/checkout@v3 - name: Install Magento - run: docker-compose -f .github/workflows/templates/docker-compose.yml run --rm web make magento + run: docker-compose -f .github/docker-compose.yml run --rm web make magento - name: Start web server in background - run: docker-compose -f .github/workflows/templates/docker-compose.yml up -d web + run: docker-compose -f .github/docker-compose.yml up -d web env: DONATION_ACCOUNT: ${{secrets.DONATION_ACCOUNT}} ADYEN_MERCHANT: ${{secrets.ADYEN_MERCHANT}} @@ -59,7 +59,7 @@ jobs: run: docker exec magento2-container make fs - name: Run E2E tests - run: docker-compose -f .github/workflows/templates/docker-compose.yml run --rm playwright /e2e.sh express-checkout + run: docker-compose -f .github/docker-compose.e2e.yml run --rm playwright /e2e.sh express-checkout env: INTEGRATION_TESTS_BRANCH: develop MAGENTO_ADMIN_USERNAME: ${{secrets.MAGENTO_ADMIN_USERNAME}} diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml index ca67010fc..e6879c678 100644 --- a/.github/workflows/e2e-test.yml +++ b/.github/workflows/e2e-test.yml @@ -24,10 +24,10 @@ jobs: - uses: actions/checkout@v3 - name: Install Magento - run: docker-compose -f .github/workflows/templates/docker-compose.yml run --rm web make magento + run: docker-compose -f .github/docker-compose.yml run --rm web make magento - name: Start web server in background - run: docker-compose -f .github/workflows/templates/docker-compose.yml up -d web + run: docker-compose -f .github/docker-compose.yml up -d web env: DONATION_ACCOUNT: ${{secrets.DONATION_ACCOUNT}} ADYEN_MERCHANT: ${{secrets.ADYEN_MERCHANT}} @@ -72,7 +72,7 @@ jobs: run: docker exec magento2-container make fs - name: Run E2E tests - run: docker-compose -f .github/workflows/templates/docker-compose.yml run --rm playwright /e2e.sh standard + run: docker-compose -f .github/docker-compose.e2e.yml run --rm playwright /e2e.sh standard env: INTEGRATION_TESTS_BRANCH: develop MAGENTO_ADMIN_USERNAME: ${{secrets.MAGENTO_ADMIN_USERNAME}} diff --git a/.github/workflows/graphql-test.yml b/.github/workflows/graphql-test.yml index ef1627349..5e48cf430 100644 --- a/.github/workflows/graphql-test.yml +++ b/.github/workflows/graphql-test.yml @@ -20,10 +20,10 @@ jobs: - uses: actions/checkout@v3 - name: Install Magento - run: docker-compose -f .github/workflows/templates/docker-compose.yml run --rm web make magento + run: docker-compose -f .github/docker-compose.yml run --rm web make magento - name: Start web server in background - run: docker-compose -f .github/workflows/templates/docker-compose.yml up -d web + run: docker-compose -f .github/docker-compose.yml up -d web env: DONATION_ACCOUNT: ${{secrets.DONATION_ACCOUNT}} ADYEN_MERCHANT: ${{secrets.ADYEN_MERCHANT}} diff --git a/.github/workflows/restapi-test.yml b/.github/workflows/restapi-test.yml index ba4607099..7e72f6752 100644 --- a/.github/workflows/restapi-test.yml +++ b/.github/workflows/restapi-test.yml @@ -20,10 +20,10 @@ jobs: - uses: actions/checkout@v3 - name: Install Magento - run: docker-compose -f .github/workflows/templates/docker-compose.yml run --rm web make magento + run: docker-compose -f .github/docker-compose.yml run --rm web make magento - name: Start web server in background - run: docker-compose -f .github/workflows/templates/docker-compose.yml up -d web + run: docker-compose -f .github/docker-compose.yml up -d web env: DONATION_ACCOUNT: ${{secrets.DONATION_ACCOUNT}} ADYEN_MERCHANT: ${{secrets.ADYEN_MERCHANT}}