From 4cf366e0da0a715402d9ee230c80c8e8e4cf40e8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zden=C4=9Bk=20=C5=A0ustr?= Date: Mon, 14 Nov 2011 12:12:48 +0000 Subject: [PATCH] Support configurable lifetime for proxy --- org.glite.testsuites.ctb/LB/tests/lb-common-testbeds.sh | 2 +- org.glite.testsuites.ctb/LB/tests/lb-generate-fake-proxy.sh | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/org.glite.testsuites.ctb/LB/tests/lb-common-testbeds.sh b/org.glite.testsuites.ctb/LB/tests/lb-common-testbeds.sh index 434e44d..1717ed9 100755 --- a/org.glite.testsuites.ctb/LB/tests/lb-common-testbeds.sh +++ b/org.glite.testsuites.ctb/LB/tests/lb-common-testbeds.sh @@ -107,7 +107,7 @@ visudo -c echo cd > arrange_lb_test_user.sh echo export LBTSTCOLS=\$LBTSTCOLS >> arrange_lb_test_user.sh echo 'export GLITE_MYSQL_ROOT_PASSWORD="[Edited]"' >> arrange_lb_test_user.sh -echo mkdir LB_testing >> arrange_lb_test_user.sh +echo mkdir -p LB_testing >> arrange_lb_test_user.sh echo cd LB_testing >> arrange_lb_test_user.sh echo cvs -d :pserver:anonymous@glite.cvs.cern.ch:/cvs/jra1mw co org.glite.testsuites.ctb/LB >> arrange_lb_test_user.sh echo ls >> arrange_lb_test_user.sh diff --git a/org.glite.testsuites.ctb/LB/tests/lb-generate-fake-proxy.sh b/org.glite.testsuites.ctb/LB/tests/lb-generate-fake-proxy.sh index d3dc887..3edb235 100755 --- a/org.glite.testsuites.ctb/LB/tests/lb-generate-fake-proxy.sh +++ b/org.glite.testsuites.ctb/LB/tests/lb-generate-fake-proxy.sh @@ -43,6 +43,7 @@ EndHelpHeader echo "Usage: $progname [OPTIONS]" echo "Options:" echo " -h | --help Show this help message." + echo " -H | --hours Proxy will be valid for given No. of hours (default is 12)" } @@ -50,6 +51,7 @@ while test -n "$1" do case "$1" in "-h" | "--help") showHelp && exit 2 ;; + "-H" | "--hours") shift ; PROXYHOURS="-hours $1 " ;; esac shift done @@ -74,7 +76,7 @@ for p in $USER $VOMS_SERVER $USER_BOB; do for p in $USER $USER_BOB; do voms-proxy-fake -cert ${p}.cert -key ${p}.priv-clear \ - -hostcert ${VOMS_SERVER}.cert -hostkey ${VOMS_SERVER}.priv-clear \ + -hostcert ${VOMS_SERVER}.cert -hostkey ${VOMS_SERVER}.priv-clear $PROXYHOURS\ -voms ${VO} -out /tmp/x509up_u${p} \ -fqan "/${VO}/Role=NULL/Capability=NULL" &> /dev/null || exit 1 done -- 1.8.2.3