Merge pull request #558 from NREL/v3.0.0

update to official v3.0.0

.travis.yml

@@ -6,7 +6,7 @@ language: minimal
 env:
   global:
     - USE_TESTING_TIMEOUTS: "true"
-    - OPENSTUDIO_VERSION=3.0.0 OPENSTUDIO_VERSION_SHA=949b904134 OPENSTUDIO_VERSION_EXT=-rc3
+    - OPENSTUDIO_VERSION=3.0.0 OPENSTUDIO_VERSION_SHA=1c9617fa4e OPENSTUDIO_VERSION_EXT=""
     - DOCKER_COMPOSE_VERSION=1.21.1
     - BUNDLE_WITHOUT=native_ext
 

Dockerfile

@@ -4,7 +4,7 @@
 # NOTES:            Currently this is one big dockerfile and non-optimal.
 
 #may include suffix
-ARG OPENSTUDIO_VERSION=3.0.0-rc3
+ARG OPENSTUDIO_VERSION=3.0.0
 FROM nrel/openstudio:$OPENSTUDIO_VERSION as base
 MAINTAINER Nicholas Long [email protected]
 

appveyor.yml

@@ -3,8 +3,8 @@ version: 1.0.{build}-{branch}
 environment:
   USE_TESTING_TIMEOUTS: "true"
   OPENSTUDIO_VERSION: 3.0.0
-  OPENSTUDIO_VERSION_SHA: 949b904134
-  OPENSTUDIO_VERSION_EXT: -rc3
+  OPENSTUDIO_VERSION_SHA: 1c9617fa4e
+  OPENSTUDIO_VERSION_EXT: ""
   OPENSTUDIO_TEST_EXE: C:\projects\openstudio\bin\openstudio.exe
   RUBY_VERSION: 25-x64
   BUNDLER_VERSION: 2.1.0

ci/appveyor/setup.cmd

@@ -3,8 +3,8 @@ set GEM_HOME=C:\projects\openstudio-server\gems
 set GEM_PATH=C:\projects\openstudio-server\gems;C:\projects\openstudio-server\gems\gems\bundler\gems
 echo Downloading and Installing OpenStudio (develop branch, %OPENSTUDIO_VERSION%%OPENSTUDIO_VERSION_EXT%.%OPENSTUDIO_VERSION_SHA%)
 REM install  develop build
-curl -SLO --insecure https://openstudio-builds.s3.amazonaws.com/3.0.0/OpenStudio-3.0.0-rc3%%2B949b904134-Windows.exe
-OpenStudio-3.0.0-rc3%%2B949b904134-Windows.exe --script ci/appveyor/install-windows.qs
+curl -SLO --insecure https://openstudio-builds.s3.amazonaws.com/3.0.0/OpenStudio-3.0.0%%2B1c9617fa4e-Windows.exe
+OpenStudio-3.0.0%%2B1c9617fa4e-Windows.exe --script ci/appveyor/install-windows.qs
 move C:\openstudio C:\projects\openstudio
 dir C:\projects\openstudio
 dir C:\projects\openstudio\Ruby

ci/travis/install_openstudio.sh

@@ -10,7 +10,7 @@ if [ ! -z ${OPENSTUDIO_VERSION} ] && [ ! -z ${OPENSTUDIO_SHA} ]; then
     # OPENSTUDIO_VERSION_EXT may be empty
     #OPENSTUDIO_DOWNLOAD_FILENAME=OpenStudio-$OPENSTUDIO_VERSION$OPENSTUDIO_VERSION_EXT.$OPENSTUDIO_SHA-Linux.deb
     # Dev3 hardcoding:
-    OPENSTUDIO_DOWNLOAD_FILENAME=OpenStudio-3.0.0-rc3%2B949b904134-Linux.deb
+    OPENSTUDIO_DOWNLOAD_FILENAME=OpenStudio-3.0.0%2B1c9617fa4e-Linux.deb
 
     echo "Installing OpenStudio ${OPENSTUDIO_DOWNLOAD_FILENAME}"
 

ci/travis/setup.sh

@@ -26,14 +26,14 @@ else
         cp mongodb-osx-x86_64-3.4.18/bin/* /usr/local/bin/
 
         # Install openstudio -- Use the install script that is in this repo now, the one on OpenStudio/develop has changed
-        curl -SLO --insecure https://openstudio-builds.s3.amazonaws.com/3.0.0/OpenStudio-3.0.0-rc3%2B949b904134-Darwin.dmg
+        curl -SLO --insecure https://openstudio-builds.s3.amazonaws.com/3.0.0/OpenStudio-3.0.0%2B1c9617fa4e-Darwin.dmg
         # OSX downloads with %2B. These are unsafe chars in url strings
-        hdiutil attach OpenStudio-3.0.0-rc3%2B949b904134-Darwin.dmg
+        hdiutil attach OpenStudio-3.0.0%2B1c9617fa4e-Darwin.dmg
         sed -i -e "s|REPLACEME|$HOME/openstudio|" ci/travis/install-mac.qs
         rm -rf $HOME/openstudio
         # Will install into $HOME/openstudio and RUBYLIB will be $HOME/openstudio/Ruby
-        sudo /Volumes/OpenStudio-3.0.0-rc3+949b904134-Darwin/OpenStudio-3.0.0-rc3+949b904134-Darwin.app/Contents/MacOS/OpenStudio-3.0.0-rc3+949b904134-Darwin --script ci/travis/install-mac.qs
-        hdiutil detach /Volumes/OpenStudio-3.0.0-rc3+949b904134 -force
+        sudo /Volumes/OpenStudio-3.0.0+1c9617fa4e-Darwin/OpenStudio-3.0.0+1c9617fa4e-Darwin.app/Contents/MacOS/OpenStudio-3.0.0+1c9617fa4e-Darwin --script ci/travis/install-mac.qs
+        hdiutil detach /Volumes/OpenStudio-3.0.0+1c9617fa4e -force
 
         export PATH="$TRAVIS_BUILD_DIR/gems/bin:/usr/local/opt/[email protected]/bin:$HOME/openstudio/bin:$PATH"
         export RUBYLIB="$HOME/openstudio/Ruby"

docker/deployment/build_deploy_ami.py

@@ -231,9 +231,9 @@ def signal_handler(sig_type, _):
     cmd_call = cmd_call.replace('docker run nrel', 'docker run {}'.format(override_dockerhub_repo))
 if verbose:
     print('openstudio-server OpenStudio version command is: {}'.format(cmd_call))
-stdout_arr = run_cmd(cmd_call, 'OpenStudio version retrieval').split('\n')[-2].split('.')
-os_version = stdout_arr[0] + '.' + stdout_arr[1] + '.' + stdout_arr[2]
-os_sha = stdout_arr[3]
+stdout_arr = run_cmd(cmd_call, 'OpenStudio version retrieval').split('\n')[-2].split('+')
+os_version = stdout_arr[0]
+os_sha = stdout_arr[1]
 if verbose:
     print('OpenStudio version retrieved is {}, with SHA {}'.format(os_version, os_sha))
 

server/app/lib/openstudio_server/version.rb

@@ -37,6 +37,6 @@ module OpenstudioServer
   VERSION = '3.0.0'.freeze
   # format should be ^.*\-{1}[a-z]+[0-9]+
   # for example: -rc1, -beta6, -customusecase0
-  VERSION_EXT = '-rc3'.freeze # with preceding - or +
-  OS_SHA = '949b904134'
+  VERSION_EXT = ''.freeze # with preceding - or +
+  OS_SHA = '1c9617fa4e'
 end