Skip to content
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
2 changes: 2 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
# https://github.com/actions/starter-workflows/blob/master/ci/python-package.yml
# (C) Github, MIT License

# Static type checking tests using `mypy`.

name: "Python type checking"

on: [push, pull_request]
Expand Down
40 changes: 40 additions & 0 deletions .github/workflows/run-test-programs-single-node.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
# Run a set of tests, each in its own container and with a potentially customized setup.

# To this end, each test is launched via docker_container_driver.sh, part of the single-node
# test harness machinery whose implementation and documentation is to be found in the
# `irods/test/harness` directory.

# A test may be written as a Bash or BATS script, but the only real requirement is that it be
# executable.

name: run-test-programs-single-node

on: [push, pull_request]

jobs:
tests:
name: Python ${{ matrix.python }}, iRODS ${{ matrix.irods_server }}
runs-on: ubuntu-latest
defaults:
run:
working-directory: ./test_harness/single_node
strategy:
matrix:
python: ['3.9','3.13']
irods_server: ['4.3.4','5.0.2']

steps:
- name: Checkout
uses: actions/checkout@v4

- name: Build images
run: ./create_docker_images.sh "${{ matrix.irods_server }}" "${{ matrix.python }}"

- name: run tests
run: |
for script in \
../../irods/test/scripts/test[0-9]* \
../../irods/test/login_auth_test_*.py
do
./docker_container_driver.sh -V $script
done
39 changes: 39 additions & 0 deletions .github/workflows/run-test-suite-multiple-node.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
# Create a networked set of containers (via a Docker compose project) on which to run the client test suite.
# (For further information, see the README in `docker-testing`.)

name: run-test-suite-multiple-node

on: [push, pull_request]

jobs:
tests:
name: Python ${{ matrix.python }}, iRODS ${{ matrix.irods_server }}
runs-on: ubuntu-latest
defaults:
run:
working-directory: ./test_harness/multiple_node
strategy:
matrix:
python: ['3.9','3.13']
irods_server: ['4.3.4','5.0.2']

steps:
- name: Checkout
uses: actions/checkout@v4

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

- name: run test
run: |
while :; do
client_container=$(docker ps --format "{{.Names}}"|grep python.client)
[ -n "$client_container" ] && break
sleep 1
done
echo "client_container = [$client_container]"
docker exec "${client_container}" /repo_root/test_harness/multiple_node/run_tests.sh

- name: Stop containers
if: always()
run: ./stop_containers.sh "${{ matrix.irods_server }}"
29 changes: 29 additions & 0 deletions .github/workflows/run-test-suite-single-node.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# Run the client test suite in a Docker container, targeting a locally running instance of the iRODS server.
# (Documentation and implementation for the test harness may be found in `irods/test/harness`.)

name: run-test-suite-single-node

on: [push, pull_request]

jobs:
tests:
name: Python ${{ matrix.python }}, iRODS ${{ matrix.irods_server }}
runs-on: ubuntu-latest
defaults:
run:
working-directory: ./test_harness/single_node
strategy:
matrix:
python: ['3.9','3.13']
irods_server: ['4.3.4','5.0.2']

steps:
- name: Checkout
uses: actions/checkout@v4

- name: Build images
run: ./create_docker_images.sh "${{ matrix.irods_server }}" "${{ matrix.python }}"

- name: run tests
run: |
./docker_container_driver.sh -V ../../irods/test/scripts/run_suite_locally.sh
29 changes: 0 additions & 29 deletions Dockerfile.prc_test.centos

This file was deleted.

36 changes: 0 additions & 36 deletions Dockerfile.prc_test.ubuntu

This file was deleted.

42 changes: 0 additions & 42 deletions docker-compose.yml

This file was deleted.

46 changes: 0 additions & 46 deletions docker_build/Dockerfile.provider

This file was deleted.

3 changes: 0 additions & 3 deletions docker_build/ICAT.sql

This file was deleted.

22 changes: 0 additions & 22 deletions docker_build/build_deps_list

This file was deleted.

51 changes: 0 additions & 51 deletions docker_build/iinit.py

This file was deleted.

9 changes: 0 additions & 9 deletions docker_build/install_python_rule_engine

This file was deleted.

1 change: 0 additions & 1 deletion docker_build/pgpass

This file was deleted.

Loading