Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to Openstudio 3.2.0-rc1 #624

Merged
merged 42 commits into from
Apr 27, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
89c7ef9
update o test openstudio v3.1.1-alpha
tijcolem Mar 17, 2021
7e28915
Update linux name to Ubuntu
tijcolem Mar 17, 2021
06ad2bc
Update openstudio version and bundle version in Dockerfile
tijcolem Mar 17, 2021
f9bcf0c
update to ruby 2.7.2
tijcolem Mar 17, 2021
c2277e8
Update root Gemfile to use ruby ~2.7.0
tijcolem Mar 18, 2021
e27fed1
udpate bundler from 2.1.0 to 2.1.4
tijcolem Mar 18, 2021
3f8badd
Try use bundler when submitting jobs to server in order to use custom…
tijcolem Mar 18, 2021
cf5bbdf
update ruby path for appveyor
tijcolem Mar 18, 2021
139dedb
Update ruby download for appveyor
tijcolem Mar 19, 2021
1ee3709
debugging appveyor
tijcolem Mar 19, 2021
a940549
update Appveyor image to 2019 server and use built-in ruby27-x64
tijcolem Mar 19, 2021
9307915
forgot ruby path in integration script
tijcolem Mar 19, 2021
14a708e
set the build_type to test for windows
tijcolem Mar 19, 2021
9515ca5
more loggin info on windows
tijcolem Mar 22, 2021
bfb4b36
use default shell's env when calling openstudio_version
tijcolem Mar 22, 2021
140d877
Update nginx for new passenger gem location for ruby update
tijcolem Mar 22, 2021
da150d3
seperate the urbanopt algo tests
tijcolem Mar 22, 2021
9a1d816
remove duplicate in nginx.conf
tijcolem Mar 23, 2021
827eaab
update apt install libs and change rspec commands
tijcolem Mar 23, 2021
b59f394
move the urbanopt algo to it's own spec file
tijcolem Mar 24, 2021
0622498
update all gems and fix failing unit tests. still need to version rai…
tijcolem Mar 25, 2021
5c5abd6
add in a default manifest as that is now needed
tijcolem Mar 25, 2021
403257e
version rails and mongo and install dep for mac
tijcolem Mar 25, 2021
1f6f182
addin the rails secrets for docker env
tijcolem Mar 25, 2021
3acd121
let's try latest rails v5.2.x series as 6.x series has a depedency on…
tijcolem Mar 26, 2021
f72673a
rails just release new version which is supposed to remove the mime d…
tijcolem Mar 26, 2021
fd3750d
try a forked version of paperclip that doesnt use mimemagic
tijcolem Mar 26, 2021
1a5341c
try forked gem of mongoid-paperclip
tijcolem Mar 29, 2021
43dfcd4
try another fork
tijcolem Mar 29, 2021
1379e19
try removing libxml-ruby as it's problematic with ruby 2.7.x on windows
tijcolem Mar 30, 2021
e8837bf
set BUILD_TYPE to test on windows. do not run the algo tests. only un…
tijcolem Mar 30, 2021
4c203e6
concat exclude pattern into comma delimted pattern
tijcolem Mar 30, 2021
30722e0
skip coveralls on windows as new version of simplcov throws error
tijcolem Mar 30, 2021
7107f47
disable appveyor debugger
tijcolem Mar 31, 2021
14fa6d0
update openstudio to 3.2.0-alpha and update analyis gem
tijcolem Apr 6, 2021
518fa90
update correct sha and enable logs for failure
tijcolem Apr 6, 2021
c3c859f
Using ruby gem pessimistic locking to all patched versions for all se…
tijcolem Apr 15, 2021
93e3ee5
update OpenStudio SDK to 3.2.0-rc1
tijcolem Apr 26, 2021
1cec2c1
Merge branch 'develop' into update_openstudio_3_2_0-rc1
tijcolem Apr 26, 2021
0c1b19f
update version tag in compose setup
tijcolem Apr 26, 2021
d212aa0
add conditional for running urbanopt tests
tijcolem Apr 26, 2021
4cad76a
pin docker tag to 3.2.0-rc1 vs develop
tijcolem Apr 26, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ REDIS_PASSWORD=openstudio
REDIS_URL=redis://:openstudio@queue:6379
MONGO_USER=openstudio
MONGO_PASSWORD=openstudio
SECRET_KEY_BASE=c4ab6d293e4bf52ee92e8dda6e16dc9b5448d0c5f7908ee40c66736d515f3c29142d905b283d73e5e9cef6b13cd8e38be6fd3b5e25d00f35b259923a86c7c473
14 changes: 8 additions & 6 deletions .github/workflows/openstudio-server-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ on: [push, pull_request]

env:
USE_TESTING_TIMEOUTS: "true"
OPENSTUDIO_VERSION: 3.1.0
OPENSTUDIO_VERSION_SHA: e165090621
OPENSTUDIO_VERSION_EXT: ""
OPENSTUDIO_VERSION: 3.2.0
OPENSTUDIO_VERSION_SHA: 2249bb4700
OPENSTUDIO_VERSION_EXT: "-rc1"
DOCKER_COMPOSE_VERSION: 1.21.1
BUNDLE_WITHOUT: native_ext

Expand All @@ -37,7 +37,7 @@ jobs:
env:
BUILD_TYPE: integration
- name: logs
if: ${{ failure() }}
if: ${{ failure() }}
shell: bash
run: ./ci/github-actions/print_logs.sh
- name: build gem package
Expand Down Expand Up @@ -68,6 +68,7 @@ jobs:
run: ./ci/github-actions/test.sh
env:
BUILD_TYPE: integration
SKIP_URBANOPT_ALGO: True # Set this when excluding urbanopt-cli gem from server.
- name: logs
if: ${{ failure() }}
shell: bash
Expand Down Expand Up @@ -95,7 +96,7 @@ jobs:
- name: docker
shell: bash
run: |
export OPENSTUDIO_TAG=3.1.0
export OPENSTUDIO_TAG=3.2.0-rc1
sed -i -E "s/.git//g" .dockerignore
docker volume create --name=osdata
docker images --all
Expand All @@ -104,7 +105,8 @@ jobs:
docker-compose -f docker-compose.test.yml pull
docker-compose -f docker-compose.test.yml build --build-arg OPENSTUDIO_VERSION=$OPENSTUDIO_TAG
docker-compose -f docker-compose.test.yml up -d
docker-compose exec -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:
Expand Down
7 changes: 4 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# NOTES: Currently this is one big dockerfile and non-optimal.

#may include suffix
ARG OPENSTUDIO_VERSION=3.1.0
ARG OPENSTUDIO_VERSION=3.2.0-rc1
FROM nrel/openstudio:$OPENSTUDIO_VERSION as base
MAINTAINER Nicholas Long nicholas.long@nrel.gov

Expand All @@ -20,6 +20,7 @@ RUN apt-get update && apt-get install -y wget gnupg \
apt-transport-https \
autoconf \
bison \
shared-mime-info \
build-essential \
bzip2 \
ca-certificates \
Expand Down Expand Up @@ -75,7 +76,7 @@ ENV PERL_EXE_PATH /usr/bin
# Specify a couple arguments here, after running the majority of the installation above
ARG rails_env=docker
ARG bundle_args="--without development test"
ENV OS_BUNDLER_VERSION=2.1.0
ENV OS_BUNDLER_VERSION=2.1.4

# Set the rails env var
ENV RAILS_ENV $rails_env
Expand Down Expand Up @@ -159,4 +160,4 @@ RUN chmod +x /usr/local/bin/run-server-tests

# Test adding the git repo to the container for coveralls
# The #TEST# will be removed in the travis test script to be run in the test container
#TEST#COPY .git /opt/openstudio/.git
#TEST#COPY .git /opt/openstudio/.git
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
source 'http://rubygems.org'
ruby '~>2.5.1'
ruby '~>2.7.0'

gem 'colored'
gem 'git', '~> 1.2.6'
Expand Down
15 changes: 9 additions & 6 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
version: 1.0.{build}-{branch}

image: Visual Studio 2019

environment:
USE_TESTING_TIMEOUTS: "true"
OPENSTUDIO_VERSION: 3.1.0
OPENSTUDIO_VERSION_SHA: e165090621
OPENSTUDIO_VERSION_EXT: ""
OPENSTUDIO_VERSION: 3.2.0
OPENSTUDIO_VERSION_SHA: 2249bb4700
OPENSTUDIO_VERSION_EXT: "-rc1"
OPENSTUDIO_TEST_EXE: C:\projects\openstudio\bin\openstudio.exe
BUILD_TYPE: "test"
BUILD_TYPE: "test"
SKIP_COVERALLS: "true"

artifacts:
- path: 'export/*.tar.gz' #relative to root of repo
Expand All @@ -19,7 +22,7 @@ clone_folder: C:\projects\openstudio-server

install:
# set PATH pre-installed ruby version
- set PATH=C:\Ruby25-x64\bin;C:\Mongodb\bin;%PATH%
- set PATH=C:\Ruby27-x64\bin;C:\Mongodb\bin;%PATH%
- C:\projects\openstudio-server\ci\appveyor\setup.cmd

build: off
Expand All @@ -36,6 +39,6 @@ test_script:
- cmd: C:\projects\openstudio-server\ci\appveyor\build_package.cmd #artifact upload occurs before on_finish
on_finish:
- cmd: C:\projects\openstudio-server\ci\appveyor\print_logs.cmd
# - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
# - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
on_failure:
- cmd: C:\projects\openstudio-server\ci\appveyor\print_logs.cmd
2 changes: 1 addition & 1 deletion bin/openstudio_meta
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ class InstallGems
rake_bin = File.absolute_path('./../gems/bin/rake/')
sys_cmds = []

sys_cmds << "#{$ruby_path} #{RbConfig::CONFIG['prefix']}/bin/gem install --no-env-shebang bundler -v 2.1.0"
sys_cmds << "#{$ruby_path} #{RbConfig::CONFIG['prefix']}/bin/gem install --no-env-shebang bundler -v 2.1.4"
if /darwin/.match(RUBY_PLATFORM)
sys_cmds << "#{$ruby_path} #{bundler_bin} config build.nokogiri --use-system-libraries --with-xml2-lib=/usr/lib --with-xml2-config=/usr/bin/xml2-config"
sys_cmds << "#{$ruby_path} #{bundler_bin} config build.libxml-ruby --use-system-libraries --with-xml2-config=/usr/bin/xml2-config"
Expand Down
2 changes: 1 addition & 1 deletion bin/resources/local/rspec_command
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ rspec_path = File.absolute_path(File.join(__FILE__, './../../../../gems/bin/rspe
if ENV['BUILD_TYPE'] == 'test'
sys_call = " \"#{ruby_exe}\" \"#{bundle_path}\" exec \"#{ruby_exe}\" \"#{rspec_path}\" --tag ~depends_r --tag ~depends_gecko --tag ~depends_resque --exclude-pattern "\
"\"**/models/cluster_spec.rb,**/features/*_algo_spec.rb\""
elsif ENV['SKIP_URBANOPT_ALGO'] == 'True'
elsif ENV['SKIP_URBANOPT_ALGO'] == 'true'
sys_call = " \"#{ruby_exe}\" \"#{bundle_path}\" exec \"#{ruby_exe}\" \"#{rspec_path}\" --tag ~depends_r --tag ~depends_gecko --tag ~depends_resque --exclude-pattern "\
"\"**/models/cluster_spec.rb,**/features/openstudio_urbanopt_algo_spec.rb\" "
else
Expand Down
3 changes: 2 additions & 1 deletion ci/appveyor/build_package.cmd
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
set PATH=C:\projects\ruby\bin;C:\Program Files\Git\mingw64\bin;C:\projects\openstudio\bin;%PATH%
REM set PATH=C:\projects\ruby\bin;C:\Program Files\Git\mingw64\bin;C:\projects\openstudio\bin;%PATH%
set PATH=C:\Ruby27-x64\bin;C:\Program Files\Git\mingw64\bin;C:\projects\openstudio\bin;%PATH%
set GEM_HOME=C:\projects\openstudio-server\gems
set GEM_PATH=C:\projects\openstudio-server\gems;C:\projects\openstudio-server\gems\gems\bundler\gems
set RUBYLIB=C:\projects\openstudio\Ruby
Expand Down
3 changes: 2 additions & 1 deletion ci/appveyor/integration-test.ps1
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
$env:Path = "C:\Ruby25-x64\bin;C:\Mongodb\bin;$env:Path"
$env:Path = "C:\Ruby27-x64\bin;C:\Mongodb\bin;$env:Path"
$env:RUBYLIB = "C:\projects\openstudio\Ruby"
$env:OPENSTUDIO_TEST_EXE = "C:\projects\openstudio\bin\openstudio.exe"
$env:GEM_HOME = "C:\projects\openstudio-server\gems"
$env:GEM_PATH = "C:\projects\openstudio-server\gems;C:\projects\openstudio-server\gems\gems\bundler\gems"
# Integration tests that run algo can only run on docker deployments. Setting BUILD_TYPE=test below skip algo tests. Only linux docker runs these tests

Write-Host "RUBYLIB is: $env:RUBYLIB ; the PATH is: $env:Path ; the OPENSTUDIO_TEST_EXE is: $env:OPENSTUDIO_TEST_EXE"
$iteration = 0
Expand Down
16 changes: 9 additions & 7 deletions ci/appveyor/setup.cmd
Original file line number Diff line number Diff line change
@@ -1,23 +1,25 @@
set PATH=C:\projects\ruby\bin;C:\Program Files\Git\mingw64\bin;C:\projects\openstudio\bin;%PATH%
REM set PATH=C:\projects\ruby\bin;C:\Program Files\Git\mingw64\bin;C:\projects\openstudio\bin;%PATH%
set PATH=C:\Ruby27-x64\bin;C:\Program Files\Git\mingw64\bin;C:\projects\openstudio\bin;%PATH%
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
set OS_INSTALL_NAME=OpenStudio-%OPENSTUDIO_VERSION%%OPENSTUDIO_VERSION_EXT%%%2B%OPENSTUDIO_VERSION_SHA%-Windows.exe
echo Install name is %OS_INSTALL_NAME%
curl -SLO --insecure https://openstudio-builds.s3.amazonaws.com/%OPENSTUDIO_VERSION%/%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_2_0_rc/%OS_INSTALL_NAME%
dir .
REM Install OpenStudio
%OS_INSTALL_NAME% --script ci/appveyor/install-windows.qs
move C:\openstudio C:\projects\openstudio
dir C:\projects\openstudio
dir C:\projects\openstudio\Ruby
REM dir C:\projects\openstudio\Ruby
rm %OS_INSTALL_NAME%
REM install portable ruby
curl -SLO https://openstudio-resources.s3.amazonaws.com/pat-dependencies3/ruby-2.5.5-win32.tar.gz
tar -xvzf ruby-2.5.5-win32.tar.gz -C C:\projects
rm ruby-2.5.5-win32.tar.gz
cd c:\projects\openstudio-server
REM curl -SLO https://openstudio-resources.s3.amazonaws.com/pat-dependencies3/ruby-2.7.2-msvc-win32.tar.gz
REM tar -xvzf ruby-2.7.2-msvc-win32.tar.gz -C C:\projects
REM rm ruby-2.7.2-msvc-win32.tar.gz
REM cd c:\projects\openstudio-server
ruby -v
openstudio openstudio_version

Expand Down
2 changes: 1 addition & 1 deletion ci/appveyor/unit-test.cmd
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
set RUBYLIB=C:\projects\openstudio\Ruby
set PATH=C:\Ruby25-64x\bin;C:\Mongodb\bin;%PATH%
set PATH=C:\Ruby27-x64\bin;C:\Mongodb\bin;%PATH%
cd c:\projects\openstudio-server
echo Running unit tests against local server
mkdir C:\projects\openstudio-server\spec\unit-test\
Expand Down
7 changes: 4 additions & 3 deletions ci/github-actions/install_openstudio.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,15 @@ OPENSTUDIO_VERSION_EXT=$3

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}-Linux.deb
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-builds.s3.amazonaws.com/3${OPENSTUDIO_VERSION}/
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 ruby2.5 ruby-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
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_2_0_rc/$OPENSTUDIO_DOWNLOAD_FILENAME

echo "OpenStudio Package Download URL is ${OPENSTUDIO_DOWNLOAD_URL}"
curl -SLO $OPENSTUDIO_DOWNLOAD_URL
Expand Down
27 changes: 14 additions & 13 deletions ci/github-actions/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,26 +17,27 @@ else
if [ "${ImageOS}" == "macos1015" ]; then

brew update > $GITHUB_WORKSPACE/spec/files/logs/brew-update.log
brew install pv tree coreutils
brew install pv tree coreutils shared-mime-info

# install portable ruby - required for build that will eventually be published
# see https://github.com/NREL/OpenStudio-PAT/wiki/Pat-Build-Notes
curl -SLO --insecure https://openstudio-resources.s3.amazonaws.com/pat-dependencies3/ruby-2.5.5-darwin.tar.gz
tar xzf ruby-2.5.5-darwin.tar.gz
curl -SLO --insecure https://openstudio-resources.s3.amazonaws.com/pat-dependencies3/ruby-2.7.2-darwin.tar.gz
tar xzf ruby-2.7.2-darwin.tar.gz
sudo mv ruby /usr/local/
otool -L /usr/local/ruby/bin/ruby
rm ruby-2.5.5-darwin.tar.gz
rm ruby-2.7.2-darwin.tar.gz

# Install mongodb from a download. Brew is hanging and requires building mongo. This also speeds up the builds.
curl -SLO https://fastdl.mongodb.org/osx/mongodb-macos-x86_64-4.4.2.tgz
tar xvzf mongodb-macos-x86_64-4.4.2.tgz
sudo cp mongodb-macos-x86_64-4.4.2/bin/* /usr/local/bin/
rm -r mongodb-macos*

# Install openstudio -- Use the install script that is in this repo now, the one on OpenStudio/develop has changed
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-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_2_0_rc/${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
Expand Down Expand Up @@ -66,10 +67,10 @@ else
echo "deb http://repo.mongodb.org/apt/ubuntu xenial/mongodb-org/4.4 multiverse | tee /etc/apt/sources.list.d/mongodb-org-4.4.list"
sudo apt-get update
sudo apt-get install -y pv tree mongodb libqdbm14 libxml2-dev
# explicitly install. the latest version of redis-server
# explicitly install. the latest version of redis-server
wget https://download.redis.io/releases/redis-6.0.9.tar.gz
tar xzf redis-6.0.9.tar.gz && cd redis-6.0.9
make && sudo make install
make && sudo make install
sudo cp utils/systemd-redis_server.service /etc/systemd/system/redis.service
cd $GITHUB_WORKSPACE
rm redis-6.0.9.tar.gz
Expand All @@ -83,13 +84,13 @@ else

# install portable ruby - required for build that will eventually be published
# see https://github.com/NREL/OpenStudio-PAT/wiki/Pat-Build-Notes
curl -SLO --insecure https://openstudio-resources.s3.amazonaws.com/pat-dependencies3/ruby-2.5.5-linux.tar.gz
tar xvzf ruby-2.5.5-linux.tar.gz
curl -SLO --insecure https://openstudio-resources.s3.amazonaws.com/pat-dependencies3/ruby-2.7.2-linux.tar.gz
tar xvzf ruby-2.7.2-linux.tar.gz
ls -l /usr/local/
sudo rm -rf /usr/local/ruby
sudo mv ruby /usr/local/
ldd /usr/local/ruby/bin/ruby
rm ruby-2.5.5-linux.tar.gz
rm ruby-2.7.2-linux.tar.gz

mkdir -p reports/rspec
sudo ./ci/github-actions/install_openstudio.sh $OPENSTUDIO_VERSION $OPENSTUDIO_VERSION_SHA $OPENSTUDIO_VERSION_EXT
Expand All @@ -107,7 +108,7 @@ else
ruby -v
# test openssl
ruby ${GITHUB_WORKSPACE}/ci/github-actions/verify_openstudio.rb

ruby "${GITHUB_WORKSPACE}/bin/openstudio_meta" install_gems --with_test_develop --debug --verbose --use_cached_gems
bundle -v
# create dir for output files which will be generated in case of failure
Expand Down
4 changes: 4 additions & 0 deletions docker-compose.deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ services:
- REDIS_URL=${REDIS_URL}
- MONGO_USER=${MONGO_USER}
- MONGO_PASSWORD=${MONGO_PASSWORD}
- SECRET_KEY_BASE=${SECRET_KEY_BASE}
volumes:
- osdata:/mnt/openstudio
depends_on:
Expand All @@ -51,6 +52,7 @@ services:
- REDIS_URL=${REDIS_URL}
- MONGO_USER=${MONGO_USER}
- MONGO_PASSWORD=${MONGO_PASSWORD}
- SECRET_KEY_BASE=${SECRET_KEY_BASE}
volumes:
- osdata:/mnt/openstudio
depends_on:
Expand All @@ -74,6 +76,7 @@ services:
- REDIS_URL=${REDIS_URL}
- MONGO_USER=${MONGO_USER}
- MONGO_PASSWORD=${MONGO_PASSWORD}
- SECRET_KEY_BASE=${SECRET_KEY_BASE}
volumes:
- /mnt/openstudio
depends_on:
Expand Down Expand Up @@ -107,6 +110,7 @@ services:
- REDIS_URL=${REDIS_URL}
- MONGO_USER=${MONGO_USER}
- MONGO_PASSWORD=${MONGO_PASSWORD}
- SECRET_KEY_BASE=${SECRET_KEY_BASE}
volumes:
osdata:
external: true
Expand Down
4 changes: 4 additions & 0 deletions docker-compose.local.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ services:
- REDIS_URL=${REDIS_URL}
- MONGO_USER=${MONGO_USER}
- MONGO_PASSWORD=${MONGO_PASSWORD}
- SECRET_KEY_BASE=${SECRET_KEY_BASE}
depends_on:
- db
- queue
Expand All @@ -50,6 +51,7 @@ services:
- REDIS_URL=${REDIS_URL}
- MONGO_USER=${MONGO_USER}
- MONGO_PASSWORD=${MONGO_PASSWORD}
- SECRET_KEY_BASE=${SECRET_KEY_BASE}
depends_on:
- db
- queue
Expand All @@ -71,6 +73,7 @@ services:
- REDIS_URL=${REDIS_URL}
- MONGO_USER=${MONGO_USER}
- MONGO_PASSWORD=${MONGO_PASSWORD}
- SECRET_KEY_BASE=${SECRET_KEY_BASE}
depends_on:
- web
- db
Expand All @@ -85,6 +88,7 @@ services:
- REDIS_URL=${REDIS_URL}
- MONGO_USER=${MONGO_USER}
- MONGO_PASSWORD=${MONGO_PASSWORD}
- SECRET_KEY_BASE=${SECRET_KEY_BASE}
volumes:
- osdata:/mnt/openstudio
depends_on:
Expand Down
4 changes: 4 additions & 0 deletions docker-compose.test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ services:
- REDIS_URL=${REDIS_URL}
- MONGO_USER=${MONGO_USER}
- MONGO_PASSWORD=${MONGO_PASSWORD}
- SECRET_KEY_BASE=${SECRET_KEY_BASE}
- SKIP_COVERALLS=true
depends_on:
- db
Expand All @@ -60,6 +61,7 @@ services:
- REDIS_URL=${REDIS_URL}
- MONGO_USER=${MONGO_USER}
- MONGO_PASSWORD=${MONGO_PASSWORD}
- SECRET_KEY_BASE=${SECRET_KEY_BASE}
depends_on:
- db
- queue
Expand All @@ -81,6 +83,7 @@ services:
- REDIS_URL=${REDIS_URL}
- MONGO_USER=${MONGO_USER}
- MONGO_PASSWORD=${MONGO_PASSWORD}
- SECRET_KEY_BASE=${SECRET_KEY_BASE}
depends_on:
- web
- db
Expand All @@ -95,6 +98,7 @@ services:
- REDIS_URL=${REDIS_URL}
- MONGO_USER=${MONGO_USER}
- MONGO_PASSWORD=${MONGO_PASSWORD}
- SECRET_KEY_BASE=${SECRET_KEY_BASE}
volumes:
- osdata:/mnt/openstudio
depends_on:
Expand Down
Loading