3.9.0 rc1

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

@@ -10,9 +10,9 @@ on: [push, pull_request]
 
 env:
   USE_TESTING_TIMEOUTS: "true"
-  OPENSTUDIO_VERSION: 3.8.0
-  OPENSTUDIO_VERSION_SHA: f953b6fcaf
-  OPENSTUDIO_VERSION_EXT: ""
+  OPENSTUDIO_VERSION: 3.9.0
+  OPENSTUDIO_VERSION_SHA: cc1e0bbd6d
+  OPENSTUDIO_VERSION_EXT: "-rc2"
   DOCKER_COMPOSE_VERSION: 1.21.1
   BUNDLE_WITHOUT: native_ext
 
@@ -101,7 +101,7 @@ jobs:
     - name: docker
       shell: bash 
       run: |
-          export OPENSTUDIO_TAG=3.8.0
+          export OPENSTUDIO_TAG=3.9.0
           sed -i -E "s/.git//g" .dockerignore
           docker volume create --name=osdata
           docker images --all
@@ -127,7 +127,7 @@ jobs:
       if: | 
         github.ref == 'refs/heads/master' || 
         github.ref == 'refs/heads/develop'
-      #  github.ref == 'refs/heads/3.6.1-3'
+      #  github.ref == 'refs/heads/3.9.0'
       shell: bash
       run: ./docker/deployment/scripts/deploy_docker_github_actions.sh
       env: 

.github/workflows/security-scan.yml

@@ -10,9 +10,9 @@ on: [push, pull_request]
 
 env:
   USE_TESTING_TIMEOUTS: "true"
-  OPENSTUDIO_VERSION: 3.8.0
-  OPENSTUDIO_VERSION_SHA: f953b6fcaf
-  OPENSTUDIO_VERSION_EXT: ""
+  OPENSTUDIO_VERSION: 3.9.0
+  OPENSTUDIO_VERSION_SHA: cc1e0bbd6d
+  OPENSTUDIO_VERSION_EXT: "-rc2"
   DOCKER_COMPOSE_VERSION: 1.21.1
   BUNDLE_WITHOUT: native_ext
 
@@ -31,7 +31,7 @@ jobs:
     - name: docker
       shell: bash 
       run: |
-          export OPENSTUDIO_TAG=3.8.0
+          export OPENSTUDIO_TAG=3.9.0
           sed -i -E "s/.git//g" .dockerignore
           docker volume create --name=osdata
           docker images --all
@@ -60,7 +60,8 @@ jobs:
         output: 'trivy-results.sarif'
         severity: 'CRITICAL,HIGH'
         timeout: 15m0s
-        allow-failure: true
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     - name: Upload container scan results to GitHub Security tab
       uses: github/codeql-action/upload-sarif@v1
       with:

Dockerfile

@@ -4,8 +4,8 @@
 # NOTES:            Currently this is one big dockerfile and non-optimal.
 
 #may include suffix
-ARG OPENSTUDIO_VERSION=3.8.0
-FROM nrel/openstudio:3.8.0 as base
+ARG OPENSTUDIO_VERSION=3.9.0
+FROM nrel/openstudio:dev-3.9.0-rc1 as base
 MAINTAINER Nicholas Long [email protected]
 
 ENV DEBIAN_FRONTEND=noninteractive
@@ -49,7 +49,6 @@ RUN apt-get update && apt-get install -y wget gnupg lsb-release \
         mongodb-database-tools \
         nodejs \
         procps \
-        python-numpy \
         python3-numpy \
         tar \
         unzip \

appveyor.yml

@@ -4,9 +4,9 @@ image: Visual Studio 2019
 
 environment:
   USE_TESTING_TIMEOUTS: "true"
-  OPENSTUDIO_VERSION: 3.8.0
-  OPENSTUDIO_VERSION_SHA: f953b6fcaf
-  OPENSTUDIO_VERSION_EXT: ""
+  OPENSTUDIO_VERSION: 3.9.0
+  OPENSTUDIO_VERSION_SHA: cc1e0bbd6d
+  OPENSTUDIO_VERSION_EXT: "-rc2"
   OPENSTUDIO_TEST_EXE: C:\projects\openstudio\bin\openstudio.exe
   BUILD_TYPE: "test"
   SKIP_COVERALLS: "true"

