From 289fa76cabc2e11c8065d64eaea7c035aef57189 Mon Sep 17 00:00:00 2001
From: kaloyane <kaloyane>
Date: Wed, 30 Mar 2011 17:07:54 +0000
Subject: [PATCH] minor: scripts should not copy the final binaries directly
under "sprint_builds". They are already stored in
"sprint_builds/$TODAY-<sprint-number>"
SVN: 20594
---
openbis_all/source/bash/build.sh | 32 +++++++-----------
openbis_all/source/bash/tag_and_build.sh | 42 ++++++++++--------------
2 files changed, 28 insertions(+), 46 deletions(-)
diff --git a/openbis_all/source/bash/build.sh b/openbis_all/source/bash/build.sh
index 610604b4c74..0503f83c5f1 100755
--- a/openbis_all/source/bash/build.sh
+++ b/openbis_all/source/bash/build.sh
@@ -73,32 +73,23 @@ function copy_to_cisd_server {
state_end
}
-function copy_to_sprint_server {
- state_start "Copying new openBIS components to '$SPRINT_SERVER'..."
-
- if [ $EXECUTE_COMMANDS ]; then
- scp openBIS-server-S*.zip $SPRINT_SERVER:.
- scp datastore_server-S*.zip $SPRINT_SERVER:.
- scp *.zip $SPRINT_SERVER:~/sprint_builds
- rm -f *.zip
- fi
- state_end
-}
-
-
function publish_javadocs {
state_start "Publishing javadocs ..."
if [ $EXECUTE_COMMANDS ]; then
- pushd .
-
- cp -R tmp/openbis_all/targets/dist/javadoc $JAVADOC_FOLDER/$FULL_VER
- cd $JAVADOC_FOLDER
- rm -f current
- ln -s $FULL_VER current
+ local javadocSrcDir=tmp/openbis_all/targets/dist/javadoc
- popd
+ if [ -d "$javadocSrcDir" ]; then
+ pushd .
+
+ cp -R $javadocSrcDir $JAVADOC_FOLDER/$FULL_VER
+ cd $JAVADOC_FOLDER
+ rm -f current
+ ln -s $FULL_VER current
+
+ popd
+ fi
fi
state_end
}
@@ -124,7 +115,6 @@ fi
setup
build
copy_to_cisd_server
-copy_to_sprint_server
publish_javadocs
install_sprint
diff --git a/openbis_all/source/bash/tag_and_build.sh b/openbis_all/source/bash/tag_and_build.sh
index 726922297d6..27130b17247 100755
--- a/openbis_all/source/bash/tag_and_build.sh
+++ b/openbis_all/source/bash/tag_and_build.sh
@@ -74,26 +74,15 @@ function build {
}
function copy_to_cisd_server {
- state_start "Copying new openBIS components to '$CISD_SERVER'..."
+ state_start "Copying new openBIS components to sprint-builds'..."
if [ $EXECUTE_COMMANDS ]; then
- OPENBIS_PATH=cisd/sprint_builds/openBIS
+
+ OPENBIS_PATH=~openbis/fileserver/sprint_builds/openBIS
SPRINT_DIR=$OPENBIS_PATH/$TODAY-$FULL_VER
- echo "mkdir -p $SPRINT_DIR" | ssh -T $CISD_SERVER
- scp *.zip $CISD_SERVER:$SPRINT_DIR
- echo "chmod g+w -R $SPRINT_DIR" | ssh -T $CISD_SERVER
- fi
- state_end
-}
-
-function copy_to_sprint_server {
- state_start "Copying new openBIS components to '$SPRINT_SERVER'..."
-
- if [ $EXECUTE_COMMANDS ]; then
- scp openBIS-server-S*.zip $SPRINT_SERVER:.
- scp datastore_server-S*.zip $SPRINT_SERVER:.
- scp *.zip $SPRINT_SERVER:~/sprint_builds
- rm -f *.zip
+ mkdir -p $SPRINT_DIR
+ cp -p *.zip $SPRINT_DIR/
+ chmod g+w -R $SPRINT_DIR
fi
state_end
}
@@ -103,14 +92,18 @@ function publish_javadocs {
state_start "Publishing javadocs ..."
if [ $EXECUTE_COMMANDS ]; then
- pushd .
-
- cp -R tmp/openbis_all/targets/dist/javadoc $JAVADOC_FOLDER/$FULL_VER
- cd $JAVADOC_FOLDER
- rm -f current
- ln -s $FULL_VER current
+ local javadocSrcDir=tmp/openbis_all/targets/dist/javadoc
- popd
+ if [ -d "$javadocSrcDir" ]; then
+ pushd .
+
+ cp -R $javadocSrcDir $JAVADOC_FOLDER/$FULL_VER
+ cd $JAVADOC_FOLDER
+ rm -f current
+ ln -s $FULL_VER current
+
+ popd
+ fi
fi
state_end
}
@@ -138,7 +131,6 @@ setup
tag
build
copy_to_cisd_server
-copy_to_sprint_server
publish_javadocs
install_sprint
--
GitLab