Skip to content

Commit 8c6847a

Browse files
committed
Fix failing Spack unit tests + use latest EB and Spack
1 parent 88e3eb8 commit 8c6847a

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

ci-scripts/dockerfiles/eb-spack-howto.dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,21 @@
55

66
FROM ghcr.io/reframe-hpc/lmod:8.4.12
77

8-
ENV _SPACK_VER=0.16
9-
ENV _EB_VER=4.4.1
8+
ENV _SPACK_VER=0.22.2
9+
ENV _EB_VER=4.9.4
1010

1111

1212
# Install ReFrame unit test requirements
1313
RUN apt-get -y update && \
14-
apt-get -y install gcc git make python3 python3-pip
14+
apt-get -y install gcc git make python3 python3-pip curl
1515

1616
# ReFrame user
1717
RUN useradd -ms /bin/bash rfmuser
1818

1919
USER rfmuser
2020

2121
# Install Spack
22-
RUN git clone --branch releases/v${_SPACK_VER} https://github.com/spack/spack ~/spack && \
22+
RUN git clone --branch v${_SPACK_VER} https://github.com/spack/spack ~/spack && \
2323
cd ~/spack
2424

2525
RUN pip3 install easybuild==${_EB_VER}

reframe/frontend/autodetect.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,7 @@ def __enter__(self):
4747
self._workdir = os.path.abspath(
4848
tempfile.mkdtemp(prefix='rfm.', dir=self._prefix)
4949
)
50-
paths = ['bin/', 'reframe/', 'tools/',
51-
'bootstrap.sh', 'requirements.txt']
50+
paths = ['bin/', 'reframe/', 'bootstrap.sh', 'requirements.txt']
5251
use_pip = False
5352
try:
5453
for p in paths:

0 commit comments

Comments
 (0)