Skip to content

Commit 072f77d

Browse files
committed
use test_compatibility.sh, hardcode version number for now
1 parent b9feeeb commit 072f77d

File tree

1 file changed

+5
-13
lines changed

1 file changed

+5
-13
lines changed

bot/test.sh

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,8 @@ host_arch=$(uname -m)
9090
eessi_arch=${cpu_target_arch:-${host_arch}}
9191
eessi_os=linux
9292
job_version=$(cfg_get_value "repository" "repo_version")
93-
eessi_version=${job_version:-2023.06}
93+
#eessi_version=${job_version:-2023.06}
94+
eessi_version=2025.01
9495
job_repo=$(cfg_get_value "repository" "repo_name")
9596
eessi_repo=${job_repo:-software.eessi.io}
9697
tar_topdir=/cvmfs/${eessi_repo}/versions
@@ -110,7 +111,7 @@ if [[ -z ${APPTAINER_CACHEDIR} ]]; then
110111
export APPTAINER_CACHEDIR=${EESSI_TMPDIR}/apptainer_cache
111112
[[ ${VERBOSE} == '-vvv' ]] && echo "APPTAINER_CACHEDIR='${APPTAINER_CACHEDIR}'"
112113
fi
113-
export APPTAINER_BIND="${EESSI_TMPDIR}/cvmfs:/cvmfs,${PWD}:/compatibility-layer"
114+
export APPTAINER_BIND="${EESSI_TMPDIR}/cvmfs:/cvmfs,${PWD}"
114115
export APPTAINER_BIND="${APPTAINER_BIND},${EESSI_TMPDIR}/tmp:/tmp"
115116
[[ ${VERBOSE} == '-vvv' ]] && echo "APPTAINER_BIND='${APPTAINER_BIND}'"
116117
export APPTAINER_HOME="${EESSI_TMPDIR}/home:/home/${USER}"
@@ -121,23 +122,14 @@ if [[ -z ${SINGULARITY_CACHEDIR} ]]; then
121122
export SINGULARITY_CACHEDIR=${EESSI_TMPDIR}/apptainer_cache
122123
[[ ${VERBOSE} == '-vvv' ]] && echo "SINGULARITY_CACHEDIR='${SINGULARITY_CACHEDIR}'"
123124
fi
124-
export SINGULARITY_BIND="${EESSI_TMPDIR}/cvmfs:/cvmfs,${PWD}:/compatibility-layer"
125+
export SINGULARITY_BIND="${EESSI_TMPDIR}/cvmfs:/cvmfs,${PWD}"
125126
export SINGULARITY_BIND="${SINGULARITY_BIND},${EESSI_TMPDIR}/tmp:/tmp"
126127
[[ ${VERBOSE} == '-vvv' ]] && echo "SINGULARITY_BIND='${SINGULARITY_BIND}'"
127128
export SINGULARITY_HOME="${EESSI_TMPDIR}/home:/home/${USER}"
128129
[[ ${VERBOSE} == '-vvv' ]] && echo "SINGULARITY_HOME='${SINGULARITY_HOME}'"
129130

130131
CONTAINER=docker://ghcr.io/eessi/bootstrap-prefix:debian11
131132

132-
${RUNTIME} shell ${CONTAINER} <<EOF
133-
pip3 install --ignore-installed --prefix=/tmp/reframe reframe-hpc
134-
export PYTHONPATH=/tmp/reframe/lib/python3.9/site-packages
135-
export EESSI_REPO_DIR="/cvmfs/${eessi_repo}"
136-
export EESSI_VERSION=${eessi_version}
137-
export EESSI_ARCH=${host_arch}
138-
export EESSI_OS=linux
139-
export RFM_PREFIX=/compatibility-layer/reframe_runs
140-
/tmp/reframe/bin/reframe --nocolor -r -v -c /compatibility-layer/test/compat_layer.py
141-
EOF
133+
${RUNTIME} exec ${CONTAINER} ./test_compatibility_layer.sh -a ${host_arch} -o linux -r ${eessi_repo} -v ${eessi_version}
142134

143135
exit 0

0 commit comments

Comments
 (0)