Merge pull request #644 from NREL/develop

Update to OS SDK 3.3.0

.github/workflows/openstudio-server-tests.yml

@@ -11,8 +11,8 @@ on: [push, pull_request]
 env:
   USE_TESTING_TIMEOUTS: "true"
   OPENSTUDIO_VERSION: 3.3.0 
-  OPENSTUDIO_VERSION_SHA: 45b36b8d4c
-  OPENSTUDIO_VERSION_EXT: "-rc2"
+  OPENSTUDIO_VERSION_SHA: ad235ff36e
+  OPENSTUDIO_VERSION_EXT: ""
   DOCKER_COMPOSE_VERSION: 1.21.1
   BUNDLE_WITHOUT: native_ext
 
@@ -96,7 +96,7 @@ jobs:
     - name: docker
       shell: bash 
       run: |
-          export OPENSTUDIO_TAG=3.3.0-rc2
+          export OPENSTUDIO_TAG=3.3.0
           sed -i -E "s/.git//g" .dockerignore
           docker volume create --name=osdata
           docker images --all
@@ -106,7 +106,8 @@ jobs:
           docker-compose -f docker-compose.test.yml build --build-arg OPENSTUDIO_VERSION=$OPENSTUDIO_TAG
           docker-compose -f docker-compose.test.yml up -d
           # set SKIP_URBANOPT_ALGO=true to skip UrbanOpt algo tests
-          docker-compose exec -e SKIP_URBANOPT_ALGO=false -T web /usr/local/bin/run-server-tests
+          # set SKIP_URBANOPT_ALGO=true to skip UrbanOpt algo tests
+          docker-compose exec -e SKIP_URBANOPT_ALGO=true -T web /usr/local/bin/run-server-tests
           docker-compose stop
           git checkout -- .dockerignore && git checkout -- Dockerfile
       env: 

Dockerfile

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

appveyor.yml

@@ -5,8 +5,8 @@ image: Visual Studio 2019
 environment:
   USE_TESTING_TIMEOUTS: "true"
   OPENSTUDIO_VERSION: 3.3.0
-  OPENSTUDIO_VERSION_SHA: 45b36b8d4c
-  OPENSTUDIO_VERSION_EXT: "-rc2"
+  OPENSTUDIO_VERSION_SHA: ad235ff36e
+  OPENSTUDIO_VERSION_EXT: ""
   OPENSTUDIO_TEST_EXE: C:\projects\openstudio\bin\openstudio.exe
   BUILD_TYPE: "test"
   SKIP_COVERALLS: "true"

ci/appveyor/setup.cmd

@@ -7,7 +7,7 @@ REM install develop build
 set OS_INSTALL_NAME=OpenStudio-%OPENSTUDIO_VERSION%%OPENSTUDIO_VERSION_EXT%%%2B%OPENSTUDIO_VERSION_SHA%-Windows.exe
 echo Install name is %OS_INSTALL_NAME%
 REM curl -SLO --insecure https://openstudio-builds.s3.amazonaws.com/%OPENSTUDIO_VERSION%/%OS_INSTALL_NAME%
-curl -SLO --insecure https://openstudio-ci-builds.s3-us-west-2.amazonaws.com/3.3.0-rc2/%OS_INSTALL_NAME%
+curl -SLO --insecure  https://openstudio-builds.s3.amazonaws.com/3.3.0/%OS_INSTALL_NAME%
 dir .
 REM Install OpenStudio
 %OS_INSTALL_NAME% --script ci/appveyor/install-windows.qs

ci/github-actions/install_openstudio.sh

@@ -10,13 +10,13 @@ if [ ! -z ${OPENSTUDIO_VERSION} ] && [ ! -z ${OPENSTUDIO_SHA} ]; then
     # OPENSTUDIO_VERSION_EXT may be empty
     OPENSTUDIO_DOWNLOAD_FILENAME=OpenStudio-${OPENSTUDIO_VERSION}${OPENSTUDIO_VERSION_EXT}%2B${OPENSTUDIO_SHA}-Ubuntu-18.04.deb
     echo "Installing OpenStudio ${OPENSTUDIO_DOWNLOAD_FILENAME}"
