Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 1 addition & 28 deletions .CI/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@ pipeline {
booleanParam(name: 'report_ryzen_5950x_1', defaultValue: false, description: 'Generate a report for ryzen-5950x-1 without running the tests')
booleanParam(name: 'report_ryzen_5950x_2', defaultValue: false, description: 'Generate a report for ryzen-5950x-2 without running the tests')

booleanParam(name: 'basemodelica_jl_master', defaultValue: false, description: 'OpenModelica master branch with BaseModelica export and BaseModelica.jl import (ryzen-5950x-1)')

booleanParam(name: 'conversion_script', defaultValue: false, description: 'master branch with conversion script from MSL 3 to 4 (ryzen-5950x-1). This is an experimental job that does not run on a fixed schedule.')
booleanParam(name: 'cvode', defaultValue: false, description: 'master branch, with -d=newInst and -s cvode (ryzen-5950x-2). This is an experimental job that does not run on a fixed schedule.')
booleanParam(name: 'gbode', defaultValue: false, description: 'master branch, with -d=newInst and -s gbode (ryzen-5950x-2). This is an experimental job that does not run on a fixed schedule.')
Expand Down Expand Up @@ -279,23 +277,6 @@ pipeline {
}
}

stage('master BaseModelica.jl import') {
agent {
node {
label 'ryzen-5950x-1'
customWorkspace 'ws/OpenModelicaLibraryTestingWork'
}
}
options { skipDefaultCheckout() }
when {
beforeAgent true
expression { params.basemodelica_jl_master }
}
steps {
runRegressiontest('master', 'basemodelica_jl_master', '', '', 'ripper1', 'LibraryTestingRipper1DB', false, '', false, false, 0, 'configs/basemodelica.json')
}
}

stage('newInst-daeMode') {
agent {
node {
Expand Down Expand Up @@ -716,7 +697,6 @@ def runRegressiontest(branch, name, extraFlags, omsHash, dbPrefix, sshConfig, om
fi
'''
FMI_TESTING_FLAG=""
JULIA_TESTTING_FLAG=""
if (!name.contains('fmpy') && omsHash) {
sh """
if ! test -d OMSimulator; then
Expand Down Expand Up @@ -764,13 +744,6 @@ def runRegressiontest(branch, name, extraFlags, omsHash, dbPrefix, sshConfig, om
FMI_TESTING_FLAG="--fmi=true --fmisimulator='python3 -m fmpy' --default=ulimitExe=50"
}

if (name.contains('basemodelica_jl')) {
sh """
julia --project=TestBaseModelica -e 'import Pkg; Pkg.build(verbose=true); Pkg.precompile()'
"""
JULIA_TESTTING_FLAG="--basemodelica-mtk-import --no-julia-sys-image"
}

OMCPATH = "${omcompiler ? '../' : './'}OMCompiler"

sh '''
Expand Down Expand Up @@ -920,7 +893,7 @@ def runRegressiontest(branch, name, extraFlags, omsHash, dbPrefix, sshConfig, om

cd OpenModelicaLibraryTesting
# Force /usr/bin/omc as being used for generating the mos-files. Ensures consistent behavior among all tested OMC versions
stdbuf -oL -eL time ./test.py --ompython_omhome=/usr ${FMI_TESTING_FLAG} ${JULIA_TESTTING_FLAG} --extraflags='${extraFlags}' --extrasimflags='${extrasimflags}' --branch="${name}" --output="libraries.openmodelica.org:/var/www/libraries.openmodelica.org/branches/${name}/" --libraries='${libraryPath}/.openmodelica/libraries/' --jobs=${jobs} ${libs_config_file} ${params.OLDLIBS ? "configs/conf-old.json configs/conf-nonstandard.json" : ""} || (killall omc ; false) || exit 1
stdbuf -oL -eL time ./test.py --ompython_omhome=/usr ${FMI_TESTING_FLAG} --extraflags='${extraFlags}' --extrasimflags='${extrasimflags}' --branch="${name}" --output="libraries.openmodelica.org:/var/www/libraries.openmodelica.org/branches/${name}/" --libraries='${libraryPath}/.openmodelica/libraries/' --jobs=${jobs} ${libs_config_file} ${params.OLDLIBS ? "configs/conf-old.json configs/conf-nonstandard.json" : ""} || (killall omc ; false) || exit 1
"""
sh 'date'
sh "rm -f OpenModelicaLibraryTesting/${dbPrefix}-sqlite3.db.tmp"
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ jobs:
- name: Install Python dependencies
shell: bash
run: |
sed -i '/^juliacall/d' requirements.txt # Remove juliacall to check if it works without
pip install -r requirements.txt

- name: Run library test
Expand Down
109 changes: 0 additions & 109 deletions .github/workflows/test_julia.yml

This file was deleted.

14 changes: 0 additions & 14 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -229,17 +229,3 @@ export MSLREFERENCE="/some/path/to/ReferenceFiles/"
```

For the other libraries just clone the repositories to `/some/path/to/ReferenceFiles/`.

## Examples

### BaseModelica export and BaseModelica.jl import

```bash
export MY_SANITY_CHECK_DIRECTORY=sanityCheck
./test.py --basemodelica-mtk-import --branch=master --noclean --verbose configs/sanityCheck.json
./report.py --branches="${{ matrix.omc-version }}" configs/sanityCheck.json
```

This will create a Julia system image to speedup tests. This can take a lot of
time, but will reduce the Julia startup penalty. To disable add
`--no-julia-sys-image`.
2 changes: 0 additions & 2 deletions TestBaseModelica/.gitignore

This file was deleted.

27 changes: 0 additions & 27 deletions TestBaseModelica/Project.toml

This file was deleted.

57 changes: 0 additions & 57 deletions TestBaseModelica/README.md

This file was deleted.

Loading
Loading