Skip to content

Commit

Permalink
fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
d-w-moore committed Feb 20, 2024
1 parent 23736d1 commit fd5b171
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/run-the-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ jobs:
uses: actions/checkout@v4

- name: Start containers
run: ./start_containers.sh
run: ./start_containers.sh "${{ matrix.python }}"

- name: run test
run: |
client_container=$(docker ps --format "{{.Names}}"|grep python.client)
docker exec -it "$(client_container)" /repo/docker-testing/run_tests.sh
docker exec -it "$(client_container)" /repo_root/docker-testing/run_tests.sh
- name: Stop containers
if: always()
Expand Down
3 changes: 1 addition & 2 deletions docker-testing/harness-docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,12 @@ services:
python-client:
args:
- python_version
- repo_external
build:
context: python_client
command:
tail -f /dev/null
volumes:
${repo_external}:/repo:ro
${repo_external}:/repo_root:ro

irods-catalog-provider:
build:
Expand Down
1 change: 1 addition & 0 deletions docker-testing/irods_catalog_provider/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ RUN apt-get update && \
python3-requests \
rsyslog \
unixodbc \
gawk \
&& \
apt-get clean && \
rm -rf /var/lib/apt/lists/* /tmp/*
Expand Down
2 changes: 2 additions & 0 deletions docker-testing/python_client/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ARG python_version
FROM python:${python_version}
1 change: 1 addition & 0 deletions docker-testing/repo
9 changes: 7 additions & 2 deletions docker-testing/run_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,10 @@ cd "$DIR"
./recv_oneshot -h irods-provider -p 8888 -t 360
REPO="$(realpath ./repo)"
python -m pip install "$REPO[tests]"
./iinit.py host irods-provider port 1247 user rods password rods zone tempZone
python $REPO/irods/test/runner.py
./iinit.py \
host irods-provider \
port 1247 \
user rods \
password rods \
zone tempZone
python "$REPO"/irods/test/runner.py
4 changes: 2 additions & 2 deletions docker-testing/start_containers.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
DIR=$(dirname "$0")
cd "${DIR}"
echo "python_version=${1}" >.env
echo "repo_external=$(realpath "${DIR}/repo")" >>.env
docker-compose -f harness-docker-compose.yml up -d
echo "repo_external=$(realpath ./repo)" >>.env
docker-compose -f harness-docker-compose.yml up -d --build

0 comments on commit fd5b171

Please sign in to comment.