From 9222d9d02a3f89b3d7aafb3fa12f25240cc7131a Mon Sep 17 00:00:00 2001 From: Michael Wetter Date: Tue, 21 Nov 2023 14:51:01 -0800 Subject: [PATCH] Changed docker repository This changes the repository for the docker images --- .travis.yml | 5 +++-- IBPSA/Resources/Scripts/travis/dymola/dymola | 2 +- IBPSA/Resources/Scripts/travis/omc/omc | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index a1b89ee8ab..a47103c0b5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,6 +20,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 - DYMOLA_VERSION=travis_ubuntu-2004_dymola:2023x-x86_64_rev-1 @@ -44,11 +45,11 @@ env: before_install: - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin - if [[ "$TEST_ARG" == *test-dymola* || "$TEST_ARG" == *test-bestest* ]]; then - docker pull "$DOCKER_USERNAME"/${DYMOLA_VERSION}; + docker pull "$DOCKER_REPONAME"/${DYMOLA_VERSION}; cp IBPSA/Resources/Scripts/travis/dymola/dymola $HOME/bin/; fi; - if [[ "$TEST_ARG" == *test-openmodelica* ]]; then - docker pull "$DOCKER_USERNAME"/${OMC_VERSION}; + docker pull "$DOCKER_REPONAME"/${OMC_VERSION}; cp IBPSA/Resources/Scripts/travis/omc/omc $HOME/bin/omc; fi; diff --git a/IBPSA/Resources/Scripts/travis/dymola/dymola b/IBPSA/Resources/Scripts/travis/dymola/dymola index 37c4a00b9d..57d387e91e 100755 --- a/IBPSA/Resources/Scripts/travis/dymola/dymola +++ b/IBPSA/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/IBPSA/Resources/Scripts/travis/omc/omc b/IBPSA/Resources/Scripts/travis/omc/omc index 32a7f5f62b..15f716a9c6 100755 --- a/IBPSA/Resources/Scripts/travis/omc/omc +++ b/IBPSA/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-* && \