firm up package defs; allow run under podman

Author: d-w-moore

irods/test/harness/000_install-irods.Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 COPY install.sh /
 ARG irods_package_version
 ENV IRODS_PACKAGE_VERSION "$irods_package_version"

irods/test/harness/docker_container_driver.sh

@@ -79,30 +79,32 @@ ORIGINAL_SCRIPT_RELATIVE_TO_ROOT=$(realpath --relative-to $reporoot "$original_t
 echo "ORIGINAL_SCRIPT_RELATIVE_TO_ROOT=[$ORIGINAL_SCRIPT_RELATIVE_TO_ROOT]" 
 INNER_MOUNT=/prc
 
+: ${DOCKER:=docker}
+
 # Start the container.
 echo image="[$image]"
-CONTAINER=$(docker run -d -v $reporoot:$INNER_MOUNT:ro --rm $image)
+CONTAINER=$($DOCKER run -d -v $reporoot:$INNER_MOUNT:ro --rm $image)
 
 # Wait for iRODS and database to start up.
 TIME0=$(date +%s)
 while :; do
     [ `date +%s` -gt $((TIME0 + 30)) ] && { echo >&2 "Waited too long for DB and iRODS to start"; exit 124; }
     sleep 1 
-    docker exec $CONTAINER grep '(0)' /tmp/irods_status 2>/dev/null >/dev/null
+    $DOCKER exec $CONTAINER grep '(0)' /tmp/irods_status 2>/dev/null >/dev/null
     [ $? -ne 0 ] && { echo -n . >&2; continue; }
     break
 done
 
-docker exec ${RUN_AS_USER:+"-u$RUN_AS_USER"} \
-            ${WORKDIR:+"-w$WORKDIR"} \
-	    -e "ORIGINAL_SCRIPT_RELATIVE_TO_ROOT=$ORIGINAL_SCRIPT_RELATIVE_TO_ROOT" \
-            $CONTAINER \
-            $INNER_MOUNT/$(realpath --relative-to $reporoot "$testscript_abspath") \
-            $arglist
+$DOCKER exec ${RUN_AS_USER:+"-u$RUN_AS_USER"} \
+             ${WORKDIR:+"-w$WORKDIR"} \
+	     -e "ORIGINAL_SCRIPT_RELATIVE_TO_ROOT=$ORIGINAL_SCRIPT_RELATIVE_TO_ROOT" \
+             $CONTAINER \
+             $INNER_MOUNT/$(realpath --relative-to $reporoot "$testscript_abspath") \
+             $arglist
 STATUS=$?
 
 if [ $((0+KILL_TEST_CONTAINER)) -ne 0 ]; then
-    echo >&2 'Killed:' $(docker stop --time=0 $CONTAINER)
+    echo >&2 'Killed:' $($DOCKER stop --time=0 $CONTAINER)
 fi
 
 [ -n "$ECHO_CONTAINER" ] && echo $CONTAINER

irods/test/harness/install.sh

@@ -16,10 +16,25 @@ add_package_repo()
       sudo apt update
 }
 
-DIST_NAME=$(lsb_release -sc)
-
+DIST_NAME=$(grep '^VERSION_CODENAME=' /etc/os-release|sed 's/.*=//')
 : ${IRODS_VSN:=4.3.1-0~$DIST_NAME}
 
+# Expand a spec of the leading version tuple eg. 4.3.4 out  to the full name of
+# the most recent matching version of the package
+
+irods_package_vsn() {
+  apt list -a irods-server 2>/dev/null|awk '{print $2}'|grep '\w'|sort|\
+      grep "$(perl -e 'print quotemeta($ARGV[0])' "$IRODS_PACKAGE_VERSION")"|tail -1
+}
+
+# Report irods server version installed, or failing that, the requested version.
+
+irods_vsn() {
+  local V=$(dpkg -l irods-server 2>/dev/null|grep '^ii\s'|awk '{print $3}')
+  V=
+  echo "${V:-$IRODS_VSN}"
+}
+
 while [[ "$1" = -* ]]; do
   ARG="$1"
   shift
@@ -101,14 +116,15 @@ ________"
     ;;
 
  4)
-   sudo apt install -y irods-{dev,runtime}${IRODS_PACKAGE_VERSION:+"=$IRODS_PACKAGE_VERSION"}
+   IRODS_TO_INSTALL=`irods_package_version`
+   sudo apt install -y irods-{dev,runtime}${IRODS_TO_INSTALL=:+"=$IRODS_TO_INSTALL="}
    if [[ $with_opts != *\ basic\ * ]]; then
-     sudo apt install -y irods-{icommands,server,database-plugin-postgres}${IRODS_PACKAGE_VERSION:+"=$IRODS_PACKAGE_VERSION"}
+     sudo apt install -y irods-{icommands,server,database-plugin-postgres}${IRODS_TO_INSTALL=:+"=$IRODS_TO_INSTALL="}
    fi
  ;;
 
  5)
- if [ ! "$IRODS_VSN" '<' "4.3" ]; then
+ if [ ! `irods_vsn` '<' "4.3" ]; then
     PYTHON=python3
  else
     PYTHON=python2