-    OPENSTUDIO_DOWNLOAD_BASE_URL=https://openstudio-ci-builds.s3-us-west-2.amazonaws.com/3.3.0-rc2
+    OPENSTUDIO_DOWNLOAD_BASE_URL=https://openstudio-builds.s3.amazonaws.com/3.3.0/
     OPENSTUDIO_DOWNLOAD_URL=$OPENSTUDIO_DOWNLOAD_BASE_URL/$OPENSTUDIO_DOWNLOAD_FILENAME
 
     # copying this from the docker-openstudio dockerfile
     apt-get update && apt-get install -y curl vim gdebi-core libgmp-dev libffi-dev build-essential zlib1g-dev vim git locales sudo
     #export OPENSTUDIO_DOWNLOAD_URL=https://openstudio-builds.s3.amazonaws.com/${OPENSTUDIO_VERSION}/$OPENSTUDIO_DOWNLOAD_FILENAME
-    export OPENSTUDIO_DOWNLOAD_URL=https://openstudio-ci-builds.s3-us-west-2.amazonaws.com/3.3.0-rc2/$OPENSTUDIO_DOWNLOAD_FILENAME
+    export OPENSTUDIO_DOWNLOAD_URL=https://openstudio-builds.s3.amazonaws.com/3.3.0/$OPENSTUDIO_DOWNLOAD_FILENAME
 
     echo "OpenStudio Package Download URL is ${OPENSTUDIO_DOWNLOAD_URL}"
     curl -SLO $OPENSTUDIO_DOWNLOAD_URL

ci/github-actions/setup.sh

@@ -37,7 +37,7 @@ else
         export OS_NAME=OpenStudio-${OPENSTUDIO_VERSION}${OPENSTUDIO_VERSION_EXT}%2B${OPENSTUDIO_VERSION_SHA}-Darwin
         export OS_NAME_WITH_PLUS=OpenStudio-${OPENSTUDIO_VERSION}${OPENSTUDIO_VERSION_EXT}+${OPENSTUDIO_VERSION_SHA}-Darwin
         #curl -SL --insecure https://openstudio-builds.s3.amazonaws.com/${OPENSTUDIO_VERSION}/${OS_NAME}.tar.gz -o $OS_NAME_WITH_PLUS.tar.gz
-        curl -SL --insecure  https://openstudio-ci-builds.s3-us-west-2.amazonaws.com/3.3.0-rc2/${OS_NAME}.tar.gz -o $OS_NAME_WITH_PLUS.tar.gz
+        curl -SL --insecure https://openstudio-builds.s3.amazonaws.com/3.3.0/${OS_NAME}.tar.gz -o $OS_NAME_WITH_PLUS.tar.gz
         # OSX downloads with %2B but installs with + sign. These are the encoded chars in url strings.
         #hdiutil attach ${OS_NAME}.dmg
         #sed -i -e "s|REPLACEME|$HOME/openstudio|" ci/github-actions/install-mac.qs

server/Gemfile

@@ -66,12 +66,13 @@ gem 'sassc', '~> 2.4.0'
 # For workers - and other dependencies for measures
 ## Commonly update gems for testing and development
 
-gem 'openstudio-workflow', '= 2.2.0'
+gem 'openstudio-workflow', '= 2.3.1'
 #gem 'openstudio-analysis', :github => 'NREL/OpenStudio-analysis-gem', :ref => '270'
 gem 'openstudio-analysis', '= 1.2.0'
 
-gem 'urbanopt-cli', '= 0.6.0'
-gem 'urbanopt-reopt', '= 0.6.0'
+# Remove urbanopt cli gems for minor for releases as they use different versions of ext gems
+#gem 'urbanopt-cli', '= 0.6.0'
+#gem 'urbanopt-reopt', '= 0.6.0'
 
 ## End commonly updated gems
 

server/app/controllers/pages_controller.rb

@@ -101,7 +101,7 @@ def dashboard
     unless @current.nil?
       # aggregate results of current analysis
       aggregated_results = DataPoint.collection.aggregate(
-        [{ '$match' => { 'analysis_id' => @current.id } }, { '$group' => { '_id' => { 'analysis_id' => '$analysis_id', 'status' => '$status' }, count: { '$sum' => 1 } } }]
+        [{ '$match' => { 'analysis_id' => @current.id } }, { '$group' => { '_id' => { 'analysis_id' => '$analysis_id', 'status' => '$status' }, count: { '$sum' => 1 } } }], :allow_disk_use => true
       )
     end
     # for js

server/app/lib/openstudio_server/version.rb

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