Skip to content

Commit

Permalink
Changed docker repository
Browse files Browse the repository at this point in the history
  • Loading branch information
mwetter committed Nov 21, 2023
1 parent 3b1679c commit 5701800
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 8 deletions.
7 changes: 4 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ services:

env:
global:
- DOCKER_REPONAME=lbnlblum
- [email protected]
- OMC_VERSION=ubuntu-2204-omc:1.22.0_dev-41-g8a5b18f-1
- OPTIMICA_VERSION=travis-ubuntu-2204-optimica:1.43.4
Expand Down Expand Up @@ -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
Expand All @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion Buildings/Resources/Scripts/travis/dymola/dymola
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
4 changes: 2 additions & 2 deletions Buildings/Resources/Scripts/travis/omc/omc
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#################################################
set -e
IMG_NAME=${OMC_VERSION}
DOCKER_USERNAME=michaelwetter
DOCKER_REPONAME=lbnlblum

# Function declarations
function create_mount_command()
Expand Down Expand Up @@ -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-* && \
Expand Down
4 changes: 2 additions & 2 deletions Buildings/Resources/Scripts/travis/optimica/jm_ipython.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down

0 comments on commit 5701800

Please sign in to comment.