diff --git a/.github/workflows/archivematica-acceptance-tests.yml b/.github/workflows/archivematica-acceptance-tests.yml index e087279..6da2025 100644 --- a/.github/workflows/archivematica-acceptance-tests.yml +++ b/.github/workflows/archivematica-acceptance-tests.yml @@ -41,6 +41,9 @@ jobs: - name: "almalinux" tag: "9" label: "alma9" + - name: "oraclelinux" + tag: "9" + label: "oracle9" - name: "ubuntu" tag: "22.04" label: "jammy" @@ -200,7 +203,7 @@ jobs: run: | podman-compose exec --user root archivematica bash -c 'cp -r /var/log/{archivematica,mysql,elasticsearch,gearman-job-server,clamav,nginx} /tmp/logs' - name: "Save logs on failure" - if: "${{ (matrix.docker_image.name == 'rockylinux' || matrix.docker_image.name == 'almalinux') && ((failure() && steps.amauat-run.outcome == 'failure') || (cancelled() && steps.amauat-run.outcome == 'cancelled')) }}" + if: "${{ matrix.docker_image.name != 'ubuntu' && ((failure() && steps.amauat-run.outcome == 'failure') || (cancelled() && steps.amauat-run.outcome == 'cancelled')) }}" working-directory: "${{ github.workspace }}/tests/archivematica-acceptance-tests" run: | podman-compose exec --user root archivematica bash -c 'journalctl -u mysqld --no-pager > /tmp/logs/journalctl/mysql' diff --git a/tests/archivematica-acceptance-tests/Dockerfile b/tests/archivematica-acceptance-tests/Dockerfile index c0dd5d0..715270f 100644 --- a/tests/archivematica-acceptance-tests/Dockerfile +++ b/tests/archivematica-acceptance-tests/Dockerfile @@ -73,6 +73,18 @@ RUN set -ex \ sudo \ && dnf clean all +FROM oraclelinux:9 AS install_oraclelinux_9 + + RUN set -ex \ + && dnf -y update \ + && dnf -y install coreutils --allowerasing \ + && dnf -y install \ + glibc-langpack-en \ + openssh-server \ + python-unversioned-command \ + sudo \ + && dnf clean all + FROM install_${DOCKER_IMAGE_NAME}_${DOCKER_IMAGE_TAG} as server RUN useradd --home-dir /home/ubuntu --system ubuntu