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.

Sign up for GitHub

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

Jump to bottom

Use spack in wrappers #536

Merged
merged 33 commits into from
Feb 22, 2024
Merged

Use spack in wrappers #536

Changes from 32 commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
9d9a063
use spack in wrapper to find ifdhc
marcmengel Feb 16, 2024
10c214e
Don't assume we have GROUP set in the environment (#511)
shreyb Jan 22, 2024
13b72c1
pylint cleanup (#513)
shreyb Jan 22, 2024
18f17d8
fixes #516
marcmengel Jan 17, 2024
67cd442
config
marcmengel Jan 17, 2024
7a9648f
check for wanted lines with regexp
marcmengel Jan 22, 2024
f869235
Add pylint github action (#515)
shreyb Jan 23, 2024
9bb3536
get rid of import cycle
marcmengel Jan 22, 2024
16abc3f
added file
marcmengel Jan 22, 2024
03c3560
remove *both* pylint: bits...
marcmengel Jan 23, 2024
1b73b65
more pylinting
marcmengel Jan 23, 2024
d9f30c2
Improvements to TarfilePublisherHandler (#520)
shreyb Jan 24, 2024
03621a0
draft of checking space
marcmengel Jan 24, 2024
74324f9
pylint
marcmengel Jan 24, 2024
32de518
Tested in actuall full home area, seems to catch failures
marcmengel Jan 24, 2024
edc0928
remove hostnames from comments
marcmengel Jan 25, 2024
4f33332
integration test for disk space passes
marcmengel Jan 25, 2024
3bf954d
mark test integration..
marcmengel Jan 25, 2024
a46d717
tested without ksu privs
marcmengel Jan 25, 2024
9197bd0
rebase merge conflict
marcmengel Feb 16, 2024
4e73a38
space check
marcmengel Jan 27, 2024
d9b0290
Moved checked-out commit to 4adda
shreyb Feb 5, 2024
fe9b89a
Added github action that checks that we can run make and build RPM (…
shreyb Feb 5, 2024
cdbb4ee
Fixed build-al9 badge URL (#527)
shreyb Feb 5, 2024
25d05a8
Split build workflows into PR and push workflows (#528)
shreyb Feb 6, 2024
347f45f
Added SL7 build github action that uses sl:7 container running in (#529)
shreyb Feb 9, 2024
e07d8d7
Added SL7 status badge (#530)
shreyb Feb 9, 2024
2a9253c
Checking token role and group should be case-insensitive
shreyb Feb 13, 2024
aeed9fb
Suppress quota and df output for verbose=0
shreyb Feb 13, 2024
104b3ca
cleaning up extraneous diffs
marcmengel Feb 16, 2024
9121ffb
needed curlies
marcmengel Feb 20, 2024
85c4267
merge
marcmengel Feb 20, 2024
83e1721
rename environments to ifdh_env... instead of jobsub_env...
marcmengel Feb 21, 2024
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
17 changes: 3 additions & 14 deletions templates/simple/simple.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,20 +167,9 @@ cat << '_HEREDOC_' > ${JSB_TMP}/ifdh.sh
which ifdh > /dev/null 2>&1
has_ifdh=$?
if [ "$has_ifdh" -ne "0" ] ; then
unset PRODUCTS
for setup_file in /cvmfs/fermilab.opensciencegrid.org/products/common/etc/setups /grid/fermiapp/products/common/etc/setups.sh /fnal/ups/etc/setups.sh ; do
if [ -e "$setup_file" ] && [ "$has_ifdh" -ne "0" ]; then
source $setup_file
ups exist ifdhc $IFDH_VERSION
has_ifdh=$?
if [ "$has_ifdh" = "0" ] ; then
setup ifdhc $IFDH_VERSION
break
else
unset PRODUCTS
fi
fi
done
. /cvmfs/fermilab.opensciencegrid.org/packages/common/setup-env.sh
sos=$(spack arch --operating-system)
spack env activate jobsub_env_${sos}_${IFDH_VERSION:-current}
shreyb marked this conversation as resolved.
Show resolved Hide resolved
fi
which ifdh > /dev/null 2>&1
if [ "$?" -ne "0" ] ; then
Expand Down
Loading