made a fallback for older xsede tests not under genesis folder.

[feisty_meow.git] / scripts / buildor / build_xsedes.sh

diff --git a/scripts/buildor/build_xsedes.sh b/scripts/buildor/build_xsedes.sh
index 659965ec7b78ec5289cb11e53867e3c9d4e2f40d..a6a52e35ba57b2e0f6f6b3fde6b98375d9afa8eb 100644 (file)
--- a/scripts/buildor/build_xsedes.sh
+++ b/scripts/buildor/build_xsedes.sh
@@ -11,21 +11,22 @@ function build_xsede()
     echo GENII_INSTALL_DIR is not set.
     return 1
   fi
-  pushd $GENII_INSTALL_DIR
-  if [ $? -ne 0 ]; then return 1; fi
+  pushd "$GENII_INSTALL_DIR"
+  if [ $? -ne 0 ]; then
+    error_sound
+    return 1
+  fi
   echo "Build starting at: $(date)"
 
-# clean up some things.
-#maybe not needed.
-if [ ! -d unit-test-reports ]; then
-echo this chunk in build_xsedes could be removed to clean up unit tests
-else
-\rm -rf unit-test-reports
-fi
+  # clean up some things.
+  \rm -rf unit-test-reports
 
   # build the trunk.
   ant -Dbuild.targetArch=64 build
-  if [ $? -ne 0 ]; then return 1; fi
+  if [ $? -ne 0 ]; then
+    error_sound
+    return 1
+  fi
   echo "Build done at: $(date)"
   popd
 
@@ -38,9 +39,13 @@ function rebuild_xsede()
     echo GENII_INSTALL_DIR is not set.
     return 1
   fi
-  pushd $GENII_INSTALL_DIR
+  pushd "$GENII_INSTALL_DIR"
   ant clean
-  if [ $? -ne 0 ]; then return 1; fi
+
+  if [ $? -ne 0 ]; then
+    error_sound
+    return 1
+  fi
   popd
   build_xsede
 }
@@ -51,8 +56,38 @@ function rebu_bootstrap()
   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
-  if [ $? -ne 0 ]; then echo "failed to bootstrap a container"; return 1; fi
+  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
+    return 1
+  fi
+
+  success_sound  
+}
+
+# a shortcut for building without a clean, and creating a bootstrap container with the code.
+function bu_bootstrap()
+{
+  build_xsede 
+  if [ $? -ne 0 ]; then echo "failed to rebuild xsede code"; return 1; fi
+
+  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
+    return 1
+  fi
 
   success_sound  
 }
@@ -63,8 +98,12 @@ function fast_install_build()
   build_xsede 
   if [ $? -ne 0 ]; then echo "failed to build xsede code"; return 1; fi
 
-  bash $GENII_INSTALL_DIR/xsede_tools/tools/installer/fast_installer_build.sh $*
-  if [ $? -ne 0 ]; then echo "failed to create the installer."; return 1; fi
+  bash "$GENII_INSTALL_DIR/xsede_tools/tools/installer/fast_installer_build.sh" $*
+  if [ $? -ne 0 ]; then
+    echo "failed to bootstrap create the installer."
+    error_sound
+    return 1
+  fi
 
   success_sound  
 }