Skip to content

Commit 281a679

Browse files
authored
Remove Base Modelica MTK test (#276)
1 parent 5cb3918 commit 281a679

30 files changed

+1
-1437
lines changed

.CI/Jenkinsfile

Lines changed: 1 addition & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ pipeline {
3030
booleanParam(name: 'report_ryzen_5950x_1', defaultValue: false, description: 'Generate a report for ryzen-5950x-1 without running the tests')
3131
booleanParam(name: 'report_ryzen_5950x_2', defaultValue: false, description: 'Generate a report for ryzen-5950x-2 without running the tests')
3232

33-
booleanParam(name: 'basemodelica_jl_master', defaultValue: false, description: 'OpenModelica master branch with BaseModelica export and BaseModelica.jl import (ryzen-5950x-1)')
34-
3533
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.')
3634
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.')
3735
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.')
@@ -279,23 +277,6 @@ pipeline {
279277
}
280278
}
281279

282-
stage('master BaseModelica.jl import') {
283-
agent {
284-
node {
285-
label 'ryzen-5950x-1'
286-
customWorkspace 'ws/OpenModelicaLibraryTestingWork'
287-
}
288-
}
289-
options { skipDefaultCheckout() }
290-
when {
291-
beforeAgent true
292-
expression { params.basemodelica_jl_master }
293-
}
294-
steps {
295-
runRegressiontest('master', 'basemodelica_jl_master', '', '', 'ripper1', 'LibraryTestingRipper1DB', false, '', false, false, 0, 'configs/basemodelica.json')
296-
}
297-
}
298-
299280
stage('newInst-daeMode') {
300281
agent {
301282
node {
@@ -716,7 +697,6 @@ def runRegressiontest(branch, name, extraFlags, omsHash, dbPrefix, sshConfig, om
716697
fi
717698
'''
718699
FMI_TESTING_FLAG=""
719-
JULIA_TESTTING_FLAG=""
720700
if (!name.contains('fmpy') && omsHash) {
721701
sh """
722702
if ! test -d OMSimulator; then
@@ -764,13 +744,6 @@ def runRegressiontest(branch, name, extraFlags, omsHash, dbPrefix, sshConfig, om
764744
FMI_TESTING_FLAG="--fmi=true --fmisimulator='python3 -m fmpy' --default=ulimitExe=50"
765745
}
766746

767-
if (name.contains('basemodelica_jl')) {
768-
sh """
769-
julia --project=TestBaseModelica -e 'import Pkg; Pkg.build(verbose=true); Pkg.precompile()'
770-
"""
771-
JULIA_TESTTING_FLAG="--basemodelica-mtk-import --no-julia-sys-image"
772-
}
773-
774747
OMCPATH = "${omcompiler ? '../' : './'}OMCompiler"
775748

776749
sh '''
@@ -920,7 +893,7 @@ def runRegressiontest(branch, name, extraFlags, omsHash, dbPrefix, sshConfig, om
920893
921894
cd OpenModelicaLibraryTesting
922895
# Force /usr/bin/omc as being used for generating the mos-files. Ensures consistent behavior among all tested OMC versions
923-
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
896+
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
924897
"""
925898
sh 'date'
926899
sh "rm -f OpenModelicaLibraryTesting/${dbPrefix}-sqlite3.db.tmp"

.github/workflows/test.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ jobs:
5353
- name: Install Python dependencies
5454
shell: bash
5555
run: |
56-
sed -i '/^juliacall/d' requirements.txt # Remove juliacall to check if it works without
5756
pip install -r requirements.txt
5857
5958
- name: Run library test

.github/workflows/test_julia.yml

Lines changed: 0 additions & 109 deletions
This file was deleted.

README.md

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -229,17 +229,3 @@ export MSLREFERENCE="/some/path/to/ReferenceFiles/"
229229
```
230230

231231
For the other libraries just clone the repositories to `/some/path/to/ReferenceFiles/`.
232-
233-
## Examples
234-
235-
### BaseModelica export and BaseModelica.jl import
236-
237-
```bash
238-
export MY_SANITY_CHECK_DIRECTORY=sanityCheck
239-
./test.py --basemodelica-mtk-import --branch=master --noclean --verbose configs/sanityCheck.json
240-
./report.py --branches="${{ matrix.omc-version }}" configs/sanityCheck.json
241-
```
242-
243-
This will create a Julia system image to speedup tests. This can take a lot of
244-
time, but will reduce the Julia startup penalty. To disable add
245-
`--no-julia-sys-image`.

TestBaseModelica/.gitignore

Lines changed: 0 additions & 2 deletions
This file was deleted.

TestBaseModelica/Project.toml

Lines changed: 0 additions & 27 deletions
This file was deleted.

TestBaseModelica/README.md

Lines changed: 0 additions & 57 deletions
This file was deleted.

0 commit comments

Comments
 (0)