commit 56eefc752626b4af140b74ccb5f4f79bdcb47431
author Ray Milkey <ray@opennetworking.org> Wed May 09 13:14:21 2018 -0700
committer Ray Milkey <ray@opennetworking.org> Wed May 09 21:19:32 2018 +0000
tree 5144136afb3516a789751d53cef769106083b1e3
parent 2ade0c9961e85ae170c49383f338f39550cf634d

Allow publishing of RC builds

Change-Id: I5be1e7ee685cbf9f47c2491431c3899c55243eb2

tools/build/onos-upload-bits

diff --git a/tools/build/onos-upload-bits b/tools/build/onos-upload-bits
index 98fd23c..4edd38b 100755
--- a/tools/build/onos-upload-bits
+++ b/tools/build/onos-upload-bits
@@ -32,8 +32,8 @@
 # onosUploadBits.py ${ONOS_VERSION%-*}
 
 # use this to upload to maven central
-if echo $ONOS_VERSION | grep '-'; then
-    echo "ONOS version $ONOS_VERSION is a beta or RC. Skipping publishing .tar.gz files"
+if echo $ONOS_VERSION | grep '-b'; then
+    echo "ONOS version $ONOS_VERSION is a beta. Skipping publishing .tar.gz files"
     exit 0
 fi
 UPLOAD_BASE="https://oss.sonatype.org/service/local/staging/deploy/maven2/org/onosproject/onos-releases/$ONOS_VERSION"

tools/build/onos-upload-docs

diff --git a/tools/build/onos-upload-docs b/tools/build/onos-upload-docs
index 5c311a3..ed9c0f5 100755
--- a/tools/build/onos-upload-docs
+++ b/tools/build/onos-upload-docs
@@ -14,8 +14,8 @@
 docs=$(onos-buck build //docs:external --show-output 2>/dev/null | tail -1 | cut -d\  -f2)
 
 ONOS_VERSION_STRING=$ONOS_VERSION
-if echo $ONOS_VERSION_STRING | grep '-'; then
-    echo "ONOS version $ONOS_VERSION_STRING is a beta or RC. Skipping"
+if echo $ONOS_VERSION_STRING | grep '-b'; then
+    echo "ONOS version $ONOS_VERSION_STRING is a beta. Skipping"
     exit 0
 fi
 
@@ -32,6 +32,11 @@
     replace="0"
 fi
 
+if echo $ONOS_VERSION_STRING | grep '-'; then
+    echo "ONOS version $ONOS_VERSION_STRING is a beta or RC. Not replacing default document set."
+    replace="0"
+fi
+
 scp $docs $remote:/tmp/onos-apidocs-$ONOS_VERSION.tar.gz
 ssh $remote "
     mkdir -p /var/www/api/$ONOS_VERSION