diff --git a/admin/jenkins b/admin/jenkins index cfc6734ab..9a8e7e5b8 100755 --- a/admin/jenkins +++ b/admin/jenkins @@ -7,24 +7,6 @@ echo "starting build..." if [ "$?" = "0" ]; then echo "build succeeded" - - if [ ! -z "$PACKAGE" ]; then - if [[ "$GIT_BRANCH" == *develop* || "$GIT_BRANCH" == *master* ]]; then - echo "publishing ubuntu package (.deb)" - DEBPATH=`find target/deb -name *.deb` - DEBNAME=`basename $DEBPATH` - - curl -f -T $DEBPATH $DEB_SERVER/$DEBNAME - - if [ "$?" != "0" ]; then - echo "deb publish failed" - exit 1 - fi - echo "done publishing deb" - else - echo "Skipping publish since branch is neither master or develop..." - fi - fi else echo "build failed" exit 1 diff --git a/db/jenkins b/db/jenkins index 3c3f5b055..275cb28a4 100755 --- a/db/jenkins +++ b/db/jenkins @@ -8,37 +8,17 @@ echo "starting build..." if [ "$?" = "0" ]; then echo "build succeeded" - if [[ "$GIT_BRANCH" == *develop* || "$GIT_BRANCH" == *master* ]]; then - echo "publishing gem" - pushd "target/ruby_package" - find . -name *.gem -exec curl -f -T {} $GEM_SERVER/{} \; + echo "publishing gem" + pushd "target/ruby_package" + find . -name *.gem -exec curl -f -T {} $GEM_SERVER/{} \; - if [ "$?" != "0" ]; then - echo "publish failed" - exit 1 - fi + if [ "$?" != "0" ]; then + echo "publish failed" + exit 1 + fi - popd - echo "done publishing gems" - - if [ ! -z "$PACKAGE" ]; then - echo "publishing ubuntu packages (.deb)" - for f in `find target -name '*.deb'`; do - DEBNAME=`basename $f` - DEBPATH="$f" - echo "publishing $DEBPATH to deb server" - curl -f -T $DEBPATH $DEB_SERVER/$DEBNAME - if [ "$?" != "0" ]; then - echo "deb publish failed of $DEBPATH" - exit 1 - fi - done - - echo "done publishing debs" - fi - else - echo "Skipping publish since branch is neither master or develop..." - fi + popd + echo "done publishing gems" else echo "build failed" exit 1 diff --git a/pb/jenkins b/pb/jenkins index 2d3bb662f..74e4ccbb0 100755 --- a/pb/jenkins +++ b/pb/jenkins @@ -10,7 +10,7 @@ if [ "$?" = "0" ]; then echo "publishing gem" pushd "target/ruby/jampb" find . -name *.gem -exec curl -f -T {} $GEM_SERVER/{} \; - + if [ "$?" != "0" ]; then echo "publish failed" exit 1 diff --git a/ruby/jenkins b/ruby/jenkins index e80e1c1b9..8d4742fc6 100755 --- a/ruby/jenkins +++ b/ruby/jenkins @@ -26,7 +26,7 @@ EOF echo "publishing gem" curl -f -T $GEMNAME $GEM_SERVER/$GEMNAME - + if [ "$?" != "0" ]; then echo "publish failed" exit 1 diff --git a/web/jenkins b/web/jenkins index cfc6734ab..9a8e7e5b8 100755 --- a/web/jenkins +++ b/web/jenkins @@ -7,24 +7,6 @@ echo "starting build..." if [ "$?" = "0" ]; then echo "build succeeded" - - if [ ! -z "$PACKAGE" ]; then - if [[ "$GIT_BRANCH" == *develop* || "$GIT_BRANCH" == *master* ]]; then - echo "publishing ubuntu package (.deb)" - DEBPATH=`find target/deb -name *.deb` - DEBNAME=`basename $DEBPATH` - - curl -f -T $DEBPATH $DEB_SERVER/$DEBNAME - - if [ "$?" != "0" ]; then - echo "deb publish failed" - exit 1 - fi - echo "done publishing deb" - else - echo "Skipping publish since branch is neither master or develop..." - fi - fi else echo "build failed" exit 1 diff --git a/websocket-gateway/jenkins b/websocket-gateway/jenkins index 6715819d4..1b9d4ac71 100755 --- a/websocket-gateway/jenkins +++ b/websocket-gateway/jenkins @@ -9,7 +9,6 @@ echo "starting build..." if [ "$?" = "0" ]; then echo "build succeeded" - if [[ "$GIT_BRANCH" == *develop* || "$GIT_BRANCH" == *master* ]]; then # generate gem version based on jenkins build number if [ -z $BUILD_NUMBER ]; then @@ -35,24 +34,6 @@ EOF exit 1 fi echo "done publishing gem" - - if [ ! -z "$PACKAGE" ]; then - echo "publishing ubuntu package (.deb)" - DEBPATH=`find target/deb -name *.deb` - DEBNAME=`basename $DEBPATH` - - curl -f -T $DEBPATH $DEB_SERVER/$DEBNAME - - if [ "$?" != "0" ]; then - echo "deb publish failed" - exit 1 - fi - echo "done publishing deb" - - fi - else - echo "Skipping publish since branch is neither master or develop..." - fi else echo "build failed" exit 1