Updated .travis.yml from master

.travis.yml

@@ -12,39 +12,34 @@ branches:
     - /^maint_.*$/
     - release
 
-cache: pip
+cache:
+  pip: true
+  directories:
+    - .git/lfs
 
 notifications:
   email: false
 
 git:
   depth: 10
+  lfs_skip_smudge: true
 
 services:
   - docker
   - xvfb
 
-
-addons:
-  apt:
-    sources:
-    - sourceline: "deb https://build.openmodelica.org/omc/builds/linux/releases/1.16.1/ bionic release"
-      key_url: "http://build.openmodelica.org/apt/openmodelica.asc"
-    packages:
-    - omc=1.16.1-1
-    - omlib-modelica-3.2.2 #3.2.3 is not in https://build.openmodelica.org/omc/builds/linux/releases/1.16.1/dists/bionic/release/binary-amd64/Packages.gz
-
-
 env:
   global:
+    - BUILDINGSPY_VERSION=BuildingsPy@208c37e
+    - OPTIMICA_VERSION=travis-ubuntu-1804-optimica:r26446
     - ENERGYPLUS_VERSION=EnergyPlus-9.5.0-de239b2e5f-Linux-Ubuntu18.04-x86_64
     - MODELICA_JSON_VERSION=6d950c3592fa021aa914ba4ff34a67cbb69962c6
     - MODELICA_JSON_HOME=${TRAVIS_BUILD_DIR}/modelica-json
 
   jobs:
     - TEST_ARG="make test-cdl-conformance"
-    - TEST_ARG="make test-energyplus-validations"
-    - TEST_ARG="make test-bestest test-spawn-portability"
+    - TEST_ARG="make test-energyplus-validations test-dymola-spawn-spaces test-omc-spawn-spaces" #target test-optimica-spawn-fmu removed as it requires a local installation of OCT
+    - TEST_ARG="make test-bestest"
     - TEST_ARG="make test-dymola    PACKAGE=\"Buildings.{Air,Examples}\""
     - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.{Air,Examples}\""
     - TEST_ARG="make test-jmodelica PACKAGE=\"Buildings.{Air,Examples}\""
@@ -106,7 +101,7 @@ before_install:
        cp Buildings/Resources/Scripts/travis/dymola/dymola $HOME/bin/;
     fi;
   - if [[ "$TEST_ARG" == *test-optimica* ]]; then
-       docker pull "$DOCKER_USERNAME"/travis-ubuntu-1804-optimica:r19089;
+       docker pull "$DOCKER_USERNAME"/${OPTIMICA_VERSION};
        cp Buildings/Resources/Scripts/travis/optimica/jm_ipython.sh $HOME/bin/jm_ipython.sh;
     fi;
   - if [[ "$TEST_ARG" == *test-jmodelica* ]]; then
@@ -130,15 +125,20 @@ before_install:
       cd -;
       echo "Installed modelica-json in ${MODELICA_JSON_HOME}";
     fi;
+  - if [[ "$TEST_ARG" == *test-omc* ]]; then
+       docker pull "$DOCKER_USERNAME"/ubuntu-2004-omc:1.18.0;
+       cp Buildings/Resources/Scripts/travis/omc/omc $HOME/bin/omc;
+    fi;
 
 # Install dependencies
 # For sphinx, we need to install specific package versions, otherwise
 # the html output may have small formatting differences which causes
 # the test to fail
 install:
+  - git lfs pull
   - pip3 install --upgrade pip wheel
   - pip3 install --only-binary=numpy,scipy,matplotlib numpy==1.13.3 scipy==0.19.1 matplotlib==2.1.0
-  - pip3 install git+https://github.com/lbl-srg/BuildingsPy@master
+  - pip3 install git+https://github.com/lbl-srg/${BUILDINGSPY_VERSION}
   - if [[ "$TEST_ARG" == *test-energyplus* ]]; then
       export PATH=${PATH}:${TRAVIS_BUILD_DIR}/${ENERGYPLUS_VERSION};
       pip3 install pandas==1.0.1;