server/Gemfile

@@ -7,7 +7,7 @@ ruby '~>3.2.0'
 # gem 'rubygems-update', '2.7.8'
 
 gem 'rails', '~> 6.1.3'
-gem 'webrick', '~> 1.8.2'
+#gem 'webrick', '~> 1.8.2'
 gem 'rake', '~> 13.0'
 
 # added for support of the project rakefile

server/app/lib/openstudio_server/version.rb

@@ -4,9 +4,9 @@
 # *******************************************************************************
 
 module OpenstudioServer
-  VERSION = '3.8.0'.freeze
+  VERSION = '3.9.0'.freeze
   # format should be ^.*\-{1}[a-z]+[0-9]+
   # for example: -rc1, -beta6, -customusecase0
-  VERSION_EXT = '-rc3'.freeze # with preceding - or +
-  OS_SHA = 'd8eac889d0'.freeze
+  VERSION_EXT = '-rc2'.freeze # with preceding - or +
+  OS_SHA = 'cc1e0bbd6d'.freeze
 end

server/spec/features/docker_stack_algo_spec.rb

@@ -70,15 +70,15 @@
   it 'run cli_test with -z arg', :cli_test, js: true do
     # setup expected results
     nsga_nrel = [
-      { electricity_consumption_cvrmse: 21.99399984,
+      { electricity_consumption_cvrmse: 21.99149972,
         electricity_consumption_nmbe: 21.36188374,
         natural_gas_consumption_cvrmse: 82.62358861,
         natural_gas_consumption_nmbe: 56.31532858},
-      { electricity_consumption_cvrmse: 26.32334162,
+      { electricity_consumption_cvrmse: 26.32334524,
         electricity_consumption_nmbe: 25.76504121,
         natural_gas_consumption_cvrmse: 77.98495089,
         natural_gas_consumption_nmbe: 52.28036902},
-      { electricity_consumption_cvrmse: 20.41220945,
+      { electricity_consumption_cvrmse: 20.40957241,
         electricity_consumption_nmbe: 19.59546222,
         natural_gas_consumption_cvrmse: 75.7459088,
         natural_gas_consumption_nmbe: 50.54773457},
@@ -230,7 +230,7 @@
         electricity_consumption_nmbe: -85.31078152,
         natural_gas_consumption_cvrmse: 42.71464426,
         natural_gas_consumption_nmbe: 20.40156665},
-      { electricity_consumption_cvrmse: 20.41220945,
+      { electricity_consumption_cvrmse: 20.4095724,
         electricity_consumption_nmbe: 19.59546222,
         natural_gas_consumption_cvrmse: 75.7459088,
         natural_gas_consumption_nmbe: 50.54773457}
@@ -512,7 +512,7 @@
         electricity_consumption_nmbe: -36.4183773,
         natural_gas_consumption_cvrmse: 50.79722897,
         natural_gas_consumption_nmbe: 27.75592343},
-      { electricity_consumption_cvrmse: 74.01069303,
+      { electricity_consumption_cvrmse: 74.0101483,
         electricity_consumption_nmbe: -76.73841103,
         natural_gas_consumption_cvrmse: 48.06306663,
         natural_gas_consumption_nmbe: -31.81675554}
@@ -650,27 +650,27 @@
   it 'run sobol analysis', :sobol, js: true do
     # setup expected results
     sobol = [
-      { electricity_consumption_cvrmse: 54.76930032,
+      { electricity_consumption_cvrmse: 54.7692945,
         electricity_consumption_nmbe: -56.64433589,
         natural_gas_consumption_cvrmse: 81.93351905,
         natural_gas_consumption_nmbe: -63.94250223},
-      { electricity_consumption_cvrmse: 22.94209592,
+      { electricity_consumption_cvrmse: 22.9420954,
         electricity_consumption_nmbe: 21.67972075,
         natural_gas_consumption_cvrmse: 26.192299,
         natural_gas_consumption_nmbe: -2.685885302},
-      { electricity_consumption_cvrmse: 54.54753494,
+      { electricity_consumption_cvrmse: 54.5475292,
         electricity_consumption_nmbe: -56.41041953,
         natural_gas_consumption_cvrmse: 82.12635415,
         natural_gas_consumption_nmbe: -64.11401884},
-      { electricity_consumption_cvrmse: 17.03726982,
+      { electricity_consumption_cvrmse: 17.0372752,
         electricity_consumption_nmbe: -15.4255319,
         natural_gas_consumption_cvrmse: 44.21297821,
         natural_gas_consumption_nmbe: 22.98843441},
-      { electricity_consumption_cvrmse: 18.81466341,
+      { electricity_consumption_cvrmse: 18.8131164,
         electricity_consumption_nmbe: -17.63846503,
         natural_gas_consumption_cvrmse: 30.78869741,
         natural_gas_consumption_nmbe: -15.6663694},
-      { electricity_consumption_cvrmse: 56.75272836,
+      { electricity_consumption_cvrmse: 56.7527241,
         electricity_consumption_nmbe: -58.74745506,
         natural_gas_consumption_cvrmse: 108.2431218,
         natural_gas_consumption_nmbe:  -85.94476756}
@@ -815,12 +815,12 @@
   it 'run lhs analysis', :lhs, js: true do
     # setup expected results
     lhs = [
-      { electricity_consumption_cvrmse: 25.57415623,
-        electricity_consumption_nmbe: 25.27266717,
+      { electricity_consumption_cvrmse: 25.574157955478583,
+        electricity_consumption_nmbe: 25.27266549354177,
         natural_gas_consumption_cvrmse: 112.9275503,
         natural_gas_consumption_nmbe: 80.53613285},
-      { electricity_consumption_cvrmse: 91.61355274,
-        electricity_consumption_nmbe: -94.87047784,
+      { electricity_consumption_cvrmse: 91.6123639683813,
+        electricity_consumption_nmbe: -94.8704863220731,
         natural_gas_consumption_cvrmse: 42.93786686,
         natural_gas_consumption_nmbe: -23.69726679}
     ]
@@ -1112,15 +1112,15 @@
   it 'run morris analysis', :morris, js: true do
     # setup expected results
     morris = [
-      { electricity_consumption_cvrmse: 89.83993479,
+      { electricity_consumption_cvrmse: 89.83993708,
         electricity_consumption_nmbe: -93.43862965,
         natural_gas_consumption_cvrmse: 83.61530554,
         natural_gas_consumption_nmbe: -63.94874443},
-      { electricity_consumption_cvrmse: 87.52372524,
-        electricity_consumption_nmbe: -90.98340992,
+      { electricity_consumption_cvrmse: 87.523714,
+        electricity_consumption_nmbe: -90.98339866,
         natural_gas_consumption_cvrmse: 42.78515488,
         natural_gas_consumption_nmbe: -25.6420468},
-      { electricity_consumption_cvrmse: 23.52940388,
+      { electricity_consumption_cvrmse: 23.52940396,
         electricity_consumption_nmbe: 22.1736249,
         natural_gas_consumption_cvrmse: 136.7394956,
         natural_gas_consumption_nmbe: -113.1026692}
@@ -1265,7 +1265,7 @@
   it 'run single_run analysis', :single_run, js: true do
     # setup expected results
     single_run = [
-      {  electricity_consumption_cvrmse: 34.85459811,
+      {  electricity_consumption_cvrmse: 34.8546004,
          electricity_consumption_nmbe: -35.59102141,
          natural_gas_consumption_cvrmse: 162.9418784,
          natural_gas_consumption_nmbe: -130.5833959}

server/spec/features/docker_stack_requeue_spec.rb

@@ -99,8 +99,8 @@ def requeue_datapoint(job_args)
             natural_gas_consumption_nmbe: 70.79385513
            },
            {
-            electricity_consumption_cvrmse: 55.38824215,
-            electricity_consumption_nmbe: -57.11056651,
+            electricity_consumption_cvrmse: 55.38893763588019,
+            electricity_consumption_nmbe: -57.11056265094546,
             natural_gas_consumption_cvrmse: 43.52243818,
             natural_gas_consumption_nmbe: 22.80778241
            },
@@ -235,6 +235,7 @@ def requeue_datapoint(job_args)
           tmp << x.transform_values { |y| y.truncate(4) }
         end
         compare = tmp.include?(sim)
+        puts "data_point[:#{data_point[:_id]}] sim is: #{sim}"
         expect(compare).to be true
         puts "data_point[:#{data_point[:_id]}] compare is: #{compare}"