[_502,_697] amendments to harness and github workflows

Author: d-w-moore

.github/workflows/run-bats-tests.yml

@@ -0,0 +1,30 @@
+name: run-bats-tests
+
+on: [push, pull_request]
+
+jobs:
+  tests:
+    timeout-minutes: 20
+
+    name: Python ${{ matrix.python }}, iRODS ${{ matrix.irods_server }}
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+          working-directory: ./irods/test/harness
+    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 ../scripts/test00[1-9]*; do
+              ./docker_container_driver.sh -V $script
+          done

.github/workflows/run-local-suite.yml

@@ -0,0 +1,28 @@
+name: run-local-suite
+
+on: [push, pull_request]
+
+jobs:
+  tests:
+    timeout-minutes: 20
+
+    name: Python ${{ matrix.python }}, iRODS ${{ matrix.irods_server }}
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+          working-directory: ./irods/test/harness
+    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 ../scripts/run_suite_locally.sh

.github/workflows/run-the-tests.yml

@@ -6,21 +6,22 @@ jobs:
   tests:
     timeout-minutes: 20
 
-    name: ${{ matrix.python }}
+    name: Python ${{ matrix.python }}, iRODS ${{ matrix.irods_server }}
     runs-on: ubuntu-latest
     defaults:
       run:
           working-directory: ./docker-testing
     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.python }}"
+        run: ./start_containers.sh "${{ matrix.irods_server }}" "${{ matrix.python }}"
 
       - name: run test
         run: |
@@ -34,4 +35,4 @@ jobs:
 
       - name: Stop containers
         if: always()
-        run: docker compose -f harness-docker-compose.yml down
+        run: ./stop_containers.sh "${{ matrix.irods_server }}" "${{ matrix.python }}"

Dockerfile.prc_test.centos

@@ -24,6 +24,5 @@ RUN  python${py_N} repo/docker_build/iinit.py \
         password rods
 SHELL ["/bin/bash","-c"]
 CMD  echo "Waiting on iRODS server... " ; \
-     python${PY_N} repo/docker_build/recv_oneshot -h irods-provider -p 8888 -t 360 && \
      sudo groupadd -o -g $(stat -c%g /irods_shared) irods && sudo usermod -aG irods user && \
      newgrp irods < repo/run_python_tests.sh

Dockerfile.prc_test.ubuntu

@@ -31,6 +31,5 @@ SHELL ["/bin/bash","-c"]
 #  3. run python tests as the new group
 
 CMD  echo "Waiting on iRODS server... " ; \
-     python${PY_N} repo/docker_build/recv_oneshot -h irods-provider -p 8888 -t 360 && \
      sudo groupadd -o -g $(stat -c%g /irods_shared) irods && sudo usermod -aG irods user && \
      newgrp irods < repo/run_python_tests.sh

docker-testing/harness-docker-compose-irods-4.yml

@@ -0,0 +1 @@
+harness-docker-compose.yml

docker-testing/harness-docker-compose-irods-5.yml

@@ -0,0 +1 @@
+harness-docker-compose.yml

docker-testing/harness-docker-compose.yml

@@ -3,7 +3,7 @@ version: '3'
 services:
     irods-catalog:
         build:
-            context: irods_catalog
+            context: irods_catalog_${irods_major}
         # 5432 is exposed by default and can conflict with other postgres containers.
         # When the metalnx-db service is no longer needed, this stanza can be removed.
         ports:
@@ -15,26 +15,31 @@ services:
         build:
             context: python_client
             args:
-                - python_version
+                python_version: ${python_version}
         command:
             tail -f /dev/null
         volumes:
             - ${repo_external}:/repo_root:ro
-            - /tmp/irods-client-share.py-${python_version}-${parent_pid}:/irods_shared
+            - /tmp/irods-client-share.py-${python_version}:/irods_shared
+        depends_on:
+            irods-catalog-provider:
+                condition: service_healthy
 
     irods-catalog-provider:
         volumes:
-            - /tmp/irods-client-share.py-${python_version}-${parent_pid}:/irods_shared
+            - /tmp/irods-client-share.py-${python_version}:/irods_shared
         build:
-            context: irods_catalog_provider
+            context: irods_catalog_provider_${irods_major}
+            args:
+                irods_version: ${irods_version}
         shm_size: 500mb
-#       healthcheck:
-#           test: ["CMD", "su", "-", "irods", "-c", "ils || exit 1"]
-#           interval: 10s
-#           timeout: 10s
-#           retries: 3
-#           start_period: 20s
-#           start_interval: 2s
+        healthcheck:
+            test: ["CMD", "su", "-", "irods", "-c", "ils || exit 1"]
+            interval: 10s
+            timeout: 10s
+            retries: 3
+            #start_period: 20s
+            #start_interval: 2s
         ports:
             - "1247:1247"
         depends_on: