Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix dirac tests #93

Merged
merged 2 commits into from
Mar 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/dirac.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion deploy/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 7 additions & 4 deletions tests_dirac/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
2 changes: 1 addition & 1 deletion tests_dirac/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down