[#3] changes for testing client with 4.3.0 vsn of iRODS

including:

  - create "server_python_version" variable
  - distinguish "client_python_version"
  - fix Python REP installer

Author: d-w-moore

docker-compose.yml

@@ -14,6 +14,8 @@ services:
     build:
       context: docker_build
       dockerfile: Dockerfile.provider
+      args:
+        server_py: "${server_python_version}"
     volumes:
       - "${irods_pkg_dir}:/irods_packages:ro"
       - ./irods_shared:/irods_shared:rw
@@ -35,6 +37,6 @@ services:
       dockerfile: Dockerfile.prc_test.${client_os_generic}
       args:
         os_image: "$client_os_image"
-        py_N: "$python_version"
+        py_N: "$client_python_version"
     depends_on:
       - irods-provider

docker_build/Dockerfile.provider

@@ -1,9 +1,11 @@
 FROM ubuntu:18.04
 
 ARG irods_pkg_dir
+ARG server_py=${server_python_version}
+ENV SERVER_PY "${server_py}"
 
 RUN apt update
-RUN apt install -y wget sudo lsb-release apt-transport-https gnupg2 postgresql-client
+RUN apt install -y wget sudo lsb-release apt-transport-https gnupg2 postgresql-client python3
 RUN wget -qO - https://packages.irods.org/irods-signing-key.asc | sudo apt-key add -
 RUN echo "deb [arch=amd64] https://packages.irods.org/apt/ $(lsb_release -sc) main" | sudo tee /etc/apt/sources.list.d/renci-irods.list
 RUN apt update
@@ -16,7 +18,7 @@ RUN chmod 600 root/.pgpass
 
 RUN apt install -y rsyslog gawk
 RUN apt install -y jq
-ADD build_deps_list wait_on_condition send_oneshot setup_python_rule_engine /tmp/
+ADD build_deps_list wait_on_condition send_oneshot install_python_rule_engine setup_python_rule_engine /tmp/
 
 # At Runtime: 1. Install apt dependencies for the iRODS package files given.
 #             2. Install the package files.
@@ -30,10 +32,11 @@ ADD build_deps_list wait_on_condition send_oneshot setup_python_rule_engine /tmp
 CMD apt install -y $(/tmp/build_deps_list /irods_packages/irods*{serv,dev,icommand,runtime,database-*postgres}*.deb) && \
     dpkg -i /irods_packages/irods*{serv,dev,icommand,runtime,database-*postgres}*.deb && \
     /tmp/wait_on_condition -i 5 -n 12 "psql -h icat -U postgres -c '\\l' >/dev/null" && \
-      psql -h icat -U postgres -f /tmp/ICAT.sql && \
+    psql -h icat -U postgres -f /tmp/ICAT.sql && \
     sed 's/localhost/icat/' < /var/lib/irods/packaging/localhost_setup_postgres.input \
-        | python /var/lib/irods/scripts/setup_irods.py && \
-    { [ "${PYTHON_RULE_ENGINE_INSTALLED}" = '' ] || { apt install -y irods-rule-engine-plugin-python && /tmp/setup_python_rule_engine; } } && \
+        | python${SERVER_PY} /var/lib/irods/scripts/setup_irods.py && \
+    { [ "${PYTHON_RULE_ENGINE_INSTALLED}" = '' ] || { /tmp/install_python_rule_engine "$PYTHON_RULE_ENGINE_INSTALLED" /irods_packages \
+                                                     && /tmp/setup_python_rule_engine; } } && \
     { pgrep -u irods irodsServer >/dev/null || su irods -c '~/irodsctl start'; \
       env PORT=8888 /tmp/send_oneshot "iRODS is running..." & } && \
     { [ ! -d /irods_shared ] || { mkdir -p /irods_shared/reg_resc && mkdir -p /irods_shared/tmp && \

docker_build/install_python_rule_engine

@@ -0,0 +1,9 @@
+#!/bin/bash
+# usage $0 [""|"y"|"/"*] [container_irods_packages_path]
+if [[ $1 = /* ]]; then
+  apt install -y "$2"/irods*rule*python*.deb
+elif [ "$1" != "" ]; then
+  apt install -y irods-rule.\*python
+else
+  : # nop
+fi

irods_consortium_continuous_integration_test_module.py

@@ -6,7 +6,7 @@ def run (CI):
     final_config = CI.store_config(
         {
             "yaml_substitutions": {       # -> written to ".env"
-                "python_version" : "3",
+                "client_python_version" : "3",
                 "client_os_generic": "ubuntu",
                 "client_os_image": "ubuntu:18.04",
                 "python_rule_engine_installed": "y"