Starting snapshot 1.2.0-SNAPSHOT
Also, fixed onos-upload-bits script to upload rc's to nightly/
Change-Id: I9bb8fe685492e23c740796879f0b66c307e26e56
diff --git a/tools/build/envDefaults b/tools/build/envDefaults
index 9214f4d..24cab2f 100644
--- a/tools/build/envDefaults
+++ b/tools/build/envDefaults
@@ -18,8 +18,8 @@
export BUILD_NUMBER=${BUILD_NUMBER:-$(id -un)~$(date +'%Y/%m/%d@%H:%M')}
# ONOS Version and onos.tar.gz staging environment
-export ONOS_POM_VERSION="1.2.0-rc1"
-export ONOS_VERSION=${ONOS_VERSION:-1.2.0-rc1.$BUILD_NUMBER}
+export ONOS_POM_VERSION="1.2.0-SNAPSHOT"
+export ONOS_VERSION=${ONOS_VERSION:-1.2.0.$BUILD_NUMBER}
# ONOS production bits (onos.tar.gz & onos.zip) staging environment
export ONOS_BITS=onos-${ONOS_VERSION%~*}
diff --git a/tools/build/onos-upload-bits b/tools/build/onos-upload-bits
index 19eaada..e0d5524 100755
--- a/tools/build/onos-upload-bits
+++ b/tools/build/onos-upload-bits
@@ -8,4 +8,4 @@
#FIXME need to export s3Creds
#TODO we could verify that ONOS_VERSION is set, and only upload that version
-python onosUploadBits.py
+onosUploadBits.py
diff --git a/tools/build/onosUploadBits.py b/tools/build/onosUploadBits.py
index 284a509..b86f45d 100755
--- a/tools/build/onosUploadBits.py
+++ b/tools/build/onosUploadBits.py
@@ -30,11 +30,11 @@
version = match.group(1)
build = match.group(2)
if build:
- if 'NIGHTLY' in build:
+ if 'NIGHTLY' in build or 'rc' in build:
uploadFile(filePath, dest='nightly/')
else:
#no build; this is a release
uploadFile(filePath, dest='release/')
if __name__ == '__main__':
- findBits( '/tmp' )
\ No newline at end of file
+ findBits( '/tmp' )