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

Jump to bottom

Updated github actions to use docker compose instead of docker-compose #1265

Merged
merged 2 commits into from
Aug 5, 2024
Merged

Updated github actions to use docker compose instead of docker-compose #1265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fcc7fc4
Updated github actions to use docker compose instead of docker-compose
jdaigneau5 Aug 5, 2024
45db2a8
More docker-compose fixes
jdaigneau5 Aug 5, 2024
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
16 changes: 8 additions & 8 deletions .github/workflows/test-http.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,30 +14,30 @@ jobs:
- name: Build and Run Services and Mongo Containers
run: |
cp docker/.docker-env.example docker/.docker-env
docker-compose --file docker/docker-compose.yml build
docker-compose --file docker/docker-compose.yml up -d
docker compose --file docker/docker-compose.yml build
docker compose --file docker/docker-compose.yml up -d
- name: Build Test Container
run: |
cp test-http/docker/.docker-env.example test-http/docker/.docker-env
docker-compose --file test-http/docker/docker-compose.yml build
docker compose --file test-http/docker/docker-compose.yml build
- name: Run Test Container
run: |
docker-compose --file test-http/docker/docker-compose.yml up -d
docker compose --file test-http/docker/docker-compose.yml up -d
- name: Sleep
run: bash -c "while ! docker-compose --file docker/docker-compose.yml logs --tail=10 cveawg | grep -q 'Serving on port'; do sleep 1; done"
run: bash -c "while ! docker compose --file docker/docker-compose.yml logs --tail=10 cveawg | grep -q 'Serving on port'; do sleep 1; done"
- name: Load Data into MongoDb
run: docker-compose -f docker/docker-compose.yml exec -T cveawg npm run populate:dev y
run: docker compose -f docker/docker-compose.yml exec -T cveawg npm run populate:dev y
- name: Run Black Box Tests
run: |
docker-compose --file test-http/docker/docker-compose.yml exec -T demon pytest src/ | tee test-http/src/testOutput.txt
docker compose --file test-http/docker/docker-compose.yml exec -T demon pytest src/ | tee test-http/src/testOutput.txt
- name: Archive Test Results
uses: actions/upload-artifact@v2
with:
name: test-results
path: test-http/src/testOutput.txt
retention-days: 1
- name: Extract Tests Results
run: docker-compose --file test-http/docker/docker-compose.yml exec -T demon /bin/bash src/parse_tests_output.sh | (read foo; echo "##[set-output name=result;]$(echo $foo)")
run: docker compose --file test-http/docker/docker-compose.yml exec -T demon /bin/bash src/parse_tests_output.sh | (read foo; echo "##[set-output name=result;]$(echo $foo)")
id: tests_result
- name: Evaluate Tests Results
if: ${{ steps.tests_result.outputs.result == 'Tests failed' }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/test-integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ jobs:
- name: Build and Run Services and Mongo Containers
run: |
cp docker/.docker-env.test-example docker/.docker-env
docker-compose --file docker/docker-compose.yml build
docker-compose --file docker/docker-compose.yml up -d
docker compose --file docker/docker-compose.yml build
docker compose --file docker/docker-compose.yml up -d
- name: Sleep
run: bash -c "while ! docker-compose --file docker/docker-compose.yml logs --tail=10 cveawg | grep -q 'Serving on port'; do sleep 1; done"
run: bash -c "while ! docker compose --file docker/docker-compose.yml logs --tail=10 cveawg | grep -q 'Serving on port'; do sleep 1; done"
- name: Run Tests
run: docker-compose -f docker/docker-compose.yml exec -T cveawg npm run test:integration
run: docker compose -f docker/docker-compose.yml exec -T cveawg npm run test:integration
continue-on-error: false
Loading