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.

Sign up for GitHub

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

Separate repos in e2e tests #185

Merged
merged 5 commits into from
Oct 18, 2023
Merged

Separate repos in e2e tests #185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
32d82af
Place machine in ../tmp relative to serval
Enkidu93 Oct 17, 2023
c73ed45
Fixes E2E - don't have adjacent folders #158
Enkidu93 Oct 18, 2023
921173f
Debug directory structure
Enkidu93 Oct 18, 2023
90481fa
Debug commit
Enkidu93 Oct 18, 2023
e54a419
Debug
Enkidu93 Oct 18, 2023
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
13 changes: 2 additions & 11 deletions .github/workflows/ci-e2e.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,19 +32,10 @@ jobs:
dotnet-version: 6.0.x

- name: Get Machine
run: cd .. && git clone https://github.com/sillsdev/machine.git && cd machine && dotnet build && cd ../serval && dotnet build

- name: Restore dotnet tools
run: dotnet tool restore

- name: Restore dependencies
run: dotnet restore

- name: Build
run: dotnet build --no-restore
run: cd .. && mkdir machine_testing_dir && cd machine_testing_dir && git clone https://github.com/sillsdev/machine.git && cd machine && dotnet build && cd ../../serval && dotnet build #separate repos to guarantee failures when grpc or data access is not up to date

- name: Start containers
run: docker compose -f "docker-compose.yml" up -d && sleep 20 #allow time for mongo to start up properly
run: export MACHINE_TESTING_DIR="../machine_testing_dir/machine" && docker compose -f "docker-compose.yml" up -d && sleep 20 #allow time for mongo to start up properly

- name: Debug network
run: docker ps -a && docker logs --since 10m serval_cntr && docker logs --since 10m echo_cntr && docker logs --since 10m machine-engine-cntr && docker logs --since 10m serval-mongo-1 && docker logs --since 10m machine-job-cntr
Expand Down
8 changes: 4 additions & 4 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ services:
hostname: machine-engine
container_name: machine-engine-cntr
build:
context: ../machine
context: ${MACHINE_TESTING_DIR:-../machine}
dockerfile: ../machine/dockerfile.development

environment:
Expand Down Expand Up @@ -106,7 +106,7 @@ services:
- mongo
- serval-api
volumes:
- ../machine:/app:ro
- ${MACHINE_TESTING_DIR:-../machine}:/app:ro
- ~/.nuget/packages:/root/.nuget/packages:ro
- /var/lib/machine:/var/lib/machine
- /var/lib/serval:/var/lib/serval
Expand All @@ -123,7 +123,7 @@ services:
hostname: machine-job-server
container_name: machine-job-cntr
build:
context: ../machine
context: ${MACHINE_TESTING_DIR:-../machine}
dockerfile: ../machine/dockerfile.development
environment:
- ASPNETCORE_ConnectionStrings__Hangfire=mongodb://mongo:27017/machine_jobs?replicaSet=myRS
Expand Down Expand Up @@ -152,7 +152,7 @@ services:
- machine-engine
- serval-api
volumes:
- ../machine:/app:ro
- ${MACHINE_TESTING_DIR:-../machine}:/app:ro
- ~/.nuget/packages:/root/.nuget/packages:ro
- /var/lib/machine:/var/lib/machine
- /var/lib/serval:/var/lib/serval
Expand Down
Loading