Merge pull request #97 from ORNL/skluzacek_rmq-integ-tests

Testing CI after small changes
ORNL · Jan 23, 2023 · 8fcd92c · 8fcd92c
2 parents 8540d3f + f268a22
commit 8fcd92c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 11 deletions.
diff --git a/.github/workflows/shell-activity-example.yml b/.github/workflows/shell-activity-example.yml
@@ -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
diff --git a/deployment/compose-rabbit.yml b/deployment/compose-rabbit.yml
@@ -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
@@ -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