diff --git a/.travis.yml b/.travis.yml index aee615054ac..5e013a1bb82 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,6 +30,7 @@ services: env: global: + - DOCKER_REPONAME=lbnlblum - BUILDINGSPY_VERSION=BuildingsPy@v5.0.0 - OMC_VERSION=ubuntu-2204-omc:1.22.0_dev-41-g8a5b18f-1 - OPTIMICA_VERSION=travis-ubuntu-2204-optimica:1.43.4 @@ -100,11 +101,11 @@ env: before_install: - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin - if [[ "$TEST_ARG" == *test-dymola* || "$TEST_ARG" == *test-bestest* || "$TEST_ARG" == *spawn-portability* ]]; then - docker pull "$DOCKER_USERNAME"/${DYMOLA_VERSION}; + docker pull "$DOCKER_REPONAME"/${DYMOLA_VERSION}; cp Buildings/Resources/Scripts/travis/dymola/dymola $HOME/bin/; fi; - if [[ "$TEST_ARG" == *test-optimica* ]]; then - docker pull "$DOCKER_USERNAME"/${OPTIMICA_VERSION}; + docker pull "$DOCKER_REPONAME"/${OPTIMICA_VERSION}; cp Buildings/Resources/Scripts/travis/optimica/jm_ipython.sh $HOME/bin/jm_ipython.sh; fi; - if [[ "$TEST_ARG" == *test-energyplus* ]]; then @@ -125,7 +126,7 @@ before_install: echo "Installed modelica-json in ${MODELICA_JSON_HOME}"; fi; - if [[ "$TEST_ARG" == *test-openmodelica* ]]; then - docker pull "$DOCKER_USERNAME"/${OMC_VERSION}; + docker pull "$DOCKER_REPONAME"/${OMC_VERSION}; cp Buildings/Resources/Scripts/travis/omc/omc $HOME/bin/omc; fi; diff --git a/Buildings/Resources/Scripts/travis/dymola/dymola b/Buildings/Resources/Scripts/travis/dymola/dymola index 37c4a00b9de..57d387e91e2 100755 --- a/Buildings/Resources/Scripts/travis/dymola/dymola +++ b/Buildings/Resources/Scripts/travis/dymola/dymola @@ -15,6 +15,6 @@ docker run \ --detach=false \ --rm \ -v ${sha_dir}:/mnt/shared \ - ${DOCKER_USERNAME}/${DYMOLA_VERSION} /bin/bash -c \ + ${DOCKER_REPONAME}/${DYMOLA_VERSION} /bin/bash -c \ "cd /mnt/shared/${bas_nam} && \ dymola ${arg_lis}" diff --git a/Buildings/Resources/Scripts/travis/omc/omc b/Buildings/Resources/Scripts/travis/omc/omc index 32a7f5f62ba..15f716a9c60 100755 --- a/Buildings/Resources/Scripts/travis/omc/omc +++ b/Buildings/Resources/Scripts/travis/omc/omc @@ -10,7 +10,7 @@ ################################################# set -e IMG_NAME=${OMC_VERSION} -DOCKER_USERNAME=michaelwetter +DOCKER_REPONAME=lbnlblum # Function declarations function create_mount_command() @@ -100,7 +100,7 @@ docker run \ -v ${sha_dir}:/mnt/shared \ --rm \ --workdir="/mnt/shared/${bas_nam}" \ - ${DOCKER_USERNAME}/${IMG_NAME} /bin/bash -c \ + ${DOCKER_REPONAME}/${IMG_NAME} /bin/bash -c \ "export MODELICAPATH=${DOCKER_MODELICAPATH} && \ omc ${arg_lis} && \ rm -rf spawn-* && \ diff --git a/Buildings/Resources/Scripts/travis/optimica/jm_ipython.sh b/Buildings/Resources/Scripts/travis/optimica/jm_ipython.sh index 15b8e24dd80..0c343b2657a 100755 --- a/Buildings/Resources/Scripts/travis/optimica/jm_ipython.sh +++ b/Buildings/Resources/Scripts/travis/optimica/jm_ipython.sh @@ -11,9 +11,9 @@ set -e IMG_NAME=${OPTIMICA_VERSION} -DOCKER_USERNAME=michaelwetter +DOCKER_REPONAME=lbnlblum -NAME=${DOCKER_USERNAME}/${IMG_NAME} +NAME=${DOCKER_REPONAME}/${IMG_NAME} # Function declarations function create_mount_command()