Skip to content

Commit

Permalink
Merge pull request #855 from RWTH-EBC/issue740_Release
Browse files Browse the repository at this point in the history
Dev into master -> v0.9.0
  • Loading branch information
DaJansenGit authored Jan 16, 2020
2 parents 92da5df + f248c44 commit 83e95e2
Show file tree
Hide file tree
Showing 1,788 changed files with 100,955 additions and 19,793 deletions.
38 changes: 36 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,37 @@
# Ignore Dymola output, log and temporary files (in alphabetical order)
*.bak-mo
*.pyc
*.log
*.mat
*.mof
buildlog.txt
diagnostics.txt
diagnostics_summary.txt
dsfinal.txt
dsin.txt
dslog.txt
dsmodel_fmuconf.h
dsmodel.c
dsmodelext*.c
dsmodelext*.obj
dsres.txt
dymosim
dymosim.exe
dymosim.exp
dymosim.lib
empty.txt
eventlog.txt
failure
fmiModelIdentifier.h
help/
modelDescription.xml
request
stat
status
stop
success
# Ignore files created by BuildingsPy
*.py[cod]
*simulator*.log
*unitTests*.log
*comparison*.log
# Ignore files created by PyCharm
.idea/
275 changes: 275 additions & 0 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,275 @@
test_overall_coverage:
image: registry.git.rwth-aachen.de/ebc/ebc_intern/dymola-docker:conda-integration
stage: test
services:
- docker

before_script:
- printenv
- export PIP_CACHE_DIR="/opt/cache/pip"
- source activate python27
- pip install --upgrade git+https://github.com/MichaMans/BuildingsPy@testexamplescoverage
- export PYTHONIOENCODING=utf-8 # just in case

script:
- cd AixLib && python ../bin/runUnitTests.py --coverage-only

artifacts:
when: on_failure
paths:
- AixLib/simulator-dymola.log

retry:
max: 2
when: runner_system_failure

test_dymola_Airflow:
image: registry.git.rwth-aachen.de/ebc/ebc_intern/dymola-docker:aixlibCITesting2020-miniconda-aixlib
stage: test
services:
- docker

before_script:
- Xvfb :77 -extension RANDR -extension GLX & export DISPLAY=:77.0 &&
- export PIP_CACHE_DIR="/opt/cache/pip"
- source activate python27
- python -V # Print out python version for debugging
- dir
- pip install --upgrade git+https://github.com/MichaMans/BuildingsPy@testexamplescoverage
- export PYTHONIOENCODING=utf-8 # just in case

script:
- cd AixLib && python ../bin/runUnitTests.py -n 2 --batch --single-package AixLib.Airflow --tool dymola

artifacts:
when: on_failure
paths:
- AixLib/simulator-dymola.log

retry:
max: 2
when: runner_system_failure


test_dymola_BoundaryConditions:
image: registry.git.rwth-aachen.de/ebc/ebc_intern/dymola-docker:aixlibCITesting2020-miniconda-aixlib
stage: test
services:
- docker

before_script:
- Xvfb :77 -extension RANDR -extension GLX & export DISPLAY=:77.0 &&
- export PIP_CACHE_DIR="/opt/cache/pip"
- source activate python27
- python -V # Print out python version for debugging
- dir
- pip install --upgrade git+https://github.com/MichaMans/BuildingsPy@testexamplescoverage
- export PYTHONIOENCODING=UTF8 # just in case

script:
- cd AixLib && python ../bin/runUnitTests.py -n 2 --batch --single-package AixLib.BoundaryConditions --tool dymola

artifacts:
when: on_failure
paths:
- AixLib/simulator-dymola.log

retry:
max: 2
when: runner_system_failure


test_dymola_Controls:
image: registry.git.rwth-aachen.de/ebc/ebc_intern/dymola-docker:aixlibCITesting2020-miniconda-aixlib
stage: test
services:
- docker

before_script:
- Xvfb :77 -extension RANDR -extension GLX & export DISPLAY=:77.0 &&
- export PIP_CACHE_DIR="/opt/cache/pip"
- source activate python27
- python -V # Print out python version for debugging
- dir
- pip install --upgrade git+https://github.com/MichaMans/BuildingsPy@testexamplescoverage
- export PYTHONIOENCODING=UTF8 # just in case

script:
- cd AixLib && python ../bin/runUnitTests.py -n 2 --batch --single-package AixLib.Controls --tool dymola

artifacts:
when: on_failure
paths:
- AixLib/simulator-dymola.log

retry:
max: 2
when: runner_system_failure


# test_dymola_Electrical:
# image: registry.git.rwth-aachen.de/ebc/ebc_intern/dymola-docker:aixlibCITesting2020-miniconda-aixlib
# stage: test
# services:
# - docker

# before_script:
# - Xvfb :77 -extension RANDR -extension GLX & export DISPLAY=:77.0 &&
# - export PIP_CACHE_DIR="/opt/cache/pip"
# - source activate python27
# - python -V # Print out python version for debugging
# - dir
# - pip install --upgrade git+https://github.com/MichaMans/BuildingsPy@testexamplescoverage
# - export PYTHONIOENCODING=UTF8 # just in case

