Commit f047ea5f authored by Brian Paul Bockelman's avatar Brian Paul Bockelman
Browse files

Update the test to not require a glexec-created proxy in the payload environment.

This brings the test closer in line with what is used by glideinWMS.
parent 0624b82e
......@@ -213,38 +213,6 @@ else
fi
add2buffer "using glexec_unwrapenv.pl at $glexec_unwrapenv"
# run glexec and verify that the proxy is changed
payloaddn=`$glexec $glexec_unwrapenv -- voms-proxy-info -subject`
err=$?
if [ $err -ne 0 ]; then
add2buffer "Warning: error $err executing $glexec getting payload DN"
exitcode=$NAG_WARNING
fi
add2buffer "Payload proxy info - DN: $payloaddn"
if [ -z "$payloaddn" ]; then
do_print "Error: voms-proxy-info returned an empty string for the subject"
exitcode=$NAG_WARNING
fi
payloadfqan=`$glexec $glexec_unwrapenv -- voms-proxy-info -fqan | head -1`
err=$?
if [ $err -ne 0 ]; then
add2buffer "Warning: error $err executing $glexec getting payload fqan"
exitcode=$NAG_WARNING
fi
if [ -z "$payloadfqan" ]; then
add2buffer "Warning: voms-proxy-info returned an empty string for the primary fqan"
exitcode=$NAG_WARNING
fi
add2buffer "Primary FQAN: $payloadfqan"
if [ "X$payloaddn$payloadfqan" == "X$dn$fqan" ]; then
add2buffer "Warning: Same DN/FQAN for pilot and payload"
exitcode=$NAG_WARNING
fi
# copy the payload executable to the payload execution directory
cp $currdir/payload.sh $tmpdir
chmod 755 $tmpdir/payload.sh
......@@ -279,6 +247,12 @@ fi
$glexec /bin/rm $stickydir/*
$mkgltempdir -r $stickydir
# Check payload output for "Hello world"
if [ `grep -q "Hello world" payload.out; echo $?` -ne 0 ]; then
add2buffer "Warning: payload stdout appears incorrect."
exitcode=$NAG_WARNING
fi
# Print payload output
add2buffer "payload.out:"
cat $currdir/payload.out
......
#! /bin/bash
echo "Hello world"
echo "Current host is:"
uname -a
echo "Current directory is:"
pwd
echo "Current user is:"
id
echo "Current proxy location is:"
echo "$X509_USER_PROXY"
echo "Current proxy content is:"
voms-proxy-info -all
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment