Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable running integration test within VS #239

Merged
merged 32 commits into from
Nov 10, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
7a35af7
Delete allowedlist.yaml
mocsharp Oct 31, 2022
afe7f99
Updates storage & messaging libs
mocsharp Nov 2, 2022
195cdbf
Update licenses
mocsharp Nov 2, 2022
1fb85c5
gh-235 Refactor sqlite support to new projects
mocsharp Nov 3, 2022
0ba1a4f
Set DB type for integration test
mocsharp Nov 3, 2022
d5531ab
gh-235 Rename Sqlite to EntityFramework
mocsharp Nov 3, 2022
3e658d8
Fix project reference
mocsharp Nov 5, 2022
d9be64b
Enable running integration test in VS
mocsharp Nov 6, 2022
6402da2
Refactor integration tests
mocsharp Nov 8, 2022
af0e823
Update test run script
mocsharp Nov 8, 2022
9b19735
Update CI dependency
mocsharp Nov 8, 2022
1b07bf2
Update docker compose template
mocsharp Nov 8, 2022
dd18a3e
Remove nugetdefence scan
mocsharp Nov 8, 2022
2436aec
Limit MR max instance to 100 to avoid failure on Github
mocsharp Nov 8, 2022
9da286b
Reduce MR instance size to avoid test failures on Github
mocsharp Nov 8, 2022
be7563b
Cleanup minio after scenario
mocsharp Nov 8, 2022
e0ffa09
Remove metrics log collection
mocsharp Nov 8, 2022
85e07a4
Update readme
mocsharp Nov 8, 2022
b77a3e6
Merge branch 'develop' into vchang/e2e
mocsharp Nov 8, 2022
1095429
Fix merge conflicts
mocsharp Nov 8, 2022
4a33a28
Fix warnings
mocsharp Nov 8, 2022
8892ff3
Update run.sh
mocsharp Nov 8, 2022
6a7d274
Update storage watermark
mocsharp Nov 8, 2022
ab29adf
Update messaging lib
mocsharp Nov 9, 2022
f735aba
Configure IG log for integration test
mocsharp Nov 9, 2022
2f78cb5
Update docker compose images
mocsharp Nov 9, 2022
256bd38
Update docker compose images
mocsharp Nov 9, 2022
bd5caa8
Revert messaging lib to 0.1.9
mocsharp Nov 9, 2022
1e466cf
Update messaging lib to 0.1.11
mocsharp Nov 9, 2022
2926845
Use ubuntu-22.04 for integration test
mocsharp Nov 10, 2022
f783050
Attach output helper for DICOM SCP
mocsharp Nov 10, 2022
d5e9945
Fix unit test
mocsharp Nov 10, 2022
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
11 changes: 1 addition & 10 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -149,13 +149,6 @@ jobs:
run: dotnet build -c ${{ env.BUILD_CONFIG }} --nologo ${{ env.SOLUTION }}
working-directory: ./src

- name: NuGetDefense Scanning
continue-on-error: true
run: |
sed -i "s/OSSINDEXAPI_TOKEN/$OSSINDEXAPI_TOKEN/g" NuGetDefense.json
sed -i "s/OSSINDEXAPI_USERNAME/$OSSINDEXAPI_USERNAME/g" NuGetDefense.json
nugetdefense -p src/${{ env.SOLUTION }} --settings-file NuGetDefense.json

- name: Secret detection
uses: gitleaks/gitleaks-action@v1.6.0

Expand Down Expand Up @@ -237,9 +230,8 @@ jobs:
verbose: true

