From: František Dvořák <valtri@civ.zcu.cz>
Date: Fri, 18 Nov 2011 00:44:45 +0000 (+0000)
Subject: Create example installation script only as default (installation from production... 
X-Git-Tag: merge_30_head_take2_dst~21
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=dbb78524dd5ef6166943bd419329c7d2b53ec949;p=jra1mw.git

Create example installation script only as default (installation from production) when don't exist.
---

diff --git a/org.glite.testsuites.ctb/LB/tests/lb-autonomous-test.sh b/org.glite.testsuites.ctb/LB/tests/lb-autonomous-test.sh
index 62d20cb..198979d 100755
--- a/org.glite.testsuites.ctb/LB/tests/lb-autonomous-test.sh
+++ b/org.glite.testsuites.ctb/LB/tests/lb-autonomous-test.sh
@@ -56,9 +56,9 @@ source lb-common-testbeds.sh
 STARTTIME=`date +%s`
 
 printf "Getting the 'install' script... "
-#XXX Provisional. The test won't be generated here in the future. Just downloaded or otherwise obtained
-SCENARIO="Clean installation"
-cat << EndInstallScript > LBinstall.sh 
+# Example script, for real tests it should be downloaded or otherwise obtained
+SCENARIO=${SCENARIO:-"Clean installation"}
+test -s LBinstall.sh || cat << EndInstallScript > LBinstall.sh 
 rpm -Uvhi http://download.fedora.redhat.com/pub/epel/5/x86_64/epel-release-5-4.noarch.rpm
 yum install -y yum-priorities yum-protectbase
 rpm -i http://emisoft.web.cern.ch/emisoft/dist/EMI/1/sl5/x86_64/base/emi-release-1.0.0-1.sl5.noarch.rpm
diff --git a/org.glite.testsuites.ctb/PX/tests/px-autonomous-test.sh b/org.glite.testsuites.ctb/PX/tests/px-autonomous-test.sh
index b9fca76..5571f02 100755
--- a/org.glite.testsuites.ctb/PX/tests/px-autonomous-test.sh
+++ b/org.glite.testsuites.ctb/PX/tests/px-autonomous-test.sh
@@ -68,9 +68,9 @@ source lb-common-testbeds.sh
 
 
 printf "Getting the 'install' script... "
-#XXX Provisional. The test won't be generated here in the future. Just downloaded or otherwise obtained
-SCENARIO="Clean installation"
-cat << EndInstallScript > PXinstall.sh
+# Example script, for real tests it should be downloaded or otherwise obtained
+SCENARIO=${SCENARIO:-"Clean installation"}
+test -s PXinstall.sh || cat << EndInstallScript > PXinstall.sh
 rpm -Uvhi http://download.fedora.redhat.com/pub/epel/5/x86_64/epel-release-5-4.noarch.rpm
 yum install -y yum-priorities yum-protectbase
 rpm -i http://emisoft.web.cern.ch/emisoft/dist/EMI/1/sl5/x86_64/base/emi-release-1.0.0-1.sl5.noarch.rpm
diff --git a/org.glite.testsuites.ctb/gridsite/tests/gridsite-autonomous-test.sh b/org.glite.testsuites.ctb/gridsite/tests/gridsite-autonomous-test.sh
index 5882f0d..c0d54e5 100755
--- a/org.glite.testsuites.ctb/gridsite/tests/gridsite-autonomous-test.sh
+++ b/org.glite.testsuites.ctb/gridsite/tests/gridsite-autonomous-test.sh
@@ -68,9 +68,9 @@ source lb-common-testbeds.sh
 
 
 printf "Getting the 'install' script... "
-#XXX Provisional. The test won't be generated here in the future. Just downloaded or otherwise obtained
-SCENARIO="Clean installation"
-cat << EndInstallScript > GridSiteInstall.sh
+# Example script, for real tests it should be downloaded or otherwise obtained
+SCENARIO=${SCENARIO:-"Clean installation"}
+test -s GridSiteInstall.sh || cat << EndInstallScript > GridSiteInstall.sh
 rpm -Uvhi http://download.fedora.redhat.com/pub/epel/5/x86_64/epel-release-5-4.noarch.rpm
 yum install -y yum-priorities yum-protectbase
 rpm -i http://emisoft.web.cern.ch/emisoft/dist/EMI/1/sl5/x86_64/base/emi-release-1.0.0-1.sl5.noarch.rpm