correct option/default figures in irods versino

Author: d-w-moore

.github/workflows/run-test-suite-multi-node.yml

@@ -36,4 +36,4 @@ jobs:
 
       - name: Stop containers
         if: always()
-        run: ./stop_containers.sh "${{ matrix.irods_server }}" "${{ matrix.python }}"
+        run: ./stop_containers.sh "${{ matrix.irods_server }}"

test_harness/multiple_node/irods_catalog_provider_4/Dockerfile

@@ -31,7 +31,7 @@ RUN apt-get update && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/* /tmp/*
 
-ARG irods_version=4.3.1
+ARG irods_version
 ARG irods_package_version_suffix=-0~focal
 ARG irods_package_version=${irods_version}${irods_package_version_suffix}
 ARG irods_resource_plugin_version=${irods_version}.0${irods_package_version_suffix}

test_harness/multiple_node/irods_catalog_provider_4/entrypoint.sh

@@ -44,5 +44,5 @@ chown -R irods:irods /irods_shared
 echo "Starting server"
 
 cd /usr/sbin
-su irods -c 'bash -c "./irodsServer -u"'
+su irods -c './irodsServer -u'
 

test_harness/multiple_node/irods_catalog_provider_5/Dockerfile

@@ -34,7 +34,7 @@ RUN apt-get update && \
 
 # - postgres client 16 is for pg_isready
 
-ARG irods_version=5.0.1
+ARG irods_version
 ARG irods_package_version_suffix=-0~noble
 ARG irods_package_version=${irods_version}${irods_package_version_suffix}
 

test_harness/multiple_node/irods_catalog_provider_5/entrypoint.sh

@@ -45,5 +45,5 @@ chmod 0777 /irods_shared
 echo "Starting server"
 
 cd /usr/sbin
-su irods -c 'bash -c "./irodsServer -p /tmp/irods.pid --stdout"'
+su irods -c './irodsServer -p /tmp/irods.pid --stdout'
 

test_harness/multiple_node/start_containers.sh

@@ -4,7 +4,7 @@ set -e
 # This script is launched on the docker host.
 
 usage() {
-  echo >&2 "usage: $0 [-n] [-b '<docker compose build args>'] [irods_version] python_version"; exit 2;
+  echo >&2 "usage: $0 [-n] [-b '<docker compose build args>'] irods_version python_version"; exit 2;
 }
 
 SHELL_DOCKER_COMPOSE_BUILD_ARGS=""
@@ -24,14 +24,11 @@ done
 if [ $# -eq 2 ]; then
     IRODS_VERSION=$1
     PYTHON_VERSION=$2
-elif [ $# -eq 1 ]; then
-    IRODS_VERSION=4.3.4
-    PYTHON_VERSION=$1
+    shift 2
 else
     usage
 fi
 
-shift $#
 
 [ -n "$PYTHON_VERSION" -a -n "$IRODS_VERSION" ] || {
      usage

test_harness/multiple_node/stop_containers.sh

@@ -4,22 +4,18 @@ set -e
 # This script is launched on the docker host.
 
 usage() {
-  echo >&2 "usage: $0 [irods_version] python_version"; exit 1;
+  echo >&2 "usage: $0 irods_version"; exit 1;
 }
 
 if [ $# -eq 2 ]; then
     IRODS_VERSION=$1
-    PYTHON_VERSION=$2
-elif [ $# -eq 1 ]; then
-    IRODS_VERSION=4.3.4
-    PYTHON_VERSION=$1
+    shift $#
 else
     usage
 fi
 
-shift $#
 
-[ -n "$PYTHON_VERSION" -a -n "$IRODS_VERSION" ] || {
+[ -n "$IRODS_VERSION" ] || {
      usage
 }