Skip to content

Commit

Permalink
Update & cleanup.
Browse files Browse the repository at this point in the history
  • Loading branch information
TimOrtel committed Jan 24, 2024
1 parent e59f465 commit cd6af02
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 20 deletions.
12 changes: 10 additions & 2 deletions .github/workflows/e2e-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ jobs:
- name: Gradle Wrapper Verification
uses: gradle/wrapper-validation-action@v1

# Sanity cleanup
- name: Stop all running docker containers
run: docker stop $(docker ps -a -q)

Expand All @@ -33,7 +34,7 @@ jobs:
if: success() || failure()

- name: Launch docker containers
run: docker compose -f docker/e2e-tests.yml up -d --remove-orphans --no-recreate artemis-app
run: docker compose -f docker/e2e-tests.yml up -d artemis-app-setup
if: success() || failure()

- name: JDK setup
Expand All @@ -51,4 +52,11 @@ jobs:
with:
name: Android End To End Test Results
path: test-outputs/**/*.xml
reporter: java-junit
reporter: java-junit

- name: Cleanup -> Stop all running docker containers
run: docker stop $(docker ps -a -q)

- name: Cleanup -> Remove all docker containers
run: docker rm $(docker ps -qa)
if: success() || failure()
18 changes: 0 additions & 18 deletions docker/e2e-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,24 +38,6 @@ services:
ports:
- "127.0.0.1:3306:3306"

artemis-app:
extends:
file: ./artemis.yml
service: artemis-app
depends_on:
mysql:
condition: service_healthy
env_file:
- artemis_e2e_config.env
extra_hosts:
- "host.docker.internal:host-gateway"
ports:
- "8080:8080"
expose:
- "5005"
networks:
- artemis

artemis-app-setup:
image: ellerbrock/alpine-bash-curl-ssl:latest
depends_on:
Expand Down

0 comments on commit cd6af02

Please sign in to comment.