Move integration tests docker image to be based on RHEL9

postprocessing/Configuration.py

@@ -94,7 +94,7 @@ def __init__(self, config_file):
             config["dev_output_dir"].strip() if "dev_output_dir" in config else ""
         )
         self.python_executable = (
-            config["python_exec"] if "python_exec" in config else "python"
+            config["python_exec"] if "python_exec" in config else "python3"
         )
 
         self.max_procs = config["max_procs"] if "max_procs" in config else 5

postprocessing/PostProcessAdmin.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """
 Post-processing tasks
 
@@ -121,7 +121,7 @@ def reduce(self):
                     f"{self.instrument}_{self.proposal}_runsummary.csv",
                 )
                 cmd = (
-                    "python "
+                    "python3 "
                     + summary_script
                     + " "
                     + self.instrument

postprocessing/queueProcessor.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """
     Post-processing agent start script
 

scripts/ar-report.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 from __future__ import absolute_import, division, print_function, unicode_literals
 import h5py
 import os

scripts/mantidpython.py

@@ -1,4 +1,4 @@
-#!/bin/env python
+#!/bin/env python3
 import os
 import re
 import subprocess

tests/integration/Dockerfile

@@ -1,21 +1,19 @@
-FROM mambaorg/micromamba
+FROM registry.access.redhat.com/ubi9/ubi
 
-COPY --chown=$MAMBA_USER:$MAMBA_USER environment.yml .
+RUN dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm
+RUN dnf update
+RUN dnf install -y python3-requests python3-stomppy python3-pip python3-coverage
+RUN python3 -m pip install plotly
 
-RUN micromamba install --yes -n base --file environment.yml
+COPY postprocessing /opt/postprocessing/postprocessing
+COPY tests/integration/post_processing.conf /etc/autoreduce/post_processing.conf
 
-ARG MAMBA_DOCKERFILE_ACTIVATE=1
-
-COPY --chown=$MAMBA_USER:$MAMBA_USER postprocessing /opt/postprocessing/postprocessing
-COPY --chown=$MAMBA_USER:$MAMBA_USER tests/integration/post_processing.conf /etc/autoreduce/post_processing.conf
-
-RUN echo \#\!/bin/bash > /opt/conda/bin/coverage_run && \
-    echo coverage run \$@ >> /opt/conda/bin/coverage_run && \
-    chmod +x /opt/conda/bin/coverage_run
+RUN echo \#\!/bin/bash > /usr/bin/coverage_run && \
+    echo coverage run \$@ >> /usr/bin/coverage_run && \
+    chmod +x /usr/bin/coverage_run
 
 ENV PYTHONPATH /opt/postprocessing
 
-USER root
 RUN echo -e "[run]\nsource=postprocessing\nparallel=True\nrelative_files=True" > /opt/postprocessing/.coveragerc
 RUN mkdir -p /opt/postprocessing/log && \
     mkdir -p /opt/postprocessing/scripts && \
@@ -40,8 +38,6 @@ RUN mkdir -p /opt/postprocessing/log && \
     \
     chown -R $MAMBA_USER:$MAMBA_USER /opt/postprocessing /SNS
 
-USER $MAMBA_USER
-
 WORKDIR /opt/postprocessing
 ENV COVERAGE_PROCESS_START /opt/postprocessing/.coveragerc