projects
/
feisty_meow.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f514e84
)
made a fallback for older xsede tests not under genesis folder.
author
Chris Koeritz
<fred@gruntose.com>
Wed, 3 Dec 2014 20:09:06 +0000
(15:09 -0500)
committer
Chris Koeritz
<fred@gruntose.com>
Wed, 3 Dec 2014 20:09:06 +0000
(15:09 -0500)
scripts/buildor/build_xsedes.sh
patch
|
blob
|
history
diff --git
a/scripts/buildor/build_xsedes.sh
b/scripts/buildor/build_xsedes.sh
index e335651bbd00d682b2c943da690b07596e106db3..a6a52e35ba57b2e0f6f6b3fde6b98375d9afa8eb 100644
(file)
--- a/
scripts/buildor/build_xsedes.sh
+++ b/
scripts/buildor/build_xsedes.sh
@@
-56,7
+56,12
@@
function rebu_bootstrap()
rebuild_xsede
if [ $? -ne 0 ]; then echo "failed to rebuild xsede code"; return 1; fi
rebuild_xsede
if [ $? -ne 0 ]; then echo "failed to rebuild xsede code"; return 1; fi
- bash "$GENII_INSTALL_DIR/xsede_tools/library/bootstrap_quick_start.sh"
+ quickstarter="$GENII_INSTALL_DIR/xsede_tools/library/bootstrap_quick_start.sh"
+ if [ ! -f "$quickstarter" ]; then
+ quickstarter="$XSEDE_TEST_ROOT/library/bootstrap_quick_start.sh"
+ fi
+
+ bash "$quickstarter"
if [ $? -ne 0 ]; then
echo "failed to bootstrap a container."
error_sound
if [ $? -ne 0 ]; then
echo "failed to bootstrap a container."
error_sound
@@
-72,7
+77,12
@@
function bu_bootstrap()
build_xsede
if [ $? -ne 0 ]; then echo "failed to rebuild xsede code"; return 1; fi
build_xsede
if [ $? -ne 0 ]; then echo "failed to rebuild xsede code"; return 1; fi
- bash "$GENII_INSTALL_DIR/xsede_tools/library/bootstrap_quick_start.sh"
+ quickstarter="$GENII_INSTALL_DIR/xsede_tools/library/bootstrap_quick_start.sh"
+ if [ ! -f "$quickstarter" ]; then
+ quickstarter="$XSEDE_TEST_ROOT/library/bootstrap_quick_start.sh"
+ fi
+
+ bash "$quickstarter"
if [ $? -ne 0 ]; then
echo "failed to bootstrap a container."
error_sound
if [ $? -ne 0 ]; then
echo "failed to bootstrap a container."
error_sound