From 8c6847a413c8f4bf188fd8f5961a4cdead6da39e Mon Sep 17 00:00:00 2001
From: Vasileios Karakasis <vkarakasis@nvidia.com>
Date: Wed, 23 Oct 2024 10:44:43 +0200
Subject: [PATCH] Fix failing Spack unit tests + use latest EB and Spack

---
 ci-scripts/dockerfiles/eb-spack-howto.dockerfile | 8 ++++----
 reframe/frontend/autodetect.py                   | 3 +--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/ci-scripts/dockerfiles/eb-spack-howto.dockerfile b/ci-scripts/dockerfiles/eb-spack-howto.dockerfile
index 42f3dc4b66..f308189495 100644
--- a/ci-scripts/dockerfiles/eb-spack-howto.dockerfile
+++ b/ci-scripts/dockerfiles/eb-spack-howto.dockerfile
@@ -5,13 +5,13 @@
 
 FROM ghcr.io/reframe-hpc/lmod:8.4.12
 
-ENV _SPACK_VER=0.16
-ENV _EB_VER=4.4.1
+ENV _SPACK_VER=0.22.2
+ENV _EB_VER=4.9.4
 
 
 # Install ReFrame unit test requirements
 RUN apt-get -y update && \
-    apt-get -y install gcc git make python3 python3-pip
+    apt-get -y install gcc git make python3 python3-pip curl
 
 # ReFrame user
 RUN useradd -ms /bin/bash rfmuser
@@ -19,7 +19,7 @@ RUN useradd -ms /bin/bash rfmuser
 USER rfmuser
 
 # Install Spack
-RUN git clone --branch releases/v${_SPACK_VER} https://github.com/spack/spack ~/spack && \
+RUN git clone --branch v${_SPACK_VER} https://github.com/spack/spack ~/spack && \
     cd ~/spack
 
 RUN pip3 install easybuild==${_EB_VER}
diff --git a/reframe/frontend/autodetect.py b/reframe/frontend/autodetect.py
index 16b8a1f128..d3762f3aeb 100644
--- a/reframe/frontend/autodetect.py
+++ b/reframe/frontend/autodetect.py
@@ -47,8 +47,7 @@ def __enter__(self):
         self._workdir = os.path.abspath(
             tempfile.mkdtemp(prefix='rfm.', dir=self._prefix)
         )
-        paths = ['bin/', 'reframe/', 'tools/',
-                 'bootstrap.sh', 'requirements.txt']
+        paths = ['bin/', 'reframe/', 'bootstrap.sh', 'requirements.txt']
         use_pip = False
         try:
             for p in paths: