Skip to content
This repository was archived by the owner on Aug 14, 2025. It is now read-only.

Update master branch version of systemtests - #230

Merged
Eder-K merged 83 commits into
masterfrom
develop
Jun 18, 2020
Merged

Update master branch version of systemtests#230
Eder-K merged 83 commits into
masterfrom
develop

Conversation

@Eder-K

@Eder-K Eder-K commented Jun 11, 2020

Copy link
Copy Markdown
Contributor

Several improvements have been made to the system for triggering tests from other adapters, we should merge them to master such that they come into effect (adapter repositories generally will use the master branch version of systemtests).

Apart from other minor bugfixes, this PR will also make the newest two tests (elastictube1d and OpenFOAM-CodeAster) run on the master branch.

BenjaminRodenberg and others added 30 commits November 27, 2019 12:41
* replace installation of python bindings from precice/precice with bindings from precice/python-bindings

* directly use repository address for pip3 install, avoids cloning

* Fix fe-fe test by adding cd to user directory
* remove old python bindings. Update tests to only use new bindings

* trigger CI

* Remove python_future

* use Ubuntu 18.04, don't install enum34

* Update name of test and folder

* add ubuntu 18.04 version of OF adapter

* trigger CI

* fix syntax error

* Add output for better logs

* use Ubuntu18.04 and OpenFOAM5 for Solver and Adapter

* update reference results

* Change order to reduce diff

* Use OF5 for creation of reference results

* add debug output

* Use reference results from precice_st_output (#142)

* Remove debugging output
* Remove non-tests temporarily

* Remove log surpression

* Remove -d argument`

* Fix replacement of xml element

* nutils-of: Fix replacement of xml element (#149)

* Fix of-of and of-of_np (#150)

* of-of: Fix replacement of xml element

* of-of_np: Fix replacement of xml element

* Replace post-processing with acceleration using sed

* Replace post-processing with acceleration using sed

* Revert "Replace post-processing with acceleration using sed"

This reverts commit 2460f9a.

* Revert "Replace post-processing with acceleration using sed"

This reverts commit 832ce4a.

* escapte double quotes

* Escape quotes

Co-authored-by: Konrad Eder <53946421+Eder-K@users.noreply.github.com>

* Fix Calculix-OpenFOAM (#153)

Update the locally stored config file according to tutorials#60

* Fix SU2-Calculix (#152)

* Update configuration filename

* Run silent_compose in detached mode

* Revert '-d' argument adding

* Redirect ccx output to logfile

* Redirect ccx output to null

* Fix dealii-of and ccx-of_fsi [PETSc] (#154)

* Update sed insertion according to tutorials#60

* Update config.xml names for of-ccx.FSI.petsc

* Surpress of-adapter output

* Fix participant name

* Remove output surpression

* Restore silent functionality

* Add optional debug argument

* Add verbose optional argument

* Escape dots

* Delay of container start

* Run nutils-of in verbose mode

* Add success message

* Fix typo

* Add PETSc of-ccx to allowed failures

* Update PETSc of-ccx name

* Remove line

Co-authored-by: Benjamin Rüth <benjamin.rueth@tum.de>
* Remove sleep command

* Use exit codes for success as well
* remove old python bindings. Update tests to only use new bindings

* trigger CI

* Add tests for bindings on Ubuntu 18.04
72a0bd7 switched from installing eigen via apt to installing eigen from source. This results in also not installing pkg-config that is a dependency of eigen. Therefore we now have to individually install pkg-config. Otherwise builds under Ubuntu16.04 relying on pkg-config will fail.
* Update path of solverdummies. Was changed in precice/precice#630 from tools/solverdummies to examples/solverdummies.

* Update use new repository fortran-module for f2003 solverdummy and corresponding bindings

Co-authored-by: Gerasimos Chourdakis <chourdak@in.tum.de>
* Update headers for fe-fe test

* provoke test failure with wrong reference

* Revert "provoke test failure with wrong reference"

This reverts commit 90ff76e.

* Update column names for fe-fe 1804

* Fix md link

* Remove .gitkeep

* Update column names

* Remove string filter

* Update column names

* Add missing spaces

* Add spacing

* Restore filtering

* reintroduce whitespace errors to make tests succeed

Co-authored-by: Konrad Eder <53946421+Eder-K@users.noreply.github.com>
* Remove yaml-cpp install

* Remove yaml-cpp install

* Delete precice-adapter-config.yml

* Add preciceDict

* Delete precice-adapter-config.yml

* Create preciceDict

* Delete precice-adapter-config.yml

* Create preciceDict

* Delete preciceDict

* Create preciceDict

* Delete precice-adapter-config.yml

* Create preciceDict

* Delete precice-adapter-config.yml

* Add preciceDict

* Delete precice-adapter-config.yml

* Add preciceDict

* Delete precice-adapter-config.yml

* Add preciceDict

* Delete precice-adapter-config.yml

* Add preciceDict

* Delete precice-adapter-config.yml

* Add preciceDict

* Remove preCICe builds

* Print wmake.log

* Upgrade to OF5

* Fix typo

* Update to OF5

* Update reference files for openfoam5

* Update config path manipulation

* Update referenceOutput for OF5

* Update referenceOutput for OF5
* add system tests for cplscheme

* add cplscheme test

* run cplscheme test as local test

* use Ubuntu 18.04 as base image

* Use system_testing.py instead of local_test.py

Changed this, since this is the correct way to do it. local_test.py is only meant for local tests. I had to add an additional build stage that uses the debugMasterSockets branch on the preCICE main repository.

* Fix indentation

* Fix --build-arg and add a Ubuntu18.04 build

* first draft solution for #77

* roll out changes to all base images

* remove default docker username to force user to provide it and avoid inconsistencies

* remove old python bindings. Update tests to only use new bindings

* trigger CI

* add argument to switch petsc on/off

* remove unrelated change

* remove unrelated files

* modify tag depending on petsc

* Factor out tag composition

* Add script for pushing

* Use benjaminrueth and push_base.py

* Fix and document tagging

* temporarily allow failure

* Use a more explicit name for script

* Extract features in python scripts. Introduces some code duplication, but is more flexible. Code duplication will be removed as soon as #137 is solved.

* fix error

* Use list to keep track of features, add petsc as feature to list for better consistency

* use python script for building and pushing adapters

* Fix syntax errors

* Use dict instead of list

This is a partial remedy for the problem mentioned in #131 (comment)

* Update push_precice.py

Co-Authored-By: Konrad Eder <53946421+Eder-K@users.noreply.github.com>

* Update push_adapter.py

Co-Authored-By: Konrad Eder <53946421+Eder-K@users.noreply.github.com>

* Update build_precice.py

Co-Authored-By: Konrad Eder <53946421+Eder-K@users.noreply.github.com>

* Update build_adapter.py

Co-Authored-By: Konrad Eder <53946421+Eder-K@users.noreply.github.com>

* Update build_precice.py

Co-Authored-By: Konrad Eder <53946421+Eder-K@users.noreply.github.com>

* Update build_adapter.py

Co-Authored-By: Konrad Eder <53946421+Eder-K@users.noreply.github.com>

* use dict.get for less verbose code

* Fix error

* Filter away None

* Use less verbose approach

Co-authored-by: Konrad Eder <53946421+Eder-K@users.noreply.github.com>
Eder-K and others added 20 commits May 4, 2020 23:47
* Run only nutils-of, verbose

* Update repository location

* Keep nutils version constant

* Restore travis.yml
* Add test for elastictube1d tutorial

* Add referenceOutput for elastictube1d test

* Add travis commands for elastictube1d test

* Add 1dtube to solver directory

* Fix wording

* Print avg/max diff values after file content

Moves the diff command above the line printing avg and max diff.
This is to make it easier to see average/maximal diff values when
the amount of line differences are very large in a file. Otherwise
the 'diff' command might flood the output and make the avg/max
line hard to find.

* Add 1dtube to test_type

* Rename test to describe python version

* Add test for c++ version

* Add C++ version of elastictube1d test

* Differentiate py and cxx version of elastictube1d

* Add C++ version of elastictube1d test

* Add missing root permissions for copying results

[ci-skip]

* Update name of 1dtube argument

* Remove wrong cp command

[ci skip]

* Run whole Dockerfile as root

* Remove unnecessary abbreviations

* Update 1dtube test names

* Update 1dtube test names

* Merge with develop and update to more recent folder structure (#155)

* Update travis job name for Bindings

* Add `allowed_failures` section to travis.yml

Also adds the currently failing Ubuntu1804.sudo.mpich job to this
section.

For a job to be allowed to fail, it must be added to both the `include`
and `allowed_failures` sections.
A failure of such a job will not cause subseqent stages to be
cancelled.

* Initial commit to target specific tutorial branch for systemtest

* Add launch argument to specify systemtests branch

Allows requests to run on a specific branch of the systemtests
repository instead of the default master branch

* Adding input parameters to commands in docker-compose.yml

* Fix docker username on login (#109)

* Fix custom tags for adapter images #109

Closes #109

* Initial commit to target specific tutorial branch for systemtest

* Add launch argument to specify systemtests branch

Allows requests to run on a specific branch of the systemtests
repository instead of the default master branch

* Adding input parameters to commands in docker-compose.yml

* Improve log header info (#107)

* Improve automatic commit messages (#106)

* New referenceOutput for fe-fe.Ubuntu1804.home

* Removing all changes from trigger_systemtests.py for customised testing

* Reverting more changes done for customised testing

* Removing whitespace in trigger file

* Fix dimension setting for reference data

* Print build ID when systemtest is triggered (#105)

Closes #105

* Print build number instead of build ID (#105)

* Update job title to explain failure tolerance

* Match job titles in include and allow_failures

* Fix travis job list

* Fix ubuntu1804.home tag

* Use deployment instead of `after_success` (#116)

Clean up travis structure

Add documentation for adding tests and handling deploy

Closes #103

* Only specify job name in `allow_failures` (#117)

Closes #117

[skip travis]

* Pull from repository before pushing (#118)

Issue a `git pull --rebase` before pushing to
precice_st_output. This should help scripts erroring
due to missing commits in local version.

Closes #118

* use branch develop as default for all tests

* remove old python bindings. Update tests to only use new bindings

* Remove python_future

* Fix user for binding tests (#96)

* Apply tests to python bindings in precice/python-bindings (#133)

* replace installation of python bindings from precice/precice with bindings from precice/python-bindings

* directly use repository address for pip3 install, avoids cloning

* Fix fe-fe test by adding cd to user directory

* Allow failure for PETSc

* Allow failure for nutils <-> OpenFOAM. #132

* use DOCKER_USERNAME, where it is appropriate

* Use Ubuntu18.04 for Nutils-OF test (#132)

* remove old python bindings. Update tests to only use new bindings

* trigger CI

* Remove python_future

* use Ubuntu 18.04, don't install enum34

* Update name of test and folder

* add ubuntu 18.04 version of OF adapter

* trigger CI

* fix syntax error

* Add output for better logs

* use Ubuntu18.04 and OpenFOAM5 for Solver and Adapter

* update reference results

* Change order to reduce diff

* Use OF5 for creation of reference results

* add debug output

* Use reference results from precice_st_output (#142)

* Remove debugging output

* update installation procedure for python bindings

* use precice Repository

* Fix folder creation wrt user rights

* Use precice repository and fix users

* Navigate to correct folder

* Navigate to correct folder and run correct command

Co-authored-by: Konrad Eder <53946421+Eder-K@users.noreply.github.com>
Co-authored-by: Ishaan Desai <44898158+IshaanDesai@users.noreply.github.com>
Co-authored-by: David Schneider <dav.schneider@tum.de>

* Use branch of PR precice/elastictube1d#22 until it is merged

* Revert "Use branch of PR precice/elastictube1d#22 until it is merged"

This reverts commit bdc1b17.

* Update referenceOutput files for 1dtube_py (#161)

* Add os version to foldername

* Add 1dtube cxx to compose tests

* Remove folder permission

* Only run elastictube tests

* Add env variable

* Restore user creation

* Add permissions

* Remove unused volumes

* Make elastictube tests verbose

* Update 1dtube cxx reference

* Use default develop branch

* Improve text filter in compare_results.sh (#212)

* Add timestamp filter

* Restructure filtering

* Adjust referenceOutput

* Revert default preCICE branch to develop

* Restore TRAVIS_BRANCH

This reverts commit 288f71b.

* Run on develop instead of TRAVIS_BRANCH

* Run on develop instead of TRAVIS_BRANCH

* Remove branch arg, use default setting

* Use precice develop for tests

* Enable output

* Enable full diff print

* Update reference output

* Update outdated argument

* Remove events-summary from copied logs

* Add small message to each comparison

* Purge reference

* Update referenceOutput

* Convert 1dtube-py to compose test

* Add debug print

* Update reference for 1dtube-py

* Restore travis.yml

* Use default precice version (develop)

* Make default precice branch develop

* Shorten of-ccx petsc test from 5 to 1

* Update reference

* Fix yml syntax

* Fix style

Co-authored-by: Benjamin Rüth <benjamin.rueth@tum.de>
Co-authored-by: Ishaan Desai <44898158+IshaanDesai@users.noreply.github.com>
Co-authored-by: David Schneider <dav.schneider@tum.de>
Co-authored-by: ishaandesai <ishaandesai@gmail.com>
* Enable output

* Ignore version/revision

* Disable output
* Initial code aster dockerfile

* Change the default install directory

* Add procedure to install the adapter

* Add dockerfiles for Code_Aster solver, and Code_Aster adapter.
Prepare dummy docker-compose.yml file for system test

* Initial code aster dockerfile

* Change the default install directory

* Add procedure to install the adapter

* Add dockerfiles for Code_Aster solver, and Code_Aster adapter.
Prepare dummy docker-compose.yml file for system test

* Add docker-compose for Code_Aster. including docker.export

* Update docker-compose, still error in REPE_OUT location inside volume

* Update docker-compose and docker files for code-aster solver and adapter, to run with a precice coupling with openfoam.

* Add codeaster builds

* Fix indent

* Add codeaster test to compose test list

* Add prefix

* Fix prefix

* Fix prefix

* Add referenceOutput

* Change code_aster output from binary .med, to ascii .resu results

* Fix tutorial path

* Fix positional argument

* Set default preCICE branch to develop

* Update reference

* Update reference

* Only copy results to Output

* Disable output for of-ca

Co-authored-by: shkodm <dmshko@gmail.com>
Co-authored-by: Konrad Eder <konrad.alexander.eder@tum.de>
* Update reference

* Set permission of Output folder

* Fix permissions

* Remove debug print
Co-authored-by: Konrad Eder <konrad.alexander.eder@tum.de>
@Eder-K
Eder-K requested a review from MakisH June 11, 2020 12:16

@MakisH MakisH left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(not a proper review)

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants