From: Zdeněk Šustr Date: Wed, 26 Oct 2011 08:57:34 +0000 (+0000) Subject: Arrange script generation moved to a separate file. X-Git-Tag: glite-px-myproxy-yaim_R_4_1_5_1~21 X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=3e9b3928a3258f8e360a0f863df721b26a091e0b;p=jra1mw.git Arrange script generation moved to a separate file. --- diff --git a/org.glite.testsuites.ctb/LB/tests/lb-run-tests.sh b/org.glite.testsuites.ctb/LB/tests/lb-run-tests.sh index 040ecda..ca87a39 100755 --- a/org.glite.testsuites.ctb/LB/tests/lb-run-tests.sh +++ b/org.glite.testsuites.ctb/LB/tests/lb-run-tests.sh @@ -47,6 +47,12 @@ if [ ! -r ${COMMON} ]; then exit 2 fi source ${COMMON} +COMMONTESTBEDS=lb-common-testbeds.sh +if [ ! -r ${COMMONTESTBEDS} ]; then + printf "Common definitions '${COMMONTESTBEDS}' missing!" + exit 2 +fi +source ${COMMONTESTBEDS} COPYPROXY=1 @@ -123,136 +129,9 @@ if [ "$PROXYCERT" == "" ]; then PROXYCERT="none" fi -cat << EndArrangeScript > arrange_lb_test_root.sh -CERTFILE=\$1 -GLITE_USER=\$2 -LBTSTCOLS=\$3 -OUTPUT_OPT=\$4 - -export LBTSTCOLS - -yum install -q -y globus-proxy-utils -yum install -q -y postgresql postgresql-server -#Standard setup now uses production brokers. No need to install our own. -#yum install -q -y activemq java-1.6.0-openjdk -yum install -q -y emi-lb-nagios-plugins -yum install -q -y voms-clients - -/etc/init.d/postgresql start -mv /var/lib/pgsql/data/pg_hba.conf /var/lib/pgsql/data/pg_hba.conf.orig -cat >/var/lib/pgsql/data/pg_hba.conf < 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 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 -echo cd org.glite.testsuites.ctb/LB/tests >> arrange_lb_test_user.sh -echo ulimit -c unlimited >> arrange_lb_test_user.sh -echo 'export HNAME=\`hostname -f\`' >> arrange_lb_test_user.sh -echo 'export GLITE_WMS_QUERY_SERVER=\$HNAME:9000' >> arrange_lb_test_user.sh -echo 'export GLITE_WMS_NOTIF_SERVER=\$HNAME:9000' >> arrange_lb_test_user.sh -echo 'export GLITE_WMS_LOG_DESTINATION=\$HNAME:9002' >> arrange_lb_test_user.sh -echo export GLITE_LB_SERVER_WPORT=9003 >> arrange_lb_test_user.sh -echo export GLITE_LB_SERVER_PORT=9000 >> arrange_lb_test_user.sh -echo export GLITE_LB_LOGGER_PORT=9002 >> arrange_lb_test_user.sh -echo export GLITE_WMS_LBPROXY_STORE_SOCK=/tmp/lb_proxy_ >> arrange_lb_test_user.sh -echo 'env | egrep "GLITE|\$HNAME|PATH"' >> arrange_lb_test_user.sh -echo pwd >> arrange_lb_test_user.sh -if [ "\$OUTPUT_OPT" == "-i" ]; then -echo echo ======================== >> arrange_lb_test_user.sh -echo echo " THE CONSOLE IS YOURS" >> arrange_lb_test_user.sh -echo echo ======================== >> arrange_lb_test_user.sh -echo '/bin/bash -i' >> arrange_lb_test_user.sh -else -echo echo ======================== >> arrange_lb_test_user.sh -echo echo " REAL TESTS START HERE" >> arrange_lb_test_user.sh -echo echo ======================== >> arrange_lb_test_user.sh -echo 'echo ""' >> arrange_lb_test_user.sh -echo 'echo ""' >> arrange_lb_test_user.sh -echo sh ./lb-test-permissions.sh \$OUTPUT_OPT >> arrange_lb_test_user.sh -echo sh ./lb-test-event-delivery.sh \$OUTPUT_OPT >> arrange_lb_test_user.sh -echo sh ./lb-test-il-recovery.sh -f /var/glite/log/dglogd.log \$OUTPUT_OPT >> arrange_lb_test_user.sh -echo sh ./lb-test-job-registration.sh \$OUTPUT_OPT >> arrange_lb_test_user.sh -echo sh ./lb-test-https.sh \$OUTPUT_OPT >> arrange_lb_test_user.sh -echo sh ./lb-test-job-states.sh \$OUTPUT_OPT >> arrange_lb_test_user.sh -echo sh ./lb-test-logevent.sh /var/glite/log/dglogd.log \$OUTPUT_OPT >> arrange_lb_test_user.sh -echo sh ./lb-test-notif-recovery.sh \$OUTPUT_OPT >> arrange_lb_test_user.sh -echo sh ./lb-test-notif-msg.sh \$OUTPUT_OPT >> arrange_lb_test_user.sh -echo sh ./lb-test-notif.sh \$OUTPUT_OPT >> arrange_lb_test_user.sh -echo sh ./lb-test-notif-switch.sh \$OUTPUT_OPT >> arrange_lb_test_user.sh -echo sh ./lb-test-notif-stream.sh \$OUTPUT_OPT >> arrange_lb_test_user.sh -echo sh ./lb-test-proxy-delivery.sh \$OUTPUT_OPT >> arrange_lb_test_user.sh -echo sh ./lb-test-ws.sh \$OUTPUT_OPT >> arrange_lb_test_user.sh -echo sh ./lb-test-bdii.sh \$OUTPUT_OPT >> arrange_lb_test_user.sh -echo sh ./lb-test-sandbox-transfer.sh \$OUTPUT_OPT >> arrange_lb_test_user.sh -echo sh ./lb-test-changeacl.sh \$OUTPUT_OPT >> arrange_lb_test_user.sh -echo sh ./lb-test-statistics.sh \$OUTPUT_OPT >> arrange_lb_test_user.sh -echo sh ./lb-test-threaded.sh \$OUTPUT_OPT >> arrange_lb_test_user.sh -echo sh ./lb-test-harvester.sh \$OUTPUT_OPT >> arrange_lb_test_user.sh -echo sh ./lb-test-nagios-probe.sh \$OUTPUT_OPT >> arrange_lb_test_user.sh -echo perl ./lb-test-purge.pl --i-want-to-purge $remotehost:9000 \$OUTPUT_OPT >> arrange_lb_test_user.sh -echo 'echo ""' >> arrange_lb_test_user.sh -echo 'echo ""' >> arrange_lb_test_user.sh -echo echo ================== >> arrange_lb_test_user.sh -echo echo " TESTS END HERE" >> arrange_lb_test_user.sh -echo echo ================== >> arrange_lb_test_user.sh -fi -#echo "" >> arrange_lb_test_user.sh - -chown \$GLITE_USER:\$GLITE_USER arrange_lb_test_user.sh -chmod +x arrange_lb_test_user.sh - -#su -l \$GLITE_USER -su -l \$GLITE_USER --command=/tmp/arrange_lb_test_user.sh -echo "" - -EndArrangeScript +printf "Generating the 'arrange' script... " +gen_arrange_script $remotehost $COPYPROXY +test_done TERMCOLS=`stty size | awk '{print $2}'`