Skip to content
Merged
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 gluex_env_jlab.csh
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ setenv PATH /apps/perl/bin:$PATH
source $BUILD_SCRIPTS/gluex_env_version.csh $VERSION_XML
if ($status) exit $status
setenv JANA_CALIB_URL `$BUILD_SCRIPTS/calib_url_chooser.sh`
setenv CCDB_CONNECTION $JANA_CALIB_URL
setenv JANA_RESOURCE_DIR /group/halld/www/halldweb/html/resources
# cmake on the cue
if ( $BMS_OSNAME !~ *CentOS7.7* ) then
Expand Down
1 change: 1 addition & 0 deletions gluex_env_jlab.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ export PATH=/apps/perl/bin:$PATH
# finish the rest of the environment
. $BUILD_SCRIPTS/gluex_env_version.sh $VERSION_XML
export JANA_CALIB_URL=`$BUILD_SCRIPTS/calib_url_chooser.sh`
export CCDB_CONNECTION=$JANA_CALIB_URL
export JANA_RESOURCE_DIR=/group/halld/www/halldweb/html/resources
# cmake on the cue
if [[ $BMS_OSNAME != *CentOS7.7* ]]
Expand Down
2 changes: 1 addition & 1 deletion pull_request/build_pull_request_service.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ test_dir=/work/halld/pull_request_test
cd $test_dir
version_file="version_${repo}_${branch}.xml"
rm -f $version_file
/apps/perl/bin/perl $BUILD_SCRIPTS/pull_request/pull_request_test_version.pl $repo $branch $bms_osname
perl $BUILD_SCRIPTS/pull_request/pull_request_test_version.pl $repo $branch $bms_osname
source $BUILD_SCRIPTS/gluex_env_boot_jlab.sh
gxenv $version_file
#
Expand Down
6 changes: 1 addition & 5 deletions pull_request/leave_pull_request_comment.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
#!/apps/python/3.3.1/bin/python3

# note that this is in python 3, since the version of python 2.7 on the CUE is not
# new enough to properly support the libraries that handle our SSL connection to GitHub
# python 3 has many tricky difference between python2 - be warned!
#!/usr/bin/python

import requests
import sys
Expand Down
4 changes: 2 additions & 2 deletions pull_request/test_pull_request.sh
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ echo LD_LIBRARY_PATH = $LD_LIBRARY_PATH
echo "Test summary" > summary.txt
for plugin in $(cat plugins.txt); do
echo -e "\nTesting $plugin ..." >> summary.txt
timeout $TLIMIT hd_root -PNTHREADS=$THREADS -PEVENTS_TO_KEEP=$EVENTS $EVIO -PPLUGINS=$plugin >& $LOG/$plugin.txt
timeout $TLIMIT hd_root -PNTHREADS=$THREADS -Pjana:nevents=$EVENTS $EVIO -PPLUGINS=$plugin >& $LOG/$plugin.txt
code=$?
if [ $code -eq 124 ]; then
echo "$plugin plugin failed with $TLIMIT seconds timeout (status=124)."
Expand All @@ -47,7 +47,7 @@ done
function join { local IFS="$1"; shift; echo "$*"; }
plugins=$(join , $(cat plugins.txt))
echo -e "\nTesting all listed plugins at the same time ..." >> summary.txt
timeout $TLIMIT hd_root -PNTHREADS=$THREADS -PEVENTS_TO_KEEP=$EVENTS $EVIO -PPLUGINS=$plugins >& $LOG/multiple_plugins.txt
timeout $TLIMIT hd_root -PNTHREADS=$THREADS -Pjana:nevents=$EVENTS $EVIO -PPLUGINS=$plugins >& $LOG/multiple_plugins.txt
code=$?
if [ $code -eq 124 ]; then
echo "Multiple-plugins test failed with $TLIMIT seconds timeout (status=124)."
Expand Down