Skip to content

Commit

Permalink
Merge pull request #1150 from neicnordic/tests/rework-integrationtest…
Browse files Browse the repository at this point in the history
…-setup

Rework integration-test setup
  • Loading branch information
jbygdell authored Nov 29, 2024
2 parents 84b1534 + 88df8d0 commit e9c698a
Show file tree
Hide file tree
Showing 6 changed files with 414 additions and 49 deletions.
47 changes: 0 additions & 47 deletions .github/integration/sda-s3-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -208,49 +208,6 @@ services:
- ./sda/config.yaml:/config.yaml
- shared:/shared

sync:
image: ghcr.io/neicnordic/sensitive-data-archive:PR${PR_NUMBER}
command: [ sda-sync ]
container_name: sync
depends_on:
credentials:
condition: service_completed_successfully
minio:
condition: service_healthy
postgres:
condition: service_healthy
rabbitmq:
condition: service_healthy
environment:
- BROKER_PASSWORD=sync
- BROKER_USER=sync
- BROKER_QUEUE=mapping_stream
- DB_PASSWORD=sync
- DB_USER=sync
restart: always
volumes:
- ./sda/config.yaml:/config.yaml
- shared:/shared

sync-api:
image: ghcr.io/neicnordic/sensitive-data-archive:PR${PR_NUMBER}
command: [ sda-syncapi ]
container_name: sync-api
depends_on:
credentials:
condition: service_completed_successfully
rabbitmq:
condition: service_healthy
environment:
- BROKER_PASSWORD=sync
- BROKER_USER=sync
- BROKER_EXCHANGE=sda.dead
ports:
- "18080:8080"
restart: always
volumes:
- ./sda/config.yaml:/config.yaml

oidc:
container_name: oidc
command:
Expand Down Expand Up @@ -398,10 +355,6 @@ services:
condition: service_started
s3inbox:
condition: service_started
sync:
condition: service_started
sync-api:
condition: service_started
verify:
condition: service_started
api:
Expand Down
Loading

0 comments on commit e9c698a

Please sign in to comment.