Get fake cert path from the generator as well
authorZdeněk Šustr <sustr4@cesnet.cz>
Wed, 30 Nov 2011 14:05:06 +0000 (14:05 +0000)
committerZdeněk Šustr <sustr4@cesnet.cz>
Wed, 30 Nov 2011 14:05:06 +0000 (14:05 +0000)
Use myproxy-init rather than store

org.glite.testsuites.ctb/PX/tests/px-common-testbeds.sh
org.glite.testsuites.ctb/PX/tests/px-test-all.sh

index da290df..26b3333 100755 (executable)
@@ -65,7 +65,7 @@ if [ $COPYPROXY -eq 1 ]; then
 else
        rm -rf /tmp/test-certs/grid-security
        cvs -d :pserver:anonymous@glite.cvs.cern.ch:/cvs/jra1mw co org.glite.testsuites.ctb/LB > /dev/null 2>/dev/null
-       FAKE_CAS=\`./org.glite.testsuites.ctb/LB/tests/lb-generate-fake-proxy.sh --lsc | grep -E "^X509_CERT_DIR" | sed 's/X509_CERT_DIR=//'\`
+       FAKE_CAS=\`source ./org.glite.testsuites.ctb/LB/tests/lb-generate-fake-proxy.sh --lsc | grep -E "^X509_CERT_DIR" | sed 's/X509_CERT_DIR=//'\`
        if [ "\$FAKE_CAS" == "" ]; then
                 echo "Failed generating proxy" >&2
                 exit 2
index 07a5023..ff4a2fc 100755 (executable)
@@ -106,11 +106,17 @@ if [ $? != 0 ]; then
         exit 2
 fi
 
+echo User Cert $x509_USER_CERT
+echo User Key $x509_USER_KEY
+chmod 600 $x509_USER_CERT $x509_USER_KEY
+
 JOBID=https://fake.job.id/xxx
 
 ORIG_PROXY=`voms-proxy-info | grep -E "^path" | sed 's/^path\s*:\s*//'`
 PROXYDN=`voms-proxy-info | grep -E "^identity" | sed 's/^identity\s*:\s*//'`
-myproxy-store --certfile $ORIG_PROXY --keyfile $ORIG_PROXY -s localhost -d
+#myproxy-store --certfile $ORIG_PROXY --keyfile $ORIG_PROXY -s localhost -d
+printf "Registering proxy by calling myproxy-init -s localhost -d -n -t 1 --certfile $x509_USER_CERT --keyfile $x509_USER_KEY\n"
+myproxy-init -s localhost -d -n -t 1 -c 1 --certfile $x509_USER_CERT --keyfile $x509_USER_KEY
 myproxy-info -s localhost -l "$PROXYDN"
 REGISTERED_PROXY=`glite-proxy-renew -s localhost -f $ORIG_PROXY -j $JOBID start`
 printf "\tProxy:\t$ORIG_PROXY\n\tRenew:\t$REGISTERED_PROXY\n";