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

Testing CI after small changes #97

Merged
merged 1 commit into from
Jan 23, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 2 additions & 5 deletions .github/workflows/shell-activity-example.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,12 @@ jobs:
- name: Build Zambeze image
run: docker build -t zambeze/zambeze -f deployment/Dockerfile .
- name: Launch Docker Compose
run: | # We only need CONTAINER_VOL_MNT_POINT because we couldn't make the volume mount for dev work in GitHub VM
export CONTAINER_VOL_MNT_POINT=/unused
docker compose -f deployment/compose-rabbit.yml up -d
run: docker compose -f deployment/compose-rabbit.yml up -d
- name: Sleep
run: |
echo "I'm going to sleep hoping the services will be up when I wake up... zzz..."
sleep 15
- name: Run Tests
run: docker compose -f deployment/compose-rabbit.yml exec zambeze_agent2 python3 -m pytest -m integration -vs
- name: Cleanup
run: |
docker compose -f deployment/compose-rabbit.yml down
run: docker compose -f deployment/compose-rabbit.yml down
9 changes: 3 additions & 6 deletions deployment/compose-rabbit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,10 @@ services:
PYTHONWARNINGS: "ignore::DeprecationWarning"
container_name: zambeze1
image: zambeze/zambeze:latest
# Uncomment volumes if you want to sync your local dev. disk with the container's.
# volumes:
# - ../db:/zambeze/db
# - ../:${CONTAINER_VOL_MNT_POINT:-/zambeze} # This line is needed only to facilitate development.
# # The env var $CONTAINER_VOL_MNT_POINT is only set in the CI (see rsync-example.yml).
# # If running for local dev, you don't need to set any env var or change anything here.
# - ../:/zambeze
command: [/bin/sh, -c, 'sleep 10 && zambeze agent start & sleep 2 && tail -f /root/.zambeze/logs/`ls -t /root/.zambeze/logs/ | head -n 1`']
depends_on:
- rabbitmq
Expand All @@ -33,9 +32,7 @@ services:
image: zambeze/zambeze:latest
# volumes:
# - ../db:/zambeze/db
# - ../:${CONTAINER_VOL_MNT_POINT:-/zambeze} # This line is needed only to facilitate development.
# # The env var $CONTAINER_VOL_MNT_POINT is only set in the CI (see rsync-example.yml).
# # If running for local dev, you don't need to set any env var or change anything here.
# - ../:/zambeze
command: [/bin/sh, -c , 'echo "Im idle!" & tail -f /dev/null']
depends_on:
- zambeze_agent1 # Needed when launching command on startup