Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -390,14 +390,14 @@ jobs:

- name: Run E2E tests with docker-compose
run: |
docker-compose -f docker-compose.test.yml up --abort-on-container-exit --exit-code-from test-runner
docker compose -f docker-compose.test.yml up --abort-on-container-exit --exit-code-from test-runner
env:
COMPOSE_INTERACTIVE_NO_CLI: 1

- name: Cleanup
if: always()
run: |
docker-compose -f docker-compose.test.yml down -v
docker compose -f docker-compose.test.yml down -v

# Assert that the Azure custom-role actions list is identical in the TF module
# and the ARM onboarding template. Fast (shell + jq only), so it always runs.
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -229,8 +229,8 @@ cost-estimate:
# Docker Compose E2E tests
docker-compose-test:
@echo "Running E2E tests with docker-compose..."
docker-compose -f docker-compose.test.yml up --abort-on-container-exit --exit-code-from test-runner
docker-compose -f docker-compose.test.yml down -v
docker compose -f docker-compose.test.yml up --abort-on-container-exit --exit-code-from test-runner
docker compose -f docker-compose.test.yml down -v

# Install development dependencies
install-dev-tools:
Expand Down
Loading