From a8bacfb5789f3fc7518368817d4b95009122c3c4 Mon Sep 17 00:00:00 2001 From: Stefan Verhoeven Date: Wed, 13 Mar 2024 13:05:25 +0100 Subject: [PATCH 1/2] Fix ci warning --- .github/workflows/dirac.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dirac.yml b/.github/workflows/dirac.yml index 20caa7d..416ce80 100644 --- a/.github/workflows/dirac.yml +++ b/.github/workflows/dirac.yml @@ -11,7 +11,7 @@ jobs: dirac_tests: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Pull images run: docker compose -f tests_dirac/docker-compose.yml pull - name: Build images From 2f7b1a3663976ffc14d0a3f5e79c8f196d43a3a3 Mon Sep 17 00:00:00 2001 From: Stefan Verhoeven Date: Wed, 13 Mar 2024 13:14:09 +0100 Subject: [PATCH 2/2] Fix dirac tests By using ghcr.io/xenon-middleware/dirac:8.0.39 image --- deploy/Dockerfile | 2 +- tests_dirac/Dockerfile | 11 +++++++---- tests_dirac/docker-compose.yml | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/deploy/Dockerfile b/deploy/Dockerfile index 2ab9e3a..06a8e69 100644 --- a/deploy/Dockerfile +++ b/deploy/Dockerfile @@ -3,7 +3,7 @@ FROM python:3.10-slim-buster # Install healthcheck dependency RUN apt update && apt install -y curl unzip -RUN pip install poetry==1.4.2 +RUN pip install poetry==1.7.0 # Configuring poetry RUN poetry config virtualenvs.create false diff --git a/tests_dirac/Dockerfile b/tests_dirac/Dockerfile index 47d591f..da1db05 100644 --- a/tests_dirac/Dockerfile +++ b/tests_dirac/Dockerfile @@ -1,7 +1,7 @@ -FROM ghcr.io/xenon-middleware/diracclient:8.0.18 +FROM ghcr.io/xenon-middleware/diracclient:8.0.39 -RUN pip install poetry==1.8.2 && \ - pip install --upgrade pip wheel setuptools +RUN pip install --upgrade pip wheel setuptools && \ + pip install poetry==1.7.0 # Configuring poetry RUN poetry config virtualenvs.create false @@ -12,4 +12,7 @@ WORKDIR /workspace COPY pyproject.toml poetry.lock ./ # Installing requirements -RUN poetry install --no-root --no-interaction --no-ansi && pip3 install pyOpenSSL --upgrade +RUN poetry install --no-root --no-interaction --no-ansi --with dev + +# Workaround `ImportWarning: _SixMetaPathImporter.find_spec() not found; falling back to find_module()` error +RUN /home/diracuser/diracos/bin/micromamba install m2crypto==0.041.0 diff --git a/tests_dirac/docker-compose.yml b/tests_dirac/docker-compose.yml index 78c3d6c..e502b1f 100644 --- a/tests_dirac/docker-compose.yml +++ b/tests_dirac/docker-compose.yml @@ -2,7 +2,7 @@ version: '3.9' services: dirac-tuto: - image: ghcr.io/xenon-middleware/dirac:8.0.18 + image: ghcr.io/xenon-middleware/dirac:8.0.39 privileged: true hostname: dirac-tuto test: