Merge pull request #578 from NREL/develop

Updating to OpenStudio v3.0.1
NREL · Jun 26, 2020 · 2a8d8e0 · 2a8d8e0
2 parents 5dfe457 + 67b6e1c
commit 2a8d8e0
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,7 +6,7 @@ language: minimal
 env:
   global:
     - USE_TESTING_TIMEOUTS: "true"
-    - OPENSTUDIO_VERSION=3.0.1 OPENSTUDIO_VERSION_SHA=a30f69b118 OPENSTUDIO_VERSION_EXT="-rc2"
+    - OPENSTUDIO_VERSION=3.0.1 OPENSTUDIO_VERSION_SHA=09b7c8a554 OPENSTUDIO_VERSION_EXT=""
     - DOCKER_COMPOSE_VERSION=1.21.1
     - BUNDLE_WITHOUT=native_ext
 

diff --git a/appveyor.yml b/appveyor.yml
@@ -3,8 +3,8 @@ version: 1.0.{build}-{branch}
 environment:
   USE_TESTING_TIMEOUTS: "true"
   OPENSTUDIO_VERSION: 3.0.1
-  OPENSTUDIO_VERSION_SHA: a30f69b118
-  OPENSTUDIO_VERSION_EXT: "-rc2"
+  OPENSTUDIO_VERSION_SHA: 09b7c8a554
+  OPENSTUDIO_VERSION_EXT: ""
   OPENSTUDIO_TEST_EXE: C:\projects\openstudio\bin\openstudio.exe
   RUBY_VERSION: 25-x64
   BUNDLER_VERSION: 2.1.0

diff --git a/docker/deployment/openstudio_server_docker_base.json b/docker/deployment/openstudio_server_docker_base.json
@@ -1,7 +1,9 @@
 {
   "variables": {
     "aws_access_key": "{{ env `AWS_ACCESS_KEY` }}",
-    "aws_secret_key": "{{ env `AWS_SECRET_KEY` }}"
+    "aws_secret_key": "{{ env `AWS_SECRET_KEY` }}",
+    "aws_vpc_id": "{{env `AWS_VPC_ID`}}",
+    "aws_subnet_id": "{{env `AWS_SUBNET_ID`}}"
   },
   "builders": [
     {
@@ -10,6 +12,8 @@
       "ami_virtualization_type": "hvm",
       "access_key": "{{ user `aws_access_key` }}",
       "secret_key": "{{ user `aws_secret_key` }}",
+      "vpc_id": "{{user `aws_vpc_id`}}",
+      "subnet_id": "{{user `aws_subnet_id`}}",
       "region": "us-east-1",
       "ami_name": "OpenStudio-Server-Docker-{{ user `version` }}{{ user `ami_version_extension` }}",
       "ami_description": "This AMI serves as the base image used for deploying the OpenStudio Server on AWS using Docker. The base OpenStudio Server image from DockerHub on this AMI is {{ user `version` }}.",

diff --git a/server/app/lib/openstudio_server/version.rb b/server/app/lib/openstudio_server/version.rb
@@ -37,6 +37,6 @@ module OpenstudioServer
   VERSION = '3.0.1'.freeze
   # format should be ^.*\-{1}[a-z]+[0-9]+
   # for example: -rc1, -beta6, -customusecase0
-  VERSION_EXT = '-rc2'.freeze # with preceding - or +
-  OS_SHA = 'a30f69b118'
+  VERSION_EXT = ''.freeze # with preceding - or +
+  OS_SHA = '09b7c8a554'
 end