integration-test:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
timeout-minutes: 30
needs: [build]
strategy:
matrix:
feature: [AcrApi, DicomDimseScp, DicomDimseScu, DicomWebExport, DicomWebStow, HealthLevel7, Fhir]
Expand Down Expand Up @@ -285,7 +277,6 @@ jobs:
name: integration-${{ matrix.feature }}
path: |
${{ github.workspace }}/LivingDoc.html
${{ github.workspace }}/metrics.log
${{ github.workspace }}/services.log
${{ github.workspace }}/run.log
retention-days: 30
Expand Down
4 changes: 2 additions & 2 deletions doc/dependency_decisions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -791,14 +791,14 @@
- :who: mocsharp
:why: Apache-2.0 (https://github.com/Project-MONAI/monai-deploy-messaging/raw/main/LICENSE)
:versions:
- 0.1.9
- 0.1.11
:when: 2022-08-16 23:06:21.051573547 Z
- - :approve
- Monai.Deploy.Messaging.RabbitMQ
- :who: mocsharp
:why: Apache-2.0 (https://github.com/Project-MONAI/monai-deploy-messaging/raw/main/LICENSE)
:versions:
- 0.1.9
- 0.1.11
:when: 2022-08-16 23:06:21.511789690 Z
- - :approve
- Monai.Deploy.Storage
Expand Down
67 changes: 45 additions & 22 deletions docker-compose/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
version: "3.9"
services:
rabbitmq:
image: rabbitmq:3-management
image: rabbitmq:3.10-management
hostname: rabbitmq
ports:
- 5672:5672
Expand All @@ -27,9 +27,10 @@ services:
RABBITMQ_ERLANG_COOKIE: "SWQOKODSQALRPCLNMEQG"
healthcheck:
test: rabbitmq-diagnostics -q ping
interval: 15s
start_period: 10s
interval: 5s
timeout: 30s
retries: 3
retries: 5
networks:
- monaideploy

Expand All @@ -48,34 +49,53 @@ services:
MINIO_ROOT_PASSWORD: minioadmin
healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:9000/minio/health/live"]
interval: 15s
start_period: 10s
interval: 5s
timeout: 30s
retries: 3
retries: 5
networks:
- monaideploy

createbuckets:
image: minio/mc
mongodb:
image: mongo:latest
environment:
MINIO_ROOT_USER: minioadmin
MINIO_ROOT_PASSWORD: minioadmin
BUCKET_NAME: monaideploy
ENDPOINT: http://minio:9000
depends_on:
minio:
condition: service_healthy
MONGO_INITDB_ROOT_USERNAME: root
MONGO_INITDB_ROOT_PASSWORD: rootpassword
ports:
- 27017:27017
volumes:
- ./.run/mongodb/:/data/db
networks:
- monaideploy
entrypoint: >
/bin/sh -c "
until (/usr/bin/mc config host add myminio $$ENDPOINT $$MINIO_ROOT_USER $$MINIO_ROOT_PASSWORD) do echo '...waiting...' && sleep 1; done;
/usr/bin/mc mb myminio/$$BUCKET_NAME;
/usr/bin/mc policy set public myminio/$$BUCKET_NAME;
/usr/bin/mc ls myminio;
# exit 0
"
healthcheck:
test: echo 'db.runCommand("ping").ok' | mongo localhost:27017/productiondb --quiet
interval: 10s
timeout: 10s
retries: 5
start_period: 40s

orthanc:
image: osimis/orthanc:22.9.0
hostname: orthanc
volumes:
- ./configs/orthanc.json:/etc/orthanc/orthanc.json
- .run/orthanc:/var/lib/orthanc/db/
ports:
- "1114:1114"
- "8089:8089"
environment:
VERBOSE_ENABLED: "true"
networks:
- monaideploy
healthcheck:
test: ["CMD", "/probes/test-aliveness.py"]
start_period: 10s
retries: 3
interval: 15s
timeout: 30s

elasticsearch:
profiles: [ 'elk' ]
image: docker.elastic.co/elasticsearch/elasticsearch:${ELASTIC_VERSION}
hostname: elasticsearch
volumes:
Expand All @@ -98,6 +118,7 @@ services:
retries: 50

logstash:
profiles: [ 'elk' ]
image: docker.elastic.co/logstash/logstash:${ELASTIC_VERSION}
volumes:
- ./configs/logstash.yml:/usr/share/logstash/config/logstash.yml:ro,Z
Expand All @@ -120,6 +141,7 @@ services:
- monaideploy

kibana:
profiles: [ 'elk' ]
image: docker.elastic.co/kibana/kibana:${ELASTIC_VERSION}
volumes:
- ./configs/kibana.yml:/usr/share/kibana/config/kibana.yml:ro,Z
Expand All @@ -139,6 +161,7 @@ services:
retries: 120

kibana-setup:
profiles: [ 'elk' ]
image: curlimages/curl:latest
volumes:
- ./configs/kibana.ndjson:/usr/share/kibana.ndjson
Expand Down
Loading