diff --git a/.travis.yml b/.travis.yml index ae90c3d68..ef890e248 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ gemfile: # Set the default scripts that are used for the majority of the tests in the matrix before_install: - - travis_wait ./ci/travis/setup.sh + - ./ci/travis/setup.sh before_script: - sudo Xvfb :99 -ac -screen 0 1024x768x8 & - sleep 3 @@ -22,7 +22,7 @@ after_failure: ./ci/travis/print_logs.sh # Services for linux -- all instances services: - - mongod + - mongodb - redis-server - docker diff --git a/ci/travis/setup.sh b/ci/travis/setup.sh index 79b2d18e8..eccdf3b91 100755 --- a/ci/travis/setup.sh +++ b/ci/travis/setup.sh @@ -14,11 +14,17 @@ if [ "${BUILD_TYPE}" == "docker" ]; then else if [ "${TRAVIS_OS_NAME}" == "osx" ]; then brew update > /Users/travis/build/NREL/OpenStudio-server/spec/files/logs/brew-update.log - # AP: do we need mongo install here ? seems to be handled by service defined in travis yml - brew install mongodb@3.4 pv tree - ln -s /usr/local/opt/mongodb@3.4/bin/* /usr/local/bin + # AP: do we need mongo install here ? seems to be handled by service defined in travis yml. + # NL: Services are not handled in osx + brew install pv tree + # Install mongodb from a download. Brew is hanging and requires building mongo. + curl -SLO https://fastdl.mongodb.org/osx/mongodb-osx-ssl-x86_64-3.4.18.tgz + tar xvzf mongodb-osx-ssl-x86_64-3.4.18.tgz + ln -s ./mongodb-osx-x86_64-3.4.18/bin/* /usr/local/bin + /usr/local/bin/mongod & curl -SLO --insecure https://s3.amazonaws.com/openstudio-builds/$OPENSTUDIO_VERSION/OpenStudio-$OPENSTUDIO_VERSION.$OPENSTUDIO_VERSION_SHA-Darwin.zip unzip OpenStudio-$OPENSTUDIO_VERSION.$OPENSTUDIO_VERSION_SHA-Darwin.zip + # Use the install script that is in this repo now, the one on OpenStudio/develop has changed sed -i -e "s|REPLACEME|$HOME/openstudio|" ci/travis/install-mac.qs rm -rf $HOME/openstudio