# script:
# - cd AixLib && python ../bin/runUnitTests.py -n 2 --batch --single-package AixLib.Electrical --tool dymola

# artifacts:
# when: on_failure
# paths:
# - AixLib/simulator-dymola.log

# retry:
# max: 2
# when: runner_system_failure


# test_dymola_FastHVAC:
# image: registry.git.rwth-aachen.de/ebc/ebc_intern/dymola-docker:aixlibCITesting2020-miniconda-aixlib
# stage: test
# services:
# - docker

# before_script:
# - Xvfb :77 -extension RANDR -extension GLX & export DISPLAY=:77.0 &&
# - export PIP_CACHE_DIR="/opt/cache/pip"
# - source activate python27
# - python -V # Print out python version for debugging
# - dir
# - pip install --upgrade git+https://github.com/MichaMans/BuildingsPy@testexamplescoverage
# - export PYTHONIOENCODING=UTF8 # just in case

# script:
# - cd AixLib && python ../bin/runUnitTests.py -n 2 --batch --single-package AixLib.FastHVAC --tool dymola

# artifacts:
# when: on_failure
# paths:
# - AixLib/simulator-dymola.log

# retry:
# max: 2
# when: runner_system_failure


test_dymola_Fluid:
image: registry.git.rwth-aachen.de/ebc/ebc_intern/dymola-docker:aixlibCITesting2020-miniconda-aixlib
stage: test
timeout: 8h 0m
services:
- docker

before_script:
- Xvfb :77 -extension RANDR -extension GLX & export DISPLAY=:77.0 &&
- export PIP_CACHE_DIR="/opt/cache/pip"
- source activate python27
- python -V # Print out python version for debugging
- dir
- pip install --upgrade git+https://github.com/MichaMans/BuildingsPy@testexamplescoverage
- export PYTHONIOENCODING=UTF8 # just in case

script:
- cd AixLib && python ../bin/runUnitTests.py -n 2 --batch --single-package AixLib.Fluid --tool dymola

artifacts:
when: on_failure
paths:
- AixLib/simulator-dymola.log

retry:
max: 2
when: runner_system_failure


test_dymola_Media:
image: registry.git.rwth-aachen.de/ebc/ebc_intern/dymola-docker:aixlibCITesting2020-miniconda-aixlib
stage: test
services:
- docker

before_script:
- Xvfb :77 -extension RANDR -extension GLX & export DISPLAY=:77.0 &&
- export PIP_CACHE_DIR="/opt/cache/pip"
- source activate python27
- python -V # Print out python version for debugging
- dir
- pip install --upgrade git+https://github.com/MichaMans/BuildingsPy@testexamplescoverage
- export PYTHONIOENCODING=UTF8 # just in case

script:
- cd AixLib && python ../bin/runUnitTests.py -n 2 --batch --single-package AixLib.Media --tool dymola

artifacts:
when: on_failure
paths:
- AixLib/simulator-dymola.log

retry:
max: 2
when: runner_system_failure


test_dymola_Systems:
image: registry.git.rwth-aachen.de/ebc/ebc_intern/dymola-docker:aixlibCITesting2020-miniconda-aixlib
stage: test
services:
- docker

before_script:
- Xvfb :77 -extension RANDR -extension GLX & export DISPLAY=:77.0 &&
- export PIP_CACHE_DIR="/opt/cache/pip"
- source activate python27
- python -V # Print out python version for debugging
- dir
- pip install --upgrade git+https://github.com/MichaMans/BuildingsPy@testexamplescoverage
- export PYTHONIOENCODING=UTF8 # just in case

script:
- cd AixLib && python ../bin/runUnitTests.py -n 2 --batch --single-package AixLib.Systems --tool dymola

artifacts:
when: on_failure
paths:
- AixLib/simulator-dymola.log

retry:
max: 2
when: runner_system_failure


test_dymola_ThermalZones:
image: registry.git.rwth-aachen.de/ebc/ebc_intern/dymola-docker:aixlibCITesting2020-miniconda-aixlib
stage: test
services:
- docker
before_script:
- Xvfb :77 -extension RANDR -extension GLX & export DISPLAY=:77.0 &&
- export PIP_CACHE_DIR="/opt/cache/pip"
- source activate python27
- python -V # Print out python version for debugging
- dir
- pip install --upgrade git+https://github.com/MichaMans/BuildingsPy@testexamplescoverage
- export PYTHONIOENCODING=UTF8 # just in case

script:
- cd AixLib && python ../bin/runUnitTests.py -n 2 --batch --single-package AixLib.ThermalZones --tool dymola

artifacts:
when: on_failure
paths:
- AixLib/simulator-dymola.log

retry:
max: 2
when: runner_system_failure
4 changes: 4 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[submodule "netCDF-DataReader"]
path = netCDF-DataReader
url = https://github.com/modelica-3rdparty/netCDF-DataReader
branch = master
Loading

0 comments on commit 83e95e2

Please sign in to comment.