Skip to content
Merged

test #501

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
1 change: 1 addition & 0 deletions checks/prgenv/mpi_cpi.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,4 @@ class cpi_build_test(rfm.RegressionTest):
@sanity_function
def validate(self):
return sn.assert_found(r'Error is 0.00000000', self.stdout)

2 changes: 1 addition & 1 deletion ci/alps_uenv.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ reframe:
fi;
done;
- UENVA=${UENVA%?}
- export UENV=`echo ${UENVA} | sed 's-,,-,-g' | sort -u`
- export UENV=`echo ${UENVA} | sed -e 's-,,-,-g' -e 's/build:://g' -e 's/service:://g' | sort -u`
- echo "UENV=$UENV"
# ----------------------
- rfm_path=$(./ci/scripts/alps.sh install_reframe |grep HERE |awk '{print $1}')
Expand Down
15 changes: 11 additions & 4 deletions ci/scripts/alps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -139,12 +139,19 @@ uenv_pull_meta_dir() {
else
vasp_flag=""
fi
uenv image inspect --format='{sqfs}' "$img" 2>&1 |grep -q "error:" ;sqfs_missing=$?

# uenv image inspect --format='{sqfs}' prgenv-gnu/next:2078663062
# # error: no matching uenv
# uenv image inspect --format='{sqfs}' build::prgenv-gnu/next:2078663062
# # error: invalid search term: found unexpected ':'
img_name=`echo "$img" |sed -e "s/build:://" -e "s/service:://"`
uenv image inspect --format='{sqfs}' "$img_name" 2>&1 |grep -q "error:" ;sqfs_missing=$?

if [ $sqfs_missing -eq 0 ] ; then
# 0=missing, !0=not missing
echo "# WARNING: $img not found, pulling it..."
/usr/bin/time -p uenv image pull $vasp_flag $img &> .uenv_pull_meta_dir.log
uenv image inspect --format='{sqfs}' "$img" 2>&1 |grep -q "error:" ;sqfs_missing=$?
uenv image inspect --format='{sqfs}' "$img_name" 2>&1 |grep -q "error:" ;sqfs_missing=$?
if [ $sqfs_missing -eq 0 ] ; then
echo "# WARNING: failed pulling $img (sqfs_missing=$sqfs_missing)"
cat .uenv_pull_meta_dir.log
Expand All @@ -163,8 +170,8 @@ uenv_pull_meta_dir() {
# system=$(uenv image inspect --format='{system}' $img)
# uarch=$(uenv image inspect --format='{uarch}' $img)
# sha=$(uenv image inspect --format='{sha}' $img)
uenv run $img -- test -f /user-environment/meta/extra/reframe.yaml ;rc1=$?
uenv run $img -- test -f /user-tools/meta/extra/reframe.yaml ;rc2=$?
uenv run $img_name -- test -f /user-environment/meta/extra/reframe.yaml ;rc1=$?
uenv run $img_name -- test -f /user-tools/meta/extra/reframe.yaml ;rc2=$?
if [ $rc1 -eq 0 ] || [ $rc2 -eq 0 ] ; then
echo "# OK: reframe.yaml found in $img"
else
Expand Down