From 1cc255277f54817442ed6a53022a105fc5560bbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=BCth?= Date: Wed, 11 Dec 2019 16:19:28 +0100 Subject: [PATCH 01/52] Use TRAVIS_BRANCH to select branch of toolchain being tested #125 --- .travis.yml | 70 +++++++++++++++++++++++------------------------ system_testing.py | 2 +- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3b4b9284a..8dc923b95 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,7 @@ jobs: name: "Arch Linux" if: fork = false script: - - docker build -f precice/Dockerfile.Arch -t precice/precice-arch-develop . + - docker build -f precice/Dockerfile.Arch -t precice/precice-arch-$TRAVIS_BRANCH --build-arg branch=$TRAVIS_BRANCH . deploy: skip_cleanup: true provider: script @@ -23,13 +23,13 @@ jobs: all_branches: true script: >- echo "$DOCKER_PASSWORD" | docker login -u precice --password-stdin && - docker push precice/precice-arch-develop:latest + docker push precice/precice-arch-$TRAVIS_BRANCH:latest - stage: Building preCICE name: "Ubuntu 16.04 home" if: fork = false script: - - docker build -f precice/Dockerfile.Ubuntu1604.home -t precice/precice-ubuntu1604.home-develop . + - docker build -f precice/Dockerfile.Ubuntu1604.home -t precice/precice-ubuntu1604.home-$TRAVIS_BRANCH --build-arg branch=$TRAVIS_BRANCH. deploy: skip_cleanup: true provider: script @@ -37,14 +37,14 @@ jobs: all_branches: true script: >- echo "$DOCKER_PASSWORD" | docker login -u precice --password-stdin && - docker push precice/precice-ubuntu1604.home-develop:latest + docker push precice/precice-ubuntu1604.home-$TRAVIS_BRANCH:latest - stage: Building preCICE name: "Ubuntu 16.04 home PETSc" if: fork = false script: - > - docker build -f precice/Dockerfile.Ubuntu1604.home -t precice/precice-ubuntu1604.home.petsc-develop . + docker build -f precice/Dockerfile.Ubuntu1604.home -t precice/precice-ubuntu1604.home.petsc-$TRAVIS_BRANCH --build-arg branch=$TRAVIS_BRANCH. --build-arg petsc_para=yes deploy: skip_cleanup: true @@ -53,13 +53,13 @@ jobs: all_branches: true script: >- echo "$DOCKER_PASSWORD" | docker login -u precice --password-stdin && - docker push precice/precice-ubuntu1604.home.petsc-develop:latest + docker push precice/precice-ubuntu1604.home.petsc-$TRAVIS_BRANCH:latest - stage: Building preCICE name: "Ubuntu 16.04.sudo" if: type = cron script: - - docker build -f precice/Dockerfile.Ubuntu1604.sudo -t precice/precice-ubuntu1604.sudo-develop . + - docker build -f precice/Dockerfile.Ubuntu1604.sudo -t precice/precice-ubuntu1604.sudo-$TRAVIS_BRANCH --build-arg branch=$TRAVIS_BRANCH . deploy: skip_cleanup: true provider: script @@ -67,13 +67,13 @@ jobs: all_branches: true script: >- echo "$DOCKER_PASSWORD" | docker login -u precice --password-stdin && - docker push precice/precice-ubuntu1604.sudo-develop:latest + docker push precice/precice-ubuntu1604.sudo-$TRAVIS_BRANCH:latest - stage: Building preCICE name: "Ubuntu 16.04.package" if: type = cron script: - - docker build -f precice/Dockerfile.Ubuntu1604.package -t precice/precice-ubuntu1604.package-develop . + - docker build -f precice/Dockerfile.Ubuntu1604.package -t precice/precice-ubuntu1604.package-$TRAVIS_BRANCH --build-arg branch=$TRAVIS_BRANCH . deploy: skip_cleanup: true provider: script @@ -81,13 +81,13 @@ jobs: all_branches: true script: >- echo "$DOCKER_PASSWORD" | docker login -u precice --password-stdin && - docker push precice/precice-ubuntu1604.package-develop:latest + docker push precice/precice-ubuntu1604.package-$TRAVIS_BRANCH:latest - stage: Building preCICE name: "Ubuntu 18.04.home" if: fork = false script: - - docker build -f precice/Dockerfile.Ubuntu1804.home -t precice/precice-ubuntu1804.home-develop . + - docker build -f precice/Dockerfile.Ubuntu1804.home -t precice/precice-ubuntu1804.home-$TRAVIS_BRANCH --build-arg branch=$TRAVIS_BRANCH . deploy: skip_cleanup: true provider: script @@ -95,13 +95,13 @@ jobs: all_branches: true script: >- echo "$DOCKER_PASSWORD" | docker login -u precice --password-stdin && - docker push precice/precice-ubuntu1804.home-develop:latest + docker push precice/precice-ubuntu1804.home-$TRAVIS_BRANCH:latest - stage: Building preCICE name: "Ubuntu 18.04.sudo" if: type = cron script: - - docker build -f precice/Dockerfile.Ubuntu1804.sudo -t precice/precice-ubuntu1804.sudo-develop . + - docker build -f precice/Dockerfile.Ubuntu1804.sudo -t precice/precice-ubuntu1804.sudo-$TRAVIS_BRANCH --build-arg branch=$TRAVIS_BRANCH . deploy: skip_cleanup: true provider: script @@ -109,13 +109,13 @@ jobs: all_branches: true script: >- echo "$DOCKER_PASSWORD" | docker login -u precice --password-stdin && - docker push precice/precice-ubuntu1804.sudo-develop + docker push precice/precice-ubuntu1804.sudo-$TRAVIS_BRANCH - stage: Building preCICE name: "Ubuntu 18.04.sudo.mpich [Job failure permitted]" if: type = cron script: - - docker build -f precice/Dockerfile.Ubuntu1804.sudo.mpich -t precice/precice-ubuntu1804.sudo.mpich-develop . + - docker build -f precice/Dockerfile.Ubuntu1804.sudo.mpich -t precice/precice-ubuntu1804.sudo.mpich-$TRAVIS_BRANCH --build-arg branch=$TRAVIS_BRANCH . deploy: skip_cleanup: true provider: script @@ -123,13 +123,13 @@ jobs: all_branches: true script: >- echo "$DOCKER_PASSWORD" | docker login -u precice --password-stdin && - docker push precice/precice-ubuntu1804.sudo.mpich-develop:latest + docker push precice/precice-ubuntu1804.sudo.mpich-$TRAVIS_BRANCH:latest - stage: Building preCICE name: "Ubuntu 18.04.package" if: fork = false script: - - docker build -f precice/Dockerfile.Ubuntu1804.package -t precice/precice-ubuntu1804.package-develop . + - docker build -f precice/Dockerfile.Ubuntu1804.package -t precice/precice-ubuntu1804.package-$TRAVIS_BRANCH --build-arg branch=$TRAVIS_BRANCH . deploy: skip_cleanup: true provider: script @@ -137,7 +137,7 @@ jobs: all_branches: true script: >- echo "$DOCKER_PASSWORD" | docker login -u precice --password-stdin && - docker push precice/precice-ubuntu1804.package-develop + docker push precice/precice-ubuntu1804.package-$TRAVIS_BRANCH - name: "[Build preCICE on fork] Using cached version" if: fork = true @@ -149,7 +149,7 @@ jobs: name: SU2 adapter if: fork = false script: - - docker build -f adapters/Dockerfile.su2-adapter -t precice/su2-adapter-ubuntu1604.home-develop . + - docker build -f adapters/Dockerfile.su2-adapter -t precice/su2-adapter-ubuntu1604.home-$TRAVIS_BRANCH --build-arg branch=$TRAVIS_BRANCH . deploy: skip_cleanup: true provider: script @@ -157,12 +157,12 @@ jobs: all_branches: true script: >- echo "$DOCKER_PASSWORD" | docker login -u "precice" --password-stdin && - docker push precice/su2-adapter-ubuntu1604.home-develop + docker push precice/su2-adapter-ubuntu1604.home-$TRAVIS_BRANCH - name: CalculiX adapter if: fork = false script: - - docker build -f adapters/Dockerfile.calculix-adapter -t $DOCKER_USERNAME/calculix-adapter-ubuntu1604.home-develop . + - docker build -f adapters/Dockerfile.calculix-adapter -t $DOCKER_USERNAME/calculix-adapter-ubuntu1604.home-$TRAVIS_BRANCH --build-arg branch=$TRAVIS_BRANCH . deploy: skip_cleanup: true provider: script @@ -170,12 +170,12 @@ jobs: all_branches: true script: >- echo "$DOCKER_PASSWORD" | docker login -u "precice" --password-stdin && - docker push precice/calculix-adapter-ubuntu1604.home-develop + docker push precice/calculix-adapter-ubuntu1604.home-$TRAVIS_BRANCH - name: deal.ii adapter if: fork = false script: - - docker build -f adapters/Dockerfile.dealii-adapter -t $DOCKER_USERNAME/dealii-adapter-ubuntu1604.home-develop . + - docker build -f adapters/Dockerfile.dealii-adapter -t $DOCKER_USERNAME/dealii-adapter-ubuntu1604.home-$TRAVIS_BRANCH --build-arg branch=$TRAVIS_BRANCH . deploy: skip_cleanup: true provider: script @@ -183,12 +183,12 @@ jobs: all_branches: true script: >- echo "$DOCKER_PASSWORD" | docker login -u "precice" --password-stdin && - docker push precice/dealii-adapter-ubuntu1604.home-develop + docker push precice/dealii-adapter-ubuntu1604.home-$TRAVIS_BRANCH - name: openFOAM adapter if: fork = false script: - - docker build -f adapters/Dockerfile.openfoam-adapter -t $DOCKER_USERNAME/openfoam-adapter-ubuntu1604.home-develop . + - docker build -f adapters/Dockerfile.openfoam-adapter -t $DOCKER_USERNAME/openfoam-adapter-ubuntu1604.home-$TRAVIS_BRANCH --build-arg branch=$TRAVIS_BRANCH . deploy: skip_cleanup: true provider: script @@ -196,14 +196,14 @@ jobs: all_branches: true script: >- echo "$DOCKER_PASSWORD" | docker login -u "precice" --password-stdin && - docker push precice/openfoam-adapter-ubuntu1604.home-develop + docker push precice/openfoam-adapter-ubuntu1604.home-$TRAVIS_BRANCH - name: FEniCS adapter if: fork = false script: - > - docker build -f adapters/Dockerfile.fenics-adapter -t $DOCKER_USERNAME/fenics-adapter-ubuntu1804.home-develop - --build-arg from=precice/precice-ubuntu1804.home-develop . + docker build -f adapters/Dockerfile.fenics-adapter -t $DOCKER_USERNAME/fenics-adapter-ubuntu1804.home-$TRAVIS_BRANCH + --build-arg from=precice/precice-ubuntu1804.home-$TRAVIS_BRANCH . deploy: skip_cleanup: true provider: script @@ -211,14 +211,14 @@ jobs: all_branches: true script: >- echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin && - docker push $DOCKER_USERNAME/fenics-adapter-ubuntu1804.home-develop + docker push $DOCKER_USERNAME/fenics-adapter-ubuntu1804.home-$TRAVIS_BRANCH - name: openFOAM adapter [PETSc] if: fork = false script: - > - docker build -f adapters/Dockerfile.openfoam-adapter -t $DOCKER_USERNAME/openfoam-adapter-ubuntu1604.home.petsc-develop - --build-arg from=precice/precice-ubuntu1604.home.petsc-develop . + docker build -f adapters/Dockerfile.openfoam-adapter -t $DOCKER_USERNAME/openfoam-adapter-ubuntu1604.home.petsc-$TRAVIS_BRANCH + --build-arg from=precice/precice-ubuntu1604.home.petsc-$TRAVIS_BRANCH --build-arg branch=$TRAVIS_BRANCH . deploy: skip_cleanup: true provider: script @@ -226,14 +226,14 @@ jobs: all_branches: true script: >- echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin && - docker push $DOCKER_USERNAME/openfoam-adapter-ubuntu1604.home.petsc-develop + docker push $DOCKER_USERNAME/openfoam-adapter-ubuntu1604.home.petsc-$TRAVIS_BRANCH - name: CalculiX adapter [PETSc] if: fork = false script: - > - docker build -f adapters/Dockerfile.calculix-adapter -t $DOCKER_USERNAME/calculix-adapter-ubuntu1604.home.petsc-develop - --build-arg from=precice/precice-ubuntu1604.home.petsc-develop . + docker build -f adapters/Dockerfile.calculix-adapter -t $DOCKER_USERNAME/calculix-adapter-ubuntu1604.home.petsc-$TRAVIS_BRANCH + --build-arg from=precice/precice-ubuntu1604.home.petsc-$TRAVIS_BRANCH --build-arg branch=$TRAVIS_BRANCH . deploy: skip_cleanup: true provider: script @@ -241,7 +241,7 @@ jobs: all_branches: true script: >- echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin && - docker push $DOCKER_USERNAME/calculix-adapter-ubuntu1604.home.petsc-develop + docker push $DOCKER_USERNAME/calculix-adapter-ubuntu1604.home.petsc-$TRAVIS_BRANCH - name: "[Build adapters on fork] Using cached version" if: fork = true diff --git a/system_testing.py b/system_testing.py index a855c379f..4a9c7243a 100644 --- a/system_testing.py +++ b/system_testing.py @@ -175,7 +175,7 @@ def build_run_compare(test, tag, branch, local_precice, force_rebuild, rm_all): parser.add_argument('-l', '--local', action='store_true', help="use local preCICE image (default: use remote image)") parser.add_argument('-s', '--systemtest', type=str, help="choose system tests you want to use", choices = common.get_tests(), required = True) - parser.add_argument('-b', '--branch', help="preCICE branch to use", default = "develop") + parser.add_argument('-b', '--branch', help="preCICE branch to use", default=os.environ["TRAVIS_BRANCH"]) # make sure that branch corresponding to system tests branch is used, if no branch is explicitly specified. parser.add_argument('-f', '--force_rebuild', nargs='+', help="Force rebuild of variable parts of docker image", default = [], choices = ["precice", "tests"]) parser.add_argument('--base', type=str,help="Base preCICE image to use", From 1d51b01fed7ee337192de6c6d288d04a53be60f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=BCth?= Date: Wed, 11 Dec 2019 16:30:27 +0100 Subject: [PATCH 02/52] Add logic to also support pull requests --- system_testing.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system_testing.py b/system_testing.py index 4a9c7243a..3921fb0f1 100644 --- a/system_testing.py +++ b/system_testing.py @@ -175,7 +175,7 @@ def build_run_compare(test, tag, branch, local_precice, force_rebuild, rm_all): parser.add_argument('-l', '--local', action='store_true', help="use local preCICE image (default: use remote image)") parser.add_argument('-s', '--systemtest', type=str, help="choose system tests you want to use", choices = common.get_tests(), required = True) - parser.add_argument('-b', '--branch', help="preCICE branch to use", default=os.environ["TRAVIS_BRANCH"]) # make sure that branch corresponding to system tests branch is used, if no branch is explicitly specified. + parser.add_argument('-b', '--branch', help="preCICE branch to use", default=os.environ["TRAVIS_BRANCH"] if os.environ["TRAVIS_PULL_REQUEST"] == "false" else os.environ["TRAVIS_PULL_REQUEST_BRANCH"]) # make sure that branch corresponding to system tests branch is used, if no branch is explicitly specified. If we are testing a pull request, make sure to test agains branch from which PR originated. parser.add_argument('-f', '--force_rebuild', nargs='+', help="Force rebuild of variable parts of docker image", default = [], choices = ["precice", "tests"]) parser.add_argument('--base', type=str,help="Base preCICE image to use", From 751a263b30eb30b329d4f23acac33ab3a9460729 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=BCth?= Date: Wed, 11 Dec 2019 16:37:17 +0100 Subject: [PATCH 03/52] Fix syntax error --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8dc923b95..8171f9bc5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,7 +29,7 @@ jobs: name: "Ubuntu 16.04 home" if: fork = false script: - - docker build -f precice/Dockerfile.Ubuntu1604.home -t precice/precice-ubuntu1604.home-$TRAVIS_BRANCH --build-arg branch=$TRAVIS_BRANCH. + - docker build -f precice/Dockerfile.Ubuntu1604.home -t precice/precice-ubuntu1604.home-$TRAVIS_BRANCH --build-arg branch=$TRAVIS_BRANCH . deploy: skip_cleanup: true provider: script @@ -44,7 +44,7 @@ jobs: if: fork = false script: - > - docker build -f precice/Dockerfile.Ubuntu1604.home -t precice/precice-ubuntu1604.home.petsc-$TRAVIS_BRANCH --build-arg branch=$TRAVIS_BRANCH. + docker build -f precice/Dockerfile.Ubuntu1604.home -t precice/precice-ubuntu1604.home.petsc-$TRAVIS_BRANCH --build-arg branch=$TRAVIS_BRANCH . --build-arg petsc_para=yes deploy: skip_cleanup: true From 8b12ee92036365bdd7bc23b37fab34aec14590a4 Mon Sep 17 00:00:00 2001 From: Konrad Eder <53946421+Eder-K@users.noreply.github.com> Date: Sun, 9 Feb 2020 13:48:09 +0100 Subject: [PATCH 04/52] Remove yaml-cpp install --- adapters/Dockerfile.openfoam-adapter | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/adapters/Dockerfile.openfoam-adapter b/adapters/Dockerfile.openfoam-adapter index 2279d757b..5acb4054a 100644 --- a/adapters/Dockerfile.openfoam-adapter +++ b/adapters/Dockerfile.openfoam-adapter @@ -9,8 +9,7 @@ ENV USER=root # Install dependecies RUN apt-get -qq update && apt-get -qq install \ software-properties-common \ - wget apt-transport-https \ - libyaml-cpp-dev && \ + wget apt-transport-https && \ rm -rf /var/lib/apt/lists/* ARG CACHEBUST From 5e850373a21adaf5afb2240d0cef44372a65a2ae Mon Sep 17 00:00:00 2001 From: Konrad Eder <53946421+Eder-K@users.noreply.github.com> Date: Sun, 9 Feb 2020 13:49:37 +0100 Subject: [PATCH 05/52] Remove yaml-cpp install --- adapters/Dockerfile.openfoam-adapter.Ubuntu1804 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/adapters/Dockerfile.openfoam-adapter.Ubuntu1804 b/adapters/Dockerfile.openfoam-adapter.Ubuntu1804 index 2f7940b49..87ef1e11b 100644 --- a/adapters/Dockerfile.openfoam-adapter.Ubuntu1804 +++ b/adapters/Dockerfile.openfoam-adapter.Ubuntu1804 @@ -9,8 +9,7 @@ ENV USER=root # Install dependecies RUN apt-get -qq update && apt-get -qq install \ software-properties-common \ - wget apt-transport-https \ - libyaml-cpp-dev && \ + wget apt-transport-https && \ rm -rf /var/lib/apt/lists/* ARG CACHEBUST From 6f95b247128fa2147ab5afcc91ddf5e65f7c1bdb Mon Sep 17 00:00:00 2001 From: Konrad Eder <53946421+Eder-K@users.noreply.github.com> Date: Sun, 9 Feb 2020 13:58:00 +0100 Subject: [PATCH 06/52] Delete precice-adapter-config.yml --- .../Fluid/precice-adapter-config.yml | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 tests/TestCompose_dealii-of/referenceOutput/Fluid/precice-adapter-config.yml diff --git a/tests/TestCompose_dealii-of/referenceOutput/Fluid/precice-adapter-config.yml b/tests/TestCompose_dealii-of/referenceOutput/Fluid/precice-adapter-config.yml deleted file mode 100644 index 10abb8dd1..000000000 --- a/tests/TestCompose_dealii-of/referenceOutput/Fluid/precice-adapter-config.yml +++ /dev/null @@ -1,17 +0,0 @@ -participant: Fluid - -precice-config-file: precice-config.xml - -interfaces: -- mesh: Fluid-Mesh-Centers - locations: faceCenters - patches: - - flap - write-data: Force -- mesh: Fluid-Mesh-Nodes - locations: faceNodes - patches: - - flap - read-data: Displacement - -FSIenabled: true From 8e9775ccabbba38a3bf8e550bfd9d00d81bcde0a Mon Sep 17 00:00:00 2001 From: Konrad Eder <53946421+Eder-K@users.noreply.github.com> Date: Sun, 9 Feb 2020 14:00:55 +0100 Subject: [PATCH 07/52] Add preciceDict --- .../referenceOutput/Fluid/system/preciceDict | 54 +++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 tests/TestCompose_dealii-of/referenceOutput/Fluid/system/preciceDict diff --git a/tests/TestCompose_dealii-of/referenceOutput/Fluid/system/preciceDict b/tests/TestCompose_dealii-of/referenceOutput/Fluid/system/preciceDict new file mode 100644 index 000000000..fb8c60326 --- /dev/null +++ b/tests/TestCompose_dealii-of/referenceOutput/Fluid/system/preciceDict @@ -0,0 +1,54 @@ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "system"; + object preciceDict; +} + +preciceConfig "precice-config.xml"; + +participant Fluid; + +modules (FSI); + +interfaces +{ + Interface1 + { + mesh Fluid-Mesh-Centers; + patches (flap); + locations faceCenters; + + readData + ( + ); + + writeData + ( + Force + ); + }; + + Interface2 + { + mesh Fluid-Mesh-Nodes; + patches (flap); + locations faceNodes; + + readData + ( + Displacement + ); + + writeData + ( + ); + }; +}; + +FSI +{ + rho rho [1 -3 0 0 0 0 0] 1; +} From 8ebad2af144d62d6cc4743d9745f6b72cafc9949 Mon Sep 17 00:00:00 2001 From: Konrad Eder <53946421+Eder-K@users.noreply.github.com> Date: Sun, 9 Feb 2020 14:02:50 +0100 Subject: [PATCH 08/52] Delete precice-adapter-config.yml --- .../OpenFOAM/precice-adapter-config.yml | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 tests/TestCompose_nutils-of.Ubuntu1804/referenceOutput/OpenFOAM/precice-adapter-config.yml diff --git a/tests/TestCompose_nutils-of.Ubuntu1804/referenceOutput/OpenFOAM/precice-adapter-config.yml b/tests/TestCompose_nutils-of.Ubuntu1804/referenceOutput/OpenFOAM/precice-adapter-config.yml deleted file mode 100644 index 77d873752..000000000 --- a/tests/TestCompose_nutils-of.Ubuntu1804/referenceOutput/OpenFOAM/precice-adapter-config.yml +++ /dev/null @@ -1,13 +0,0 @@ -participant: OpenFOAM - -precice-config-file: configs/precice-config.xml - -interfaces: -- mesh: OpenFOAM-Mesh - #locations: faceCenters # optional, defaults to faceCenters - patches: - - interface - write-data: Temperature - read-data: Heat-Flux - -CHTenabled: true From 5c35e1bc0e0f076f1a39d98ac0cd3253f946306f Mon Sep 17 00:00:00 2001 From: Konrad Eder <53946421+Eder-K@users.noreply.github.com> Date: Sun, 9 Feb 2020 14:03:16 +0100 Subject: [PATCH 09/52] Create preciceDict --- .../OpenFOAM/system/preciceDict | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 tests/TestCompose_nutils-of.Ubuntu1804/referenceOutput/OpenFOAM/system/preciceDict diff --git a/tests/TestCompose_nutils-of.Ubuntu1804/referenceOutput/OpenFOAM/system/preciceDict b/tests/TestCompose_nutils-of.Ubuntu1804/referenceOutput/OpenFOAM/system/preciceDict new file mode 100644 index 000000000..9c1ae2481 --- /dev/null +++ b/tests/TestCompose_nutils-of.Ubuntu1804/referenceOutput/OpenFOAM/system/preciceDict @@ -0,0 +1,33 @@ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "system"; + object preciceDict; +} + +preciceConfig "../precice-config.xml"; + +participant OpenFOAM; + +modules (CHT); + +interfaces +{ + Interface1 + { + mesh OpenFOAM-Mesh; + patches (interface); + + readData + ( + Heat-Flux + ); + + writeData + ( + Temperature + ); + }; +}; From 4804124fa121841e8f91ae6c7cf18e099424e91d Mon Sep 17 00:00:00 2001 From: Konrad Eder <53946421+Eder-K@users.noreply.github.com> Date: Sun, 9 Feb 2020 14:05:53 +0100 Subject: [PATCH 10/52] Delete precice-adapter-config.yml --- .../Outer-Fluid/precice-adapter-config.yml | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 tests/TestCompose_of-ccx/referenceOutput/Outer-Fluid/precice-adapter-config.yml diff --git a/tests/TestCompose_of-ccx/referenceOutput/Outer-Fluid/precice-adapter-config.yml b/tests/TestCompose_of-ccx/referenceOutput/Outer-Fluid/precice-adapter-config.yml deleted file mode 100644 index 1dc1a8f38..000000000 --- a/tests/TestCompose_of-ccx/referenceOutput/Outer-Fluid/precice-adapter-config.yml +++ /dev/null @@ -1,11 +0,0 @@ -participant: Outer-Fluid - -precice-config-file: precice-config.xml - -interfaces: - - mesh: Outer-Fluid-to-Solid - patches: [interface] - read-data: [Sink-Temperature-Solid, Heat-Transfer-Coefficient-Solid] - write-data: [Sink-Temperature-Outer-Fluid, Heat-Transfer-Coefficient-Outer-Fluid] - -CHTenabled: true \ No newline at end of file From 517e883a5912fc7671fe2004d889942cc0e7af56 Mon Sep 17 00:00:00 2001 From: Konrad Eder <53946421+Eder-K@users.noreply.github.com> Date: Sun, 9 Feb 2020 14:06:19 +0100 Subject: [PATCH 11/52] Create preciceDict --- .../referenceOutput/Outer-Fluid/preciceDict | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 tests/TestCompose_of-ccx/referenceOutput/Outer-Fluid/preciceDict diff --git a/tests/TestCompose_of-ccx/referenceOutput/Outer-Fluid/preciceDict b/tests/TestCompose_of-ccx/referenceOutput/Outer-Fluid/preciceDict new file mode 100644 index 000000000..546e45ef2 --- /dev/null +++ b/tests/TestCompose_of-ccx/referenceOutput/Outer-Fluid/preciceDict @@ -0,0 +1,35 @@ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "system"; + object preciceDict; +} + +preciceConfig "precice-config.xml"; + +participant Outer-Fluid; + +modules (CHT); + +interfaces +{ + Interface1 + { + mesh Outer-Fluid-to-Solid; + patches (interface); + + readData + ( + Sink-Temperature-Solid + Heat-Transfer-Coefficient-Solid + ); + + writeData + ( + Sink-Temperature-Outer-Fluid + Heat-Transfer-Coefficient-Outer-Fluid + ); + }; +}; From 42eaacb4e7ffe1a0a37d198956b7b5bf0654c351 Mon Sep 17 00:00:00 2001 From: Konrad Eder <53946421+Eder-K@users.noreply.github.com> Date: Sun, 9 Feb 2020 14:10:00 +0100 Subject: [PATCH 12/52] Delete preciceDict --- .../referenceOutput/Outer-Fluid/preciceDict | 35 ------------------- 1 file changed, 35 deletions(-) delete mode 100644 tests/TestCompose_of-ccx/referenceOutput/Outer-Fluid/preciceDict diff --git a/tests/TestCompose_of-ccx/referenceOutput/Outer-Fluid/preciceDict b/tests/TestCompose_of-ccx/referenceOutput/Outer-Fluid/preciceDict deleted file mode 100644 index 546e45ef2..000000000 --- a/tests/TestCompose_of-ccx/referenceOutput/Outer-Fluid/preciceDict +++ /dev/null @@ -1,35 +0,0 @@ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "system"; - object preciceDict; -} - -preciceConfig "precice-config.xml"; - -participant Outer-Fluid; - -modules (CHT); - -interfaces -{ - Interface1 - { - mesh Outer-Fluid-to-Solid; - patches (interface); - - readData - ( - Sink-Temperature-Solid - Heat-Transfer-Coefficient-Solid - ); - - writeData - ( - Sink-Temperature-Outer-Fluid - Heat-Transfer-Coefficient-Outer-Fluid - ); - }; -}; From 318e7d7bfd222b14d7e5528a22d014417b4f0eb7 Mon Sep 17 00:00:00 2001 From: Konrad Eder <53946421+Eder-K@users.noreply.github.com> Date: Sun, 9 Feb 2020 14:10:17 +0100 Subject: [PATCH 13/52] Create preciceDict --- .../Outer-Fluid/system/preciceDict | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 tests/TestCompose_of-ccx/referenceOutput/Outer-Fluid/system/preciceDict diff --git a/tests/TestCompose_of-ccx/referenceOutput/Outer-Fluid/system/preciceDict b/tests/TestCompose_of-ccx/referenceOutput/Outer-Fluid/system/preciceDict new file mode 100644 index 000000000..546e45ef2 --- /dev/null +++ b/tests/TestCompose_of-ccx/referenceOutput/Outer-Fluid/system/preciceDict @@ -0,0 +1,35 @@ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "system"; + object preciceDict; +} + +preciceConfig "precice-config.xml"; + +participant Outer-Fluid; + +modules (CHT); + +interfaces +{ + Interface1 + { + mesh Outer-Fluid-to-Solid; + patches (interface); + + readData + ( + Sink-Temperature-Solid + Heat-Transfer-Coefficient-Solid + ); + + writeData + ( + Sink-Temperature-Outer-Fluid + Heat-Transfer-Coefficient-Outer-Fluid + ); + }; +}; From 72d4825f9faf7e1b6d030ccbe75e11bdbf72717b Mon Sep 17 00:00:00 2001 From: Konrad Eder <53946421+Eder-K@users.noreply.github.com> Date: Sun, 9 Feb 2020 14:10:34 +0100 Subject: [PATCH 14/52] Delete precice-adapter-config.yml --- .../Inner-Fluid/precice-adapter-config.yml | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 tests/TestCompose_of-ccx/referenceOutput/Inner-Fluid/precice-adapter-config.yml diff --git a/tests/TestCompose_of-ccx/referenceOutput/Inner-Fluid/precice-adapter-config.yml b/tests/TestCompose_of-ccx/referenceOutput/Inner-Fluid/precice-adapter-config.yml deleted file mode 100644 index d4deee280..000000000 --- a/tests/TestCompose_of-ccx/referenceOutput/Inner-Fluid/precice-adapter-config.yml +++ /dev/null @@ -1,11 +0,0 @@ -participant: Inner-Fluid - -precice-config-file: precice-config.xml - -interfaces: - - mesh: Inner-Fluid-to-Solid - patches: [interface] - read-data: [Sink-Temperature-Solid, Heat-Transfer-Coefficient-Solid] - write-data: [Sink-Temperature-Inner-Fluid, Heat-Transfer-Coefficient-Inner-Fluid] - -CHTenabled: true \ No newline at end of file From 6a97d85b30b82e3eccb549e4b344b396e36dcafb Mon Sep 17 00:00:00 2001 From: Konrad Eder <53946421+Eder-K@users.noreply.github.com> Date: Sun, 9 Feb 2020 14:10:54 +0100 Subject: [PATCH 15/52] Create preciceDict --- .../Inner-Fluid/system/preciceDict | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 tests/TestCompose_of-ccx/referenceOutput/Inner-Fluid/system/preciceDict diff --git a/tests/TestCompose_of-ccx/referenceOutput/Inner-Fluid/system/preciceDict b/tests/TestCompose_of-ccx/referenceOutput/Inner-Fluid/system/preciceDict new file mode 100644 index 000000000..13d2409cc --- /dev/null +++ b/tests/TestCompose_of-ccx/referenceOutput/Inner-Fluid/system/preciceDict @@ -0,0 +1,35 @@ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "system"; + object preciceDict; +} + +preciceConfig "precice-config.xml"; + +participant Inner-Fluid; + +modules (CHT); + +interfaces +{ + Interface1 + { + mesh Inner-Fluid-to-Solid; + patches (interface); + + readData + ( + Sink-Temperature-Solid + Heat-Transfer-Coefficient-Solid + ); + + writeData + ( + Sink-Temperature-Inner-Fluid + Heat-Transfer-Coefficient-Inner-Fluid + ); + }; +}; From 2527d55f0bffa10f0dffe304cfa5e48b031b1b39 Mon Sep 17 00:00:00 2001 From: Konrad Eder <53946421+Eder-K@users.noreply.github.com> Date: Sun, 9 Feb 2020 14:12:29 +0100 Subject: [PATCH 16/52] Delete precice-adapter-config.yml --- .../Fluid/precice-adapter-config.yml | 21 ------------------- 1 file changed, 21 deletions(-) delete mode 100644 tests/TestCompose_of-ccx_fsi.Ubuntu1604.home.PETSc/referenceOutput/Fluid/precice-adapter-config.yml diff --git a/tests/TestCompose_of-ccx_fsi.Ubuntu1604.home.PETSc/referenceOutput/Fluid/precice-adapter-config.yml b/tests/TestCompose_of-ccx_fsi.Ubuntu1604.home.PETSc/referenceOutput/Fluid/precice-adapter-config.yml deleted file mode 100644 index 4068757b0..000000000 --- a/tests/TestCompose_of-ccx_fsi.Ubuntu1604.home.PETSc/referenceOutput/Fluid/precice-adapter-config.yml +++ /dev/null @@ -1,21 +0,0 @@ -participant: Fluid - -precice-config-file: precice-config.xml - -interfaces: -- mesh: Fluid-Mesh-Faces - locations: faceCenters - patches: - - flap - write-data: Forces0 -- mesh: Fluid-Mesh-Nodes - locations: faceNodes - patches: - - flap - read-data: Displacements0 - -FSIenabled: true - -CHTenabled: false -disableCheckpointing: false -evaluateBoundaries: true From b3f0f38ef57272a8bbbc2e0c8808bb8ec27b10f6 Mon Sep 17 00:00:00 2001 From: Konrad Eder <53946421+Eder-K@users.noreply.github.com> Date: Sun, 9 Feb 2020 14:12:56 +0100 Subject: [PATCH 17/52] Add preciceDict --- .../referenceOutput/Fluid/system/preciceDict | 54 +++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 tests/TestCompose_of-ccx_fsi.Ubuntu1604.home.PETSc/referenceOutput/Fluid/system/preciceDict diff --git a/tests/TestCompose_of-ccx_fsi.Ubuntu1604.home.PETSc/referenceOutput/Fluid/system/preciceDict b/tests/TestCompose_of-ccx_fsi.Ubuntu1604.home.PETSc/referenceOutput/Fluid/system/preciceDict new file mode 100644 index 000000000..1cf85430b --- /dev/null +++ b/tests/TestCompose_of-ccx_fsi.Ubuntu1604.home.PETSc/referenceOutput/Fluid/system/preciceDict @@ -0,0 +1,54 @@ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "system"; + object preciceDict; +} + +preciceConfig "precice-config.xml"; + +participant Fluid; + +modules (FSI); + +interfaces +{ + Interface1 + { + mesh Fluid-Mesh-Faces; + patches (flap); + locations faceCenters; + + readData + ( + ); + + writeData + ( + Forces0 + ); + }; + + Interface2 + { + mesh Fluid-Mesh-Nodes; + patches (flap); + locations faceNodes; + + readData + ( + Displacements0 + ); + + writeData + ( + ); + }; +}; + +FSI +{ + rho rho [1 -3 0 0 0 0 0] 1; +} From 0a2634e45086dc24094c403408128ff68956d829 Mon Sep 17 00:00:00 2001 From: Konrad Eder <53946421+Eder-K@users.noreply.github.com> Date: Sun, 9 Feb 2020 14:14:53 +0100 Subject: [PATCH 18/52] Delete precice-adapter-config.yml --- .../Fluid/precice-adapter-config.yml | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 tests/TestCompose_of-of/referenceOutput/Fluid/precice-adapter-config.yml diff --git a/tests/TestCompose_of-of/referenceOutput/Fluid/precice-adapter-config.yml b/tests/TestCompose_of-of/referenceOutput/Fluid/precice-adapter-config.yml deleted file mode 100644 index dfd2e76ce..000000000 --- a/tests/TestCompose_of-of/referenceOutput/Fluid/precice-adapter-config.yml +++ /dev/null @@ -1,13 +0,0 @@ -participant: Fluid - -precice-config-file: precice-config.xml - -interfaces: -- mesh: Fluid-Mesh - #locations: faceCenters # optional, defaults to faceCenters - patches: - - interface - write-data: Temperature - read-data: Heat-Flux - -CHTenabled: true From cb4b17a62bdf8cd3883fa891b6ebb1805d0a834f Mon Sep 17 00:00:00 2001 From: Konrad Eder <53946421+Eder-K@users.noreply.github.com> Date: Sun, 9 Feb 2020 14:15:17 +0100 Subject: [PATCH 19/52] Add preciceDict --- .../referenceOutput/Fluid/system/preciceDict | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 tests/TestCompose_of-of/referenceOutput/Fluid/system/preciceDict diff --git a/tests/TestCompose_of-of/referenceOutput/Fluid/system/preciceDict b/tests/TestCompose_of-of/referenceOutput/Fluid/system/preciceDict new file mode 100644 index 000000000..c434cccd0 --- /dev/null +++ b/tests/TestCompose_of-of/referenceOutput/Fluid/system/preciceDict @@ -0,0 +1,33 @@ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "system"; + object preciceDict; +} + +preciceConfig "precice-config.xml"; + +participant Fluid; + +modules (CHT); + +interfaces +{ + Interface1 + { + mesh Fluid-Mesh; + patches (interface); + + readData + ( + Heat-Flux + ); + + writeData + ( + Temperature + ); + }; +}; From 1ca1e4227a4ca18a74ac2f60f60f29640c5b3702 Mon Sep 17 00:00:00 2001 From: Konrad Eder <53946421+Eder-K@users.noreply.github.com> Date: Sun, 9 Feb 2020 14:15:36 +0100 Subject: [PATCH 20/52] Delete precice-adapter-config.yml --- .../referenceOutput/Solid/precice-adapter-config.yml | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 tests/TestCompose_of-of/referenceOutput/Solid/precice-adapter-config.yml diff --git a/tests/TestCompose_of-of/referenceOutput/Solid/precice-adapter-config.yml b/tests/TestCompose_of-of/referenceOutput/Solid/precice-adapter-config.yml deleted file mode 100644 index 551bd9c53..000000000 --- a/tests/TestCompose_of-of/referenceOutput/Solid/precice-adapter-config.yml +++ /dev/null @@ -1,12 +0,0 @@ -participant: Solid - -precice-config-file: precice-config.xml - -interfaces: -- mesh: Solid-Mesh - patches: - - interface - write-data: Heat-Flux - read-data: Temperature - -CHTenabled: true From f03a6b14b784d12c13a14abb11a58460241bfbf0 Mon Sep 17 00:00:00 2001 From: Konrad Eder <53946421+Eder-K@users.noreply.github.com> Date: Sun, 9 Feb 2020 14:16:06 +0100 Subject: [PATCH 21/52] Add preciceDict --- .../referenceOutput/Solid/system/preciceDict | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 tests/TestCompose_of-of/referenceOutput/Solid/system/preciceDict diff --git a/tests/TestCompose_of-of/referenceOutput/Solid/system/preciceDict b/tests/TestCompose_of-of/referenceOutput/Solid/system/preciceDict new file mode 100644 index 000000000..8bee12293 --- /dev/null +++ b/tests/TestCompose_of-of/referenceOutput/Solid/system/preciceDict @@ -0,0 +1,38 @@ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "system"; + object preciceDict; +} + +preciceConfig "precice-config.xml"; + +participant Solid; + +modules (CHT); + +interfaces +{ + Interface1 + { + mesh Solid-Mesh; + patches (interface); + + readData + ( + Temperature + ); + + writeData + ( + Heat-Flux + ); + }; +}; + +CHT +{ + k [ 1 1 -3 -1 0 0 0 ] 100; +}; From fa0f5c1436f96aa3648f00f2e4f44d7993b32e63 Mon Sep 17 00:00:00 2001 From: Konrad Eder <53946421+Eder-K@users.noreply.github.com> Date: Sun, 9 Feb 2020 14:16:40 +0100 Subject: [PATCH 22/52] Delete precice-adapter-config.yml --- .../Fluid/precice-adapter-config.yml | 19 ------------------- 1 file changed, 19 deletions(-) delete mode 100644 tests/TestCompose_of-of_np/referenceOutput/Fluid/precice-adapter-config.yml diff --git a/tests/TestCompose_of-of_np/referenceOutput/Fluid/precice-adapter-config.yml b/tests/TestCompose_of-of_np/referenceOutput/Fluid/precice-adapter-config.yml deleted file mode 100644 index 585c2204c..000000000 --- a/tests/TestCompose_of-of_np/referenceOutput/Fluid/precice-adapter-config.yml +++ /dev/null @@ -1,19 +0,0 @@ -participant: Fluid - -precice-config-file: precice-config.xml - -interfaces: -- mesh: Fluid-Mesh-Centers - locations: faceCenters # optional, defaults to faceCenters - provideMeshConnectivity: false - patches: - - interface - read-data: Heat-Flux -- mesh: Fluid-Mesh-Nodes - locations: faceNodes # optional, defaults to faceCenters - provideMeshConnectivity: true - patches: - - interface - write-data: Temperature - -CHTenabled: true From 74c1c48ebe5899e335a631a5462f19ddab255cb3 Mon Sep 17 00:00:00 2001 From: Konrad Eder <53946421+Eder-K@users.noreply.github.com> Date: Sun, 9 Feb 2020 14:17:04 +0100 Subject: [PATCH 23/52] Add preciceDict --- .../referenceOutput/Fluid/system/preciceDict | 51 +++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 tests/TestCompose_of-of_np/referenceOutput/Fluid/system/preciceDict diff --git a/tests/TestCompose_of-of_np/referenceOutput/Fluid/system/preciceDict b/tests/TestCompose_of-of_np/referenceOutput/Fluid/system/preciceDict new file mode 100644 index 000000000..4696531cd --- /dev/null +++ b/tests/TestCompose_of-of_np/referenceOutput/Fluid/system/preciceDict @@ -0,0 +1,51 @@ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "system"; + object preciceDict; +} + +preciceConfig "precice-config.xml"; + +participant Fluid; + +modules (CHT); + +interfaces +{ + Interface1 + { + mesh Fluid-Mesh-Centers; + locations faceCenters; + connectivity false; + patches (interface); + + readData + ( + Heat-Flux + ); + + writeData + ( + ); + }; + + Interface2 + { + mesh Fluid-Mesh-Nodes; + locations faceNodes; + connectivity true; + patches (interface); + + readData + ( + ); + + writeData + ( + Temperature + ); + }; +}; From f77f031f5ea9dece958f8e7a010d14ed442b024e Mon Sep 17 00:00:00 2001 From: Konrad Eder <53946421+Eder-K@users.noreply.github.com> Date: Sun, 9 Feb 2020 14:17:26 +0100 Subject: [PATCH 24/52] Delete precice-adapter-config.yml --- .../Solid/precice-adapter-config.yml | 19 ------------------- 1 file changed, 19 deletions(-) delete mode 100644 tests/TestCompose_of-of_np/referenceOutput/Solid/precice-adapter-config.yml diff --git a/tests/TestCompose_of-of_np/referenceOutput/Solid/precice-adapter-config.yml b/tests/TestCompose_of-of_np/referenceOutput/Solid/precice-adapter-config.yml deleted file mode 100644 index 37d60eeed..000000000 --- a/tests/TestCompose_of-of_np/referenceOutput/Solid/precice-adapter-config.yml +++ /dev/null @@ -1,19 +0,0 @@ -participant: Solid - -precice-config-file: precice-config.xml - -interfaces: -- mesh: Solid-Mesh-Centers - locations: faceCenters # optional, defaults to faceCenters - provideMeshConnectivity: false - patches: - - interface - read-data: Temperature -- mesh: Solid-Mesh-Nodes - locations: faceNodes # optional, defaults to faceCenters - provideMeshConnectivity: true - patches: - - interface - write-data: Heat-Flux - -CHTenabled: true From ffdcb1a50abd7c557da301572ce114a58dd13587 Mon Sep 17 00:00:00 2001 From: Konrad Eder <53946421+Eder-K@users.noreply.github.com> Date: Sun, 9 Feb 2020 14:17:50 +0100 Subject: [PATCH 25/52] Add preciceDict --- .../referenceOutput/Solid/system/preciceDict | 56 +++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 tests/TestCompose_of-of_np/referenceOutput/Solid/system/preciceDict diff --git a/tests/TestCompose_of-of_np/referenceOutput/Solid/system/preciceDict b/tests/TestCompose_of-of_np/referenceOutput/Solid/system/preciceDict new file mode 100644 index 000000000..8f49ba5bc --- /dev/null +++ b/tests/TestCompose_of-of_np/referenceOutput/Solid/system/preciceDict @@ -0,0 +1,56 @@ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "system"; + object preciceDict; +} + +preciceConfig "precice-config.xml"; + +participant Solid; + +modules (CHT); + +interfaces +{ + Interface1 + { + mesh Solid-Mesh-Centers; + locations faceCenters; + connectivity false; + patches (interface); + + readData + ( + Temperature + ); + + writeData + ( + ); + }; + + Interfaces2 + { + mesh Solid-Mesh-Nodes; + locations faceNodes; + connectivity true; + patches (interface); + + readData + ( + ); + + writeData + ( + Heat-Flux + ); + }; +}; + +CHT +{ + k [ 1 1 -3 -1 0 0 0 ] 100; +}; From 0ee0349231493b5cf9aab3222bd5a133b1d31835 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20R=C3=BCth?= Date: Tue, 11 Feb 2020 12:04:29 +0100 Subject: [PATCH 26/52] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 086907b62..d6a176b03 100644 --- a/.travis.yml +++ b/.travis.yml @@ -139,7 +139,7 @@ jobs: name: SU2 adapter if: fork = false script: - - docker build -f adapters/Dockerfile.su2-adapter -t $DOCKER_USERNAME/su2-adapter-ubuntu1604.home-$TRAVIS_BRANCH --build-arg branch=$TRAVIS_BRANCH . + - docker build -f adapters/Dockerfile.su2-adapter -t $DOCKER_USERNAME/su2-adapter-ubuntu1604.home-$TRAVIS_BRANCH --build-arg branch=$TRAVIS_BRANCH --build-arg from=$DOCKER_USERNAME/precice-ubuntu1604.home-$TRAVIS_BRANCH . deploy: skip_cleanup: true provider: script From 38b2e4abe35e09a64fb7814a4fc89a49e8405f64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20R=C3=BCth?= Date: Tue, 11 Feb 2020 12:04:37 +0100 Subject: [PATCH 27/52] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d6a176b03..a276c0b67 100644 --- a/.travis.yml +++ b/.travis.yml @@ -152,7 +152,7 @@ jobs: - name: CalculiX adapter if: fork = false script: - - docker build -f adapters/Dockerfile.calculix-adapter -t $DOCKER_USERNAME/calculix-adapter-ubuntu1604.home-$TRAVIS_BRANCH --build-arg branch=$TRAVIS_BRANCH . + - docker build -f adapters/Dockerfile.calculix-adapter -t $DOCKER_USERNAME/calculix-adapter-ubuntu1604.home-$TRAVIS_BRANCH --build-arg branch=$TRAVIS_BRANCH --build-arg from=$DOCKER_USERNAME/precice-ubuntu1604.home-$TRAVIS_BRANCH . deploy: skip_cleanup: true provider: script From 43060420f1242b3f8b2b2117b56222dd98d5decc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20R=C3=BCth?= Date: Tue, 11 Feb 2020 12:04:45 +0100 Subject: [PATCH 28/52] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a276c0b67..e63e0c1b7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -159,7 +159,7 @@ jobs: on: all_branches: true script: >- - echo "$DOCKER_PASSWORD" | docker login -u "precice" --password-stdin && + echo "$DOCKER_PASSWORD" | docker login -u $DOCKER_USERNAME --password-stdin && docker push precice/calculix-adapter-ubuntu1604.home-$TRAVIS_BRANCH - name: deal.ii adapter From 88f3baaffb5751c83d4e74e7ca82d5c98edce462 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20R=C3=BCth?= Date: Tue, 11 Feb 2020 12:04:52 +0100 Subject: [PATCH 29/52] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e63e0c1b7..251d1447c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -160,7 +160,7 @@ jobs: all_branches: true script: >- echo "$DOCKER_PASSWORD" | docker login -u $DOCKER_USERNAME --password-stdin && - docker push precice/calculix-adapter-ubuntu1604.home-$TRAVIS_BRANCH + docker push $DOCKER_USERNAME/calculix-adapter-ubuntu1604.home-$TRAVIS_BRANCH - name: deal.ii adapter if: fork = false From 3ecbf6da384e98facf0cd0c395135807042827a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20R=C3=BCth?= Date: Tue, 11 Feb 2020 12:04:59 +0100 Subject: [PATCH 30/52] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 251d1447c..45927faef 100644 --- a/.travis.yml +++ b/.travis.yml @@ -165,7 +165,7 @@ jobs: - name: deal.ii adapter if: fork = false script: - - docker build -f adapters/Dockerfile.dealii-adapter -t $DOCKER_USERNAME/dealii-adapter-ubuntu1604.home-$TRAVIS_BRANCH --build-arg branch=$TRAVIS_BRANCH . + - docker build -f adapters/Dockerfile.dealii-adapter -t $DOCKER_USERNAME/dealii-adapter-ubuntu1604.home-$TRAVIS_BRANCH --build-arg branch=$TRAVIS_BRANCH --build-arg from=$DOCKER_USERNAME/precice-ubuntu1604.home-$TRAVIS_BRANCH . deploy: skip_cleanup: true provider: script From c4fde6b0e8a02f48c0b9a4b02017b6094664ab3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20R=C3=BCth?= Date: Tue, 11 Feb 2020 12:05:07 +0100 Subject: [PATCH 31/52] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 45927faef..76565a2e1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -199,7 +199,7 @@ jobs: all_branches: true script: >- echo "$DOCKER_PASSWORD" | docker login -u $DOCKER_USERNAME --password-stdin && - docker push precice/openfoam-adapter-ubuntu1804.home-develop + docker push $DOCKER_USERNAME/openfoam-adapter-ubuntu1804.home-$TRAVIS_BRANCH - name: FEniCS adapter if: fork = false From 40885a243951fbb8ea9e9884fc30de8a7e3ec2ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20R=C3=BCth?= Date: Tue, 11 Feb 2020 12:05:13 +0100 Subject: [PATCH 32/52] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 76565a2e1..099476229 100644 --- a/.travis.yml +++ b/.travis.yml @@ -236,7 +236,7 @@ jobs: script: - > docker build -f adapters/Dockerfile.calculix-adapter -t $DOCKER_USERNAME/calculix-adapter-ubuntu1604.home.petsc-$TRAVIS_BRANCH - --build-arg from=precice/precice-ubuntu1604.home.petsc-$TRAVIS_BRANCH --build-arg branch=$TRAVIS_BRANCH . + --build-arg from=$DOCKER_USERNAME/precice-ubuntu1604.home.petsc-$TRAVIS_BRANCH --build-arg branch=$TRAVIS_BRANCH . deploy: skip_cleanup: true provider: script From 6f3c43b8d193a635ff361e55537ff5896b11559b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20R=C3=BCth?= Date: Tue, 11 Feb 2020 12:05:19 +0100 Subject: [PATCH 33/52] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 099476229..889f03d3a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -243,7 +243,7 @@ jobs: on: all_branches: true script: >- - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin && + echo "$DOCKER_PASSWORD" | docker login -u $DOCKER_USERNAME --password-stdin && docker push $DOCKER_USERNAME/calculix-adapter-ubuntu1604.home.petsc-$TRAVIS_BRANCH - name: "[Build adapters on fork] Using cached version" From 981d36e79363adac5f7d0b61e2994a176a87ee38 Mon Sep 17 00:00:00 2001 From: BenjaminRueth Date: Tue, 11 Feb 2020 12:08:26 +0100 Subject: [PATCH 34/52] use correct build-arg for OF Adapter --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 889f03d3a..f8b79f8ab 100644 --- a/.travis.yml +++ b/.travis.yml @@ -178,7 +178,7 @@ jobs: - name: openFOAM adapter if: fork = false script: - - docker build -f adapters/Dockerfile.openfoam-adapter -t $DOCKER_USERNAME/openfoam-adapter-ubuntu1604.home-develop . + - docker build -f adapters/Dockerfile.openfoam-adapter -t $DOCKER_USERNAME/openfoam-adapter-ubuntu1604.home-$TRAVIS_BRANCH --build-arg branch=$TRAVIS_BRANCH --build-arg from=$DOCKER_USERNAME/precice-ubuntu1604.home-$TRAVIS_BRANCH . deploy: skip_cleanup: true provider: script @@ -191,7 +191,7 @@ jobs: - name: "[18.04] openFOAM adapter" if: fork = false script: - - docker build -f adapters/Dockerfile.openfoam-adapter.Ubuntu1804 -t $DOCKER_USERNAME/openfoam-adapter-ubuntu1804.home-develop . + - docker build -f adapters/Dockerfile.openfoam-adapter.Ubuntu1804 -t $DOCKER_USERNAME/openfoam-adapter-ubuntu1804.home-$TRAVIS_BRANCH --build-arg branch=$TRAVIS_BRANCH --build-arg from=$DOCKER_USERNAME/precice-ubuntu1804.home-$TRAVIS_BRANCH . deploy: skip_cleanup: true provider: script From f0560566d304f2bb5e3a04fb2d5decf42793e966 Mon Sep 17 00:00:00 2001 From: BenjaminRueth Date: Tue, 11 Feb 2020 12:48:15 +0100 Subject: [PATCH 35/52] remove if fork == false --- .travis.yml | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/.travis.yml b/.travis.yml index f8b79f8ab..29d592473 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,6 @@ jobs: include: - stage: Building preCICE name: "Arch Linux" - if: fork = false script: - docker build -f precice/Dockerfile.Arch -t $DOCKER_USERNAME/precice-arch-$TRAVIS_BRANCH --build-arg branch=$TRAVIS_BRANCH . deploy: @@ -31,7 +30,6 @@ jobs: - stage: Building preCICE name: "Ubuntu 16.04 home" - if: fork = false script: - docker build -f precice/Dockerfile.Ubuntu1604.home -t $DOCKER_USERNAME/precice-ubuntu1604.home-$TRAVIS_BRANCH --build-arg branch=$TRAVIS_BRANCH . deploy: @@ -45,7 +43,6 @@ jobs: - stage: Building preCICE name: "Ubuntu 16.04 home PETSc [Job failure permitted]" - if: fork = false script: - > docker build -f precice/Dockerfile.Ubuntu1604.home -t $DOCKER_USERNAME/precice-ubuntu1604.home.petsc-$TRAVIS_BRANCH --build-arg branch=$TRAVIS_BRANCH . @@ -61,7 +58,6 @@ jobs: - stage: Building preCICE name: "Ubuntu 16.04.sudo" - if: type = cron script: - docker build -f precice/Dockerfile.Ubuntu1604.sudo -t $DOCKER_USERNAME/precice-ubuntu1604.sudo-$TRAVIS_BRANCH --build-arg branch=$TRAVIS_BRANCH . deploy: @@ -75,7 +71,6 @@ jobs: - stage: Building preCICE name: "Ubuntu 18.04.home" - if: fork = false script: - docker build -f precice/Dockerfile.Ubuntu1804.home -t $DOCKER_USERNAME/precice-ubuntu1804.home-$TRAVIS_BRANCH --build-arg branch=$TRAVIS_BRANCH . deploy: @@ -89,7 +84,6 @@ jobs: - stage: Building preCICE name: "Ubuntu 18.04.sudo" - if: type = cron script: - docker build -f precice/Dockerfile.Ubuntu1804.sudo -t $DOCKER_USERNAME/precice-ubuntu1804.sudo-$TRAVIS_BRANCH --build-arg branch=$TRAVIS_BRANCH . deploy: @@ -103,7 +97,6 @@ jobs: - stage: Building preCICE name: "Ubuntu 18.04.sudo.mpich [Job failure permitted]" - if: type = cron script: - docker build -f precice/Dockerfile.Ubuntu1804.sudo.mpich -t $DOCKER_USERNAME/precice-ubuntu1804.sudo.mpich-$TRAVIS_BRANCH --build-arg branch=$TRAVIS_BRANCH . deploy: @@ -117,7 +110,6 @@ jobs: - stage: Building preCICE name: "Ubuntu 18.04.package" - if: fork = false script: - docker build -f precice/Dockerfile.Ubuntu1804.package -t $DOCKER_USERNAME/precice-ubuntu1804.package-$TRAVIS_BRANCH --build-arg branch=$TRAVIS_BRANCH . deploy: @@ -129,15 +121,8 @@ jobs: echo "$DOCKER_PASSWORD" | docker login -u $DOCKER_USERNAME --password-stdin && docker push $DOCKER_USERNAME/precice-ubuntu1804.package-$TRAVIS_BRANCH - - name: "[Build preCICE on fork] Using cached version" - if: fork = true - script: true - - - - stage: Building adapters name: SU2 adapter - if: fork = false script: - docker build -f adapters/Dockerfile.su2-adapter -t $DOCKER_USERNAME/su2-adapter-ubuntu1604.home-$TRAVIS_BRANCH --build-arg branch=$TRAVIS_BRANCH --build-arg from=$DOCKER_USERNAME/precice-ubuntu1604.home-$TRAVIS_BRANCH . deploy: @@ -150,7 +135,6 @@ jobs: docker push $DOCKER_USERNAME/su2-adapter-ubuntu1604.home-$TRAVIS_BRANCH - name: CalculiX adapter - if: fork = false script: - docker build -f adapters/Dockerfile.calculix-adapter -t $DOCKER_USERNAME/calculix-adapter-ubuntu1604.home-$TRAVIS_BRANCH --build-arg branch=$TRAVIS_BRANCH --build-arg from=$DOCKER_USERNAME/precice-ubuntu1604.home-$TRAVIS_BRANCH . deploy: @@ -163,7 +147,6 @@ jobs: docker push $DOCKER_USERNAME/calculix-adapter-ubuntu1604.home-$TRAVIS_BRANCH - name: deal.ii adapter - if: fork = false script: - docker build -f adapters/Dockerfile.dealii-adapter -t $DOCKER_USERNAME/dealii-adapter-ubuntu1604.home-$TRAVIS_BRANCH --build-arg branch=$TRAVIS_BRANCH --build-arg from=$DOCKER_USERNAME/precice-ubuntu1604.home-$TRAVIS_BRANCH . deploy: @@ -176,7 +159,6 @@ jobs: docker push $DOCKER_USERNAME/dealii-adapter-ubuntu1604.home-$TRAVIS_BRANCH - name: openFOAM adapter - if: fork = false script: - docker build -f adapters/Dockerfile.openfoam-adapter -t $DOCKER_USERNAME/openfoam-adapter-ubuntu1604.home-$TRAVIS_BRANCH --build-arg branch=$TRAVIS_BRANCH --build-arg from=$DOCKER_USERNAME/precice-ubuntu1604.home-$TRAVIS_BRANCH . deploy: @@ -189,7 +171,6 @@ jobs: docker push $DOCKER_USERNAME/openfoam-adapter-ubuntu1604.home-$TRAVIS_BRANCH - name: "[18.04] openFOAM adapter" - if: fork = false script: - docker build -f adapters/Dockerfile.openfoam-adapter.Ubuntu1804 -t $DOCKER_USERNAME/openfoam-adapter-ubuntu1804.home-$TRAVIS_BRANCH --build-arg branch=$TRAVIS_BRANCH --build-arg from=$DOCKER_USERNAME/precice-ubuntu1804.home-$TRAVIS_BRANCH . deploy: @@ -202,7 +183,6 @@ jobs: docker push $DOCKER_USERNAME/openfoam-adapter-ubuntu1804.home-$TRAVIS_BRANCH - name: FEniCS adapter - if: fork = false script: - > docker build -f adapters/Dockerfile.fenics-adapter -t $DOCKER_USERNAME/fenics-adapter-ubuntu1804.home-$TRAVIS_BRANCH @@ -217,7 +197,6 @@ jobs: docker push $DOCKER_USERNAME/fenics-adapter-ubuntu1804.home-$TRAVIS_BRANCH - name: openFOAM adapter [PETSc] [Job failure permitted] - if: fork = false script: - > docker build -f adapters/Dockerfile.openfoam-adapter -t $DOCKER_USERNAME/openfoam-adapter-ubuntu1604.home.petsc-$TRAVIS_BRANCH @@ -232,7 +211,6 @@ jobs: docker push $DOCKER_USERNAME/openfoam-adapter-ubuntu1604.home.petsc-$TRAVIS_BRANCH - name: CalculiX adapter [PETSc] [Job failure permitted] - if: fork = false script: - > docker build -f adapters/Dockerfile.calculix-adapter -t $DOCKER_USERNAME/calculix-adapter-ubuntu1604.home.petsc-$TRAVIS_BRANCH @@ -246,12 +224,6 @@ jobs: echo "$DOCKER_PASSWORD" | docker login -u $DOCKER_USERNAME --password-stdin && docker push $DOCKER_USERNAME/calculix-adapter-ubuntu1604.home.petsc-$TRAVIS_BRANCH - - name: "[Build adapters on fork] Using cached version" - if: fork = true - script: true - - - - stage: Tests name: "[16.04] SU2 <-> Calculix" script: From 2c9a9a82853567ca1510d7f4ec005470582b3a65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20R=C3=BCth?= Date: Tue, 11 Feb 2020 15:03:00 +0100 Subject: [PATCH 36/52] Fix syntax --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f8b79f8ab..dcb70ed08 100644 --- a/.travis.yml +++ b/.travis.yml @@ -206,7 +206,7 @@ jobs: script: - > docker build -f adapters/Dockerfile.fenics-adapter -t $DOCKER_USERNAME/fenics-adapter-ubuntu1804.home-$TRAVIS_BRANCH - --build-arg from=$DOCKER_USERNAME/precice-ubuntu1804.home-$TRAVIS_BRANCH branch=$TRAVIS_BRANCH . + --build-arg from=$DOCKER_USERNAME/precice-ubuntu1804.home-$TRAVIS_BRANCH --build-arg branch=$TRAVIS_BRANCH . deploy: skip_cleanup: true provider: script From f5d56b7f128e03d0353205dea6acbd688e961e9f Mon Sep 17 00:00:00 2001 From: Konrad Eder Date: Tue, 11 Feb 2020 15:21:24 +0100 Subject: [PATCH 37/52] Remove preCICe builds --- .travis.yml | 120 ---------------------------------------------------- 1 file changed, 120 deletions(-) diff --git a/.travis.yml b/.travis.yml index fbe991dd2..0bb5e2c7d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,126 +15,6 @@ jobs: - name: "CalculiX adapter [PETSc] [Job failure permitted]" include: - - stage: Building preCICE - name: "Arch Linux" - if: fork = false - script: - - docker build -f precice/Dockerfile.Arch -t $DOCKER_USERNAME/precice-arch-develop . - deploy: - skip_cleanup: true - provider: script - on: - all_branches: true - script: >- - echo "$DOCKER_PASSWORD" | docker login -u $DOCKER_USERNAME --password-stdin && - docker push $DOCKER_USERNAME/precice-arch-develop:latest - - - stage: Building preCICE - name: "Ubuntu 16.04 home" - if: fork = false - script: - - docker build -f precice/Dockerfile.Ubuntu1604.home -t $DOCKER_USERNAME/precice-ubuntu1604.home-develop . - deploy: - skip_cleanup: true - provider: script - on: - all_branches: true - script: >- - echo "$DOCKER_PASSWORD" | docker login -u $DOCKER_USERNAME --password-stdin && - docker push $DOCKER_USERNAME/precice-ubuntu1604.home-develop:latest - - - stage: Building preCICE - name: "Ubuntu 16.04 home PETSc [Job failure permitted]" - if: fork = false - script: - - > - docker build -f precice/Dockerfile.Ubuntu1604.home -t $DOCKER_USERNAME/precice-ubuntu1604.home.petsc-develop . - --build-arg petsc_para=yes - deploy: - skip_cleanup: true - provider: script - on: - all_branches: true - script: >- - echo "$DOCKER_PASSWORD" | docker login -u $DOCKER_USERNAME --password-stdin && - docker push $DOCKER_USERNAME/precice-ubuntu1604.home.petsc-develop:latest - - - stage: Building preCICE - name: "Ubuntu 16.04.sudo" - if: type = cron - script: - - docker build -f precice/Dockerfile.Ubuntu1604.sudo -t $DOCKER_USERNAME/precice-ubuntu1604.sudo-develop . - deploy: - skip_cleanup: true - provider: script - on: - all_branches: true - script: >- - echo "$DOCKER_PASSWORD" | docker login -u $DOCKER_USERNAME --password-stdin && - docker push $DOCKER_USERNAME/precice-ubuntu1604.sudo-develop:latest - - - stage: Building preCICE - name: "Ubuntu 18.04.home" - if: fork = false - script: - - docker build -f precice/Dockerfile.Ubuntu1804.home -t $DOCKER_USERNAME/precice-ubuntu1804.home-develop . - deploy: - skip_cleanup: true - provider: script - on: - all_branches: true - script: >- - echo "$DOCKER_PASSWORD" | docker login -u $DOCKER_USERNAME --password-stdin && - docker push $DOCKER_USERNAME/precice-ubuntu1804.home-develop:latest - - - stage: Building preCICE - name: "Ubuntu 18.04.sudo" - if: type = cron - script: - - docker build -f precice/Dockerfile.Ubuntu1804.sudo -t $DOCKER_USERNAME/precice-ubuntu1804.sudo-develop . - deploy: - skip_cleanup: true - provider: script - on: - all_branches: true - script: >- - echo "$DOCKER_PASSWORD" | docker login -u $DOCKER_USERNAME --password-stdin && - docker push $DOCKER_USERNAME/precice-ubuntu1804.sudo-develop - - - stage: Building preCICE - name: "Ubuntu 18.04.sudo.mpich [Job failure permitted]" - if: type = cron - script: - - docker build -f precice/Dockerfile.Ubuntu1804.sudo.mpich -t $DOCKER_USERNAME/precice-ubuntu1804.sudo.mpich-develop . - deploy: - skip_cleanup: true - provider: script - on: - all_branches: true - script: >- - echo "$DOCKER_PASSWORD" | docker login -u $DOCKER_USERNAME --password-stdin && - docker push $DOCKER_USERNAME/precice-ubuntu1804.sudo.mpich-develop:latest - - - stage: Building preCICE - name: "Ubuntu 18.04.package" - if: fork = false - script: - - docker build -f precice/Dockerfile.Ubuntu1804.package -t $DOCKER_USERNAME/precice-ubuntu1804.package-develop . - deploy: - skip_cleanup: true - provider: script - on: - all_branches: true - script: >- - echo "$DOCKER_PASSWORD" | docker login -u $DOCKER_USERNAME --password-stdin && - docker push $DOCKER_USERNAME/precice-ubuntu1804.package-develop - - - name: "[Build preCICE on fork] Using cached version" - if: fork = true - script: true - - - - stage: Building adapters name: SU2 adapter if: fork = false From 66006edb462d39d29d5a3b92abeaa28e7fe7d226 Mon Sep 17 00:00:00 2001 From: Konrad Eder Date: Tue, 11 Feb 2020 15:35:14 +0100 Subject: [PATCH 38/52] Print wmake.log --- adapters/Dockerfile.openfoam-adapter | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adapters/Dockerfile.openfoam-adapter b/adapters/Dockerfile.openfoam-adapter index 5acb4054a..34c38b45f 100644 --- a/adapters/Dockerfile.openfoam-adapter +++ b/adapters/Dockerfile.openfoam-adapter @@ -23,5 +23,5 @@ WORKDIR /home/precice ARG branch=develop RUN git clone --branch $branch https://github.com/precice/openfoam-adapter.git WORKDIR /home/precice/openfoam-adapter -RUN . /opt/openfoam4/etc/bashrc && ./Allwmake +RUN . /opt/openfoam4/etc/bashrc && ./Allwmake; cat wmake.log RUN cd $HOME && mkdir -p Data/Input Data/Output Data/Exchange From 6ee7bcf35330015e6c9ebf1fa8c5fa65f5f9231d Mon Sep 17 00:00:00 2001 From: BenjaminRueth Date: Wed, 12 Feb 2020 13:51:35 +0100 Subject: [PATCH 39/52] remove depolyment for tests --- .travis.yml | 54 ----------------------------------------------------- 1 file changed, 54 deletions(-) diff --git a/.travis.yml b/.travis.yml index b1195ca3e..be39d7359 100644 --- a/.travis.yml +++ b/.travis.yml @@ -230,105 +230,51 @@ jobs: - python system_testing.py -s su2-ccx after_failure: - python push.py -t su2-ccx - deploy: - skip_cleanup: true - provider: script - on: - all_branches: true - script: python push.py -s -t su2-ccx - name: "[16.04] OpenFOAM <-> OpenFOAM" script: - python system_testing.py -s of-of after_failure: - python push.py -t of-of - deploy: - skip_cleanup: true - provider: script - on: - all_branches: true - script: python push.py -s -t of-of - name: "[16.04] Calculix <-> OpenFOAM" script: - python system_testing.py -s of-ccx after_failure: - python push.py -t of-ccx - deploy: - skip_cleanup: true - provider: script - on: - all_branches: true - script: python push.py -s -t of-ccx - name: "[18.04] FEniCS <-> FEniCS" script: - python system_testing.py -s fe-fe --base Ubuntu1804.home after_failure: - python push.py -t fe-fe --base Ubuntu1804.home - deploy: - skip_cleanup: true - provider: script - on: - all_branches: true - script: python push.py -s -t fe-fe --base Ubuntu1804.home - name: "[16.04] Bindings/Solverdummies" script: - python system_testing.py -s bindings after_failure: - python push.py -t bindings - deploy: - skip_cleanup: true - provider: script - on: - all_branches: true - script: python push.py -s -t bindings - name: "[16.04] deal.ii <-> OpenFOAM" script: - python system_testing.py -s dealii-of after_failure: - python push.py -t dealii-of - deploy: - skip_cleanup: true - provider: script - on: - all_branches: true - script: python push.py -s -t dealii-of - name: "[18.04] nutils <-> OpenFOAM" script: - python system_testing.py -s nutils-of --base Ubuntu1804.home after_failure: - python push.py -t nutils-of --base Ubuntu1804.home - deploy: - skip_cleanup: true - provider: script - on: - all_branches: true - script: python push.py -s -t nutils-of --base Ubuntu1804.home - name: "[16.04] OpenFOAM <-> OpenFOAM [nearest projection]" script: - python system_testing.py -s of-of_np after_failure: - python push.py -t of-of_np - deploy: - skip_cleanup: true - provider: script - on: - all_branches: true - script: python push.py -s -t of-of_np - name: "[16.04 PETSc] OpenFOAM <-> CalculiX [FSI] [Job failure permitted]" script: - python system_testing.py -s of-ccx_fsi --base Ubuntu1604.home.PETSc after_failure: - python push.py -t of-ccx_fsi - deploy: - skip_cleanup: true - provider: script - on: - all_branches: true - script: python push.py -s -t of-ccx_fsi From bf822e9e3bab5af0b17d66f364ca8655fc5c2797 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20R=C3=BCth?= Date: Wed, 12 Feb 2020 13:58:52 +0100 Subject: [PATCH 40/52] Use --branch option for all tests --- .travis.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index dcb70ed08..63a3003ae 100644 --- a/.travis.yml +++ b/.travis.yml @@ -255,7 +255,7 @@ jobs: - stage: Tests name: "[16.04] SU2 <-> Calculix" script: - - python system_testing.py -s su2-ccx + - python system_testing.py -s su2-ccx --branch $TRAVIS_BRANCH after_failure: - python push.py -t su2-ccx deploy: @@ -267,7 +267,7 @@ jobs: - name: "[16.04] OpenFOAM <-> OpenFOAM" script: - - python system_testing.py -s of-of + - python system_testing.py -s of-of --branch $TRAVIS_BRANCH after_failure: - python push.py -t of-of deploy: @@ -279,7 +279,7 @@ jobs: - name: "[16.04] Calculix <-> OpenFOAM" script: - - python system_testing.py -s of-ccx + - python system_testing.py -s of-ccx --branch $TRAVIS_BRANCH after_failure: - python push.py -t of-ccx deploy: @@ -291,7 +291,7 @@ jobs: - name: "[18.04] FEniCS <-> FEniCS" script: - - python system_testing.py -s fe-fe --base Ubuntu1804.home + - python system_testing.py -s fe-fe --base Ubuntu1804.home --branch $TRAVIS_BRANCH after_failure: - python push.py -t fe-fe --base Ubuntu1804.home deploy: @@ -303,7 +303,7 @@ jobs: - name: "[16.04] Bindings/Solverdummies" script: - - python system_testing.py -s bindings + - python system_testing.py -s bindings --branch $TRAVIS_BRANCH after_failure: - python push.py -t bindings deploy: @@ -315,7 +315,7 @@ jobs: - name: "[16.04] deal.ii <-> OpenFOAM" script: - - python system_testing.py -s dealii-of + - python system_testing.py -s dealii-of --branch $TRAVIS_BRANCH after_failure: - python push.py -t dealii-of deploy: @@ -327,7 +327,7 @@ jobs: - name: "[18.04] nutils <-> OpenFOAM" script: - - python system_testing.py -s nutils-of --base Ubuntu1804.home + - python system_testing.py -s nutils-of --base Ubuntu1804.home --branch $TRAVIS_BRANCH after_failure: - python push.py -t nutils-of --base Ubuntu1804.home deploy: @@ -339,7 +339,7 @@ jobs: - name: "[16.04] OpenFOAM <-> OpenFOAM [nearest projection]" script: - - python system_testing.py -s of-of_np + - python system_testing.py -s of-of_np --branch $TRAVIS_BRANCH after_failure: - python push.py -t of-of_np deploy: @@ -351,7 +351,7 @@ jobs: - name: "[16.04 PETSc] OpenFOAM <-> CalculiX [FSI] [Job failure permitted]" script: - - python system_testing.py -s of-ccx_fsi --base Ubuntu1604.home.PETSc + - python system_testing.py -s of-ccx_fsi --base Ubuntu1604.home.PETSc --branch $TRAVIS_BRANCH after_failure: - python push.py -t of-ccx_fsi deploy: From d0c4f4e5b209f780eb2548594a6aad2b5abdce84 Mon Sep 17 00:00:00 2001 From: BenjaminRueth Date: Sat, 22 Feb 2020 12:57:22 +0100 Subject: [PATCH 41/52] Add jinja2 (accidentally removed in merge) --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index cc3394c12..eebe1f791 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,8 @@ python: - "3.5" services: - docker +install: + - pip install Jinja2 jobs: allow_failures: From 29ba3208a0883ed0a66b22ae8f23fe49b8678fe9 Mon Sep 17 00:00:00 2001 From: BenjaminRueth Date: Sat, 22 Feb 2020 13:00:31 +0100 Subject: [PATCH 42/52] Revert changes applied to reference output --- .../referenceOutput/Fluid/system/preciceDict | 2 +- .../OpenFOAM/system/preciceDict | 33 ------------------- .../Inner-Fluid/system/preciceDict | 2 +- .../Outer-Fluid/system/preciceDict | 2 +- .../referenceOutput/Fluid/system/preciceDict | 2 +- .../referenceOutput/Solid/system/preciceDict | 2 +- .../referenceOutput/Fluid/system/preciceDict | 2 +- .../referenceOutput/Solid/system/preciceDict | 2 +- 8 files changed, 7 insertions(+), 40 deletions(-) delete mode 100644 tests/TestCompose_nutils-of.Ubuntu1804/referenceOutput/OpenFOAM/system/preciceDict diff --git a/tests/TestCompose_dealii-of.Ubuntu1604.home/referenceOutput/Fluid/system/preciceDict b/tests/TestCompose_dealii-of.Ubuntu1604.home/referenceOutput/Fluid/system/preciceDict index fb8c60326..9de5f3a9a 100644 --- a/tests/TestCompose_dealii-of.Ubuntu1604.home/referenceOutput/Fluid/system/preciceDict +++ b/tests/TestCompose_dealii-of.Ubuntu1604.home/referenceOutput/Fluid/system/preciceDict @@ -51,4 +51,4 @@ interfaces FSI { rho rho [1 -3 0 0 0 0 0] 1; -} +} \ No newline at end of file diff --git a/tests/TestCompose_nutils-of.Ubuntu1804/referenceOutput/OpenFOAM/system/preciceDict b/tests/TestCompose_nutils-of.Ubuntu1804/referenceOutput/OpenFOAM/system/preciceDict deleted file mode 100644 index 9c1ae2481..000000000 --- a/tests/TestCompose_nutils-of.Ubuntu1804/referenceOutput/OpenFOAM/system/preciceDict +++ /dev/null @@ -1,33 +0,0 @@ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "system"; - object preciceDict; -} - -preciceConfig "../precice-config.xml"; - -participant OpenFOAM; - -modules (CHT); - -interfaces -{ - Interface1 - { - mesh OpenFOAM-Mesh; - patches (interface); - - readData - ( - Heat-Flux - ); - - writeData - ( - Temperature - ); - }; -}; diff --git a/tests/TestCompose_of-ccx.Ubuntu1604.home/referenceOutput/Inner-Fluid/system/preciceDict b/tests/TestCompose_of-ccx.Ubuntu1604.home/referenceOutput/Inner-Fluid/system/preciceDict index 13d2409cc..4004345f9 100644 --- a/tests/TestCompose_of-ccx.Ubuntu1604.home/referenceOutput/Inner-Fluid/system/preciceDict +++ b/tests/TestCompose_of-ccx.Ubuntu1604.home/referenceOutput/Inner-Fluid/system/preciceDict @@ -32,4 +32,4 @@ interfaces Heat-Transfer-Coefficient-Inner-Fluid ); }; -}; +}; \ No newline at end of file diff --git a/tests/TestCompose_of-ccx.Ubuntu1604.home/referenceOutput/Outer-Fluid/system/preciceDict b/tests/TestCompose_of-ccx.Ubuntu1604.home/referenceOutput/Outer-Fluid/system/preciceDict index 546e45ef2..27d9a2dc7 100644 --- a/tests/TestCompose_of-ccx.Ubuntu1604.home/referenceOutput/Outer-Fluid/system/preciceDict +++ b/tests/TestCompose_of-ccx.Ubuntu1604.home/referenceOutput/Outer-Fluid/system/preciceDict @@ -32,4 +32,4 @@ interfaces Heat-Transfer-Coefficient-Outer-Fluid ); }; -}; +}; \ No newline at end of file diff --git a/tests/TestCompose_of-of.Ubuntu1604.home/referenceOutput/Fluid/system/preciceDict b/tests/TestCompose_of-of.Ubuntu1604.home/referenceOutput/Fluid/system/preciceDict index c434cccd0..300b04c04 100644 --- a/tests/TestCompose_of-of.Ubuntu1604.home/referenceOutput/Fluid/system/preciceDict +++ b/tests/TestCompose_of-of.Ubuntu1604.home/referenceOutput/Fluid/system/preciceDict @@ -30,4 +30,4 @@ interfaces Temperature ); }; -}; +}; \ No newline at end of file diff --git a/tests/TestCompose_of-of.Ubuntu1604.home/referenceOutput/Solid/system/preciceDict b/tests/TestCompose_of-of.Ubuntu1604.home/referenceOutput/Solid/system/preciceDict index 8bee12293..f235ab952 100644 --- a/tests/TestCompose_of-of.Ubuntu1604.home/referenceOutput/Solid/system/preciceDict +++ b/tests/TestCompose_of-of.Ubuntu1604.home/referenceOutput/Solid/system/preciceDict @@ -35,4 +35,4 @@ interfaces CHT { k [ 1 1 -3 -1 0 0 0 ] 100; -}; +}; \ No newline at end of file diff --git a/tests/TestCompose_of-of_np.Ubuntu1604.home/referenceOutput/Fluid/system/preciceDict b/tests/TestCompose_of-of_np.Ubuntu1604.home/referenceOutput/Fluid/system/preciceDict index 4696531cd..95d606d7d 100644 --- a/tests/TestCompose_of-of_np.Ubuntu1604.home/referenceOutput/Fluid/system/preciceDict +++ b/tests/TestCompose_of-of_np.Ubuntu1604.home/referenceOutput/Fluid/system/preciceDict @@ -48,4 +48,4 @@ interfaces Temperature ); }; -}; +}; \ No newline at end of file diff --git a/tests/TestCompose_of-of_np.Ubuntu1604.home/referenceOutput/Solid/system/preciceDict b/tests/TestCompose_of-of_np.Ubuntu1604.home/referenceOutput/Solid/system/preciceDict index 8f49ba5bc..24b3aabae 100644 --- a/tests/TestCompose_of-of_np.Ubuntu1604.home/referenceOutput/Solid/system/preciceDict +++ b/tests/TestCompose_of-of_np.Ubuntu1604.home/referenceOutput/Solid/system/preciceDict @@ -53,4 +53,4 @@ interfaces CHT { k [ 1 1 -3 -1 0 0 0 ] 100; -}; +}; \ No newline at end of file From 67bbdcfb548a75e88abd34105400a53d3a9e2062 Mon Sep 17 00:00:00 2001 From: BenjaminRueth Date: Sat, 22 Feb 2020 13:06:05 +0100 Subject: [PATCH 43/52] Reintroduce changes from #147 (accidentally removed in merge) --- .travis.yml | 66 +---------------------------------------------------- 1 file changed, 1 insertion(+), 65 deletions(-) diff --git a/.travis.yml b/.travis.yml index eebe1f791..42b818d86 100644 --- a/.travis.yml +++ b/.travis.yml @@ -250,107 +250,43 @@ jobs: name: "[16.04] SU2 <-> Calculix" script: - python system_testing.py -s su2-ccx --branch $TRAVIS_BRANCH - after_failure: - python push.py -t su2-ccx - deploy: - skip_cleanup: true - provider: script - on: - all_branches: true - script: python push.py -s -t su2-ccx - name: "[16.04] OpenFOAM <-> OpenFOAM" script: - python system_testing.py -s of-of --branch $TRAVIS_BRANCH - after_failure: - python push.py -t of-of - deploy: - skip_cleanup: true - provider: script - on: - all_branches: true - script: python push.py -s -t of-of - name: "[16.04] Calculix <-> OpenFOAM" script: - python system_testing.py -s of-ccx --branch $TRAVIS_BRANCH - after_failure: - python push.py -t of-ccx - deploy: - skip_cleanup: true - provider: script - on: - all_branches: true - script: python push.py -s -t of-ccx - name: "[18.04] FEniCS <-> FEniCS" script: - python system_testing.py -s fe-fe --base Ubuntu1804.home --branch $TRAVIS_BRANCH - after_failure: - python push.py -t fe-fe --base Ubuntu1804.home - deploy: - skip_cleanup: true - provider: script - on: - all_branches: true - script: python push.py -s -t fe-fe --base Ubuntu1804.home - name: "[16.04] Bindings/Solverdummies" script: - python system_testing.py -s bindings --branch $TRAVIS_BRANCH - after_failure: - python push.py -t bindings - deploy: - skip_cleanup: true - provider: script - on: - all_branches: true - script: python push.py -s -t bindings - name: "[16.04] deal.ii <-> OpenFOAM" script: - python system_testing.py -s dealii-of --branch $TRAVIS_BRANCH - after_failure: - python push.py -t dealii-of - deploy: - skip_cleanup: true - provider: script - on: - all_branches: true - script: python push.py -s -t dealii-of - name: "[18.04] nutils <-> OpenFOAM" script: - python system_testing.py -s nutils-of --base Ubuntu1804.home --branch $TRAVIS_BRANCH - after_failure: - python push.py -t nutils-of --base Ubuntu1804.home - deploy: - skip_cleanup: true - provider: script - on: - all_branches: true - script: python push.py -s -t nutils-of --base Ubuntu1804.home - name: "[16.04] OpenFOAM <-> OpenFOAM [nearest projection]" script: - python system_testing.py -s of-of_np --branch $TRAVIS_BRANCH - after_failure: - - python push.py -t of-of_np - deploy: - skip_cleanup: true - provider: script - on: - all_branches: true - script: python push.py -s -t of-of_np - name: "[16.04 PETSc] OpenFOAM <-> CalculiX [FSI] [Job failure permitted]" script: - python system_testing.py -s of-ccx_fsi --base Ubuntu1604.home.PETSc --branch $TRAVIS_BRANCH - after_failure: - - python push.py -t of-ccx_fsi - deploy: - skip_cleanup: true - provider: script - on: - all_branches: true - script: python push.py -s -t of-ccx_fsi + - python push.py -t of-ccx_fsi --petsc From e38e2bf60cbe9921c57889a01bae3154ca5c5b42 Mon Sep 17 00:00:00 2001 From: BenjaminRueth Date: Sat, 22 Feb 2020 13:07:08 +0100 Subject: [PATCH 44/52] Remove libyaml-cpp-dev --- adapters/Dockerfile.openfoam-adapter | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/adapters/Dockerfile.openfoam-adapter b/adapters/Dockerfile.openfoam-adapter index c872d55ae..9ddfff1ef 100644 --- a/adapters/Dockerfile.openfoam-adapter +++ b/adapters/Dockerfile.openfoam-adapter @@ -9,8 +9,7 @@ ENV USER=root # Install dependecies RUN apt-get -qq update && apt-get -qq install \ software-properties-common \ - wget apt-transport-https \ - libyaml-cpp-dev && \ + wget apt-transport-https && \ rm -rf /var/lib/apt/lists/* ARG CACHEBUST From 6463c103d355faab80e87aed907e855c5fbf2fb7 Mon Sep 17 00:00:00 2001 From: BenjaminRueth Date: Sat, 22 Feb 2020 13:08:21 +0100 Subject: [PATCH 45/52] Add missing line --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 42b818d86..924c6ecc8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -285,6 +285,7 @@ jobs: - name: "[16.04] OpenFOAM <-> OpenFOAM [nearest projection]" script: - python system_testing.py -s of-of_np --branch $TRAVIS_BRANCH + - python push.py -t of-of_np - name: "[16.04 PETSc] OpenFOAM <-> CalculiX [FSI] [Job failure permitted]" script: From 56839a2b1b0d2fe311d43337a484673690abef95 Mon Sep 17 00:00:00 2001 From: BenjaminRueth Date: Sat, 22 Feb 2020 17:42:03 +0100 Subject: [PATCH 46/52] Add --docker-username to system_testing.py to define SYSTEST_REMOTE --- system_testing.py | 27 ++++++++++--------- .../.env | 1 - tests/TestCompose_fe-fe.Ubuntu1804.home/.env | 1 - .../.env | 1 - tests/TestCompose_of-ccx.Ubuntu1604.home/.env | 2 -- .../.env | 1 - tests/TestCompose_of-of.Ubuntu1604.home/.env | 1 - .../TestCompose_of-of_np.Ubuntu1604.home/.env | 1 - .../TestCompose_su2-ccx.Ubuntu1604.home/.env | 1 - 9 files changed, 14 insertions(+), 22 deletions(-) diff --git a/system_testing.py b/system_testing.py index 787f6720e..123763f74 100644 --- a/system_testing.py +++ b/system_testing.py @@ -17,16 +17,16 @@ from subprocess import CalledProcessError from common import call, ccall, get_test_variants, filter_tests, get_test_participants -def build(systest, tag, branch, local, force_rebuild): +def build(systest, tag, branch, docker_username, local, force_rebuild): """ Builds a docker image for systest. """ - baseimage_name = "precice-{tag}-{branch}:latest".format(tag = tag, branch=branch) + baseimage_name = "precice-{tag}-{branch}:latest".format(tag=tag, branch=branch) test_tag = "-".join([systest, tag, branch]) docker.build_image(tag = test_tag, build_args = {"from" : docker.get_namespace() + baseimage_name if local - else 'precice/' + baseimage_name}, + else docker_username + '/' + baseimage_name}, force_rebuild = force_rebuild) def run(systest, tag, branch): @@ -37,14 +37,14 @@ def run(systest, tag, branch): shutil.rmtree("Logs", ignore_errors=True) ccall("docker cp " + test_tag + ":Output . ") -def build_adapters(systest, tag, branch, local, force_rebuild): +def build_adapters(systest, tag, branch, local, docker_username, force_rebuild): """ Builds a docker images for a preCICE adapter, participating in tests """ baseimage_name = "precice-{tag}-{branch}:latest".format(tag = tag, branch=branch) participants = get_test_participants(systest) docker_args = { 'tag': '', 'build_args': {"from": docker.get_namespace() + baseimage_name if local - else 'precice/' + baseimage_name }, + else docker_username + '/' + baseimage_name }, 'force_rebuild': force_rebuild, 'dockerfile': 'Dockerfile'} @@ -58,7 +58,7 @@ def build_adapters(systest, tag, branch, local, force_rebuild): if os.path.exists("Dockerfile.{}".format(participant)): docker.build_image(**docker_args) -def run_compose(systest, branch, local, tag, force_rebuild, rm_all=False, verbose=False): +def run_compose(systest, branch, docker_username, local, tag, force_rebuild, rm_all=False, verbose=False): """ Runs necessary systemtest with docker compose """ test_dirname = "TestCompose_{systest}".format(systest = systest) @@ -69,7 +69,7 @@ def run_compose(systest, branch, local, tag, force_rebuild, rm_all=False, verbos # set up environment variables, to detect precice base image, that we # should run with and docker images location export_cmd = "export PRECICE_BASE=-{}; ".format(adapter_base_name) - extra_cmd = "export SYSTEST_REMOTE={}; ".format(docker.get_namespace()) if local else "" + extra_cmd = "export SYSTEST_REMOTE={}; ".format(docker.get_namespace() if local else docker_username + "/") compose_config_cmd = "docker-compose config && " compose_exec_cmd = "bash ../../silent_compose.sh {}".format('debug' if verbose else "") copy_cmd = "docker cp tutorial-data:/Output ." @@ -159,22 +159,22 @@ def comparison(pathToRef, pathToOutput): sys.exit(0) -def build_run_compare(test, tag, branch, local_precice, force_rebuild, rm_all=False, verbose=False): +def build_run_compare(test, tag, branch, docker_username, local_precice, force_rebuild, rm_all=False, verbose=False): """ Runs and compares test, using precice branch. """ compose_tests = ["dealii-of", "of-of", "su2-ccx", "of-ccx", "of-of_np", "fe-fe","nutils-of", "of-ccx_fsi"] test_basename = test.split(".")[0] if local_precice: - build_adapters(test_basename, tag, branch, local_precice, force_rebuild) + build_adapters(test_basename, tag, branch, docker_username, local_precice, force_rebuild) if test_basename in compose_tests: - run_compose(test, branch, local_precice, tag, force_rebuild, rm_all, verbose) + run_compose(test, branch, docker_username, local_precice, tag, force_rebuild, rm_all, verbose) else: # remaining, non-compose tests test_dirname = "Test_{systest}".format(systest=test) test_path = os.path.join(os.getcwd(), 'tests', test_dirname) with common.chdir(test_path): # Build - build(test_basename, tag, branch, local_precice, force_rebuild) + build(test_basename, tag, branch, docker_username, local_precice, force_rebuild) run(test_basename, tag, branch) # Preparing string for path pathToRef = os.path.join(os.getcwd(), "referenceOutput") @@ -225,7 +225,8 @@ def compose_tag(docker_username, base, features, branch): parser.add_argument('-l', '--local', action='store_true', help="Use local preCICE image (default: use remote image)") parser.add_argument('-s', '--systemtest', type=str, help="Choose system tests you want to use", choices = common.get_tests(), required = True) - parser.add_argument('-b', '--branch', help="preCICE branch to use", default=os.environ["TRAVIS_BRANCH"] if os.environ["TRAVIS_PULL_REQUEST"] == "false" else os.environ["TRAVIS_PULL_REQUEST_BRANCH"]) # make sure that branch corresponding to system tests branch is used, if no branch is explicitly specified. If we are testing a pull request, make sure to test agains branch from which PR originated. + parser.add_argument('-b', '--branch', help="preCICE branch to use", default=os.environ["TRAVIS_BRANCH"] if ("TRAVIS_BRANCH" in os.environ and os.environ["TRAVIS_PULL_REQUEST"] == "false") else (os.environ["TRAVIS_PULL_REQUEST_BRANCH"] if ("TRAVIS_PULL_REQUEST_BRANCH" in os.environ) else "develop")) # make sure that branch corresponding to system tests branch is used, if no branch is explicitly specified. If we are testing a pull request, make sure to test agains branch from which PR originated. + parser.add_argument('-u', '--docker-username', help="docker username", default=os.environ["DOCKER_USERNAME"] if "DOCKER_USERNAME" in os.environ else "precice") parser.add_argument('-f', '--force_rebuild', nargs='+', help="Force rebuild of variable parts of docker image", default = [], choices = ["precice", "tests"]) parser.add_argument('--base', type=str,help="Base preCICE image to use", @@ -241,5 +242,5 @@ def compose_tag(docker_username, base, features, branch): else: test = test[0] tag = args.base.lower() - build_run_compare(test, tag, args.branch.lower(), args.local, + build_run_compare(test, tag, args.branch.lower(), args.docker_username, args.local, args.force_rebuild, rm_all=False, verbose=args.verbose) diff --git a/tests/TestCompose_dealii-of.Ubuntu1604.home/.env b/tests/TestCompose_dealii-of.Ubuntu1604.home/.env index 14870797b..5763dd8c5 100644 --- a/tests/TestCompose_dealii-of.Ubuntu1604.home/.env +++ b/tests/TestCompose_dealii-of.Ubuntu1604.home/.env @@ -1,4 +1,3 @@ OPENFOAM_TAG=latest DEALII_TAG=latest -SYSTEST_REMOTE=precice/ PRECICE_BASE= diff --git a/tests/TestCompose_fe-fe.Ubuntu1804.home/.env b/tests/TestCompose_fe-fe.Ubuntu1804.home/.env index 988195074..91ddd0deb 100644 --- a/tests/TestCompose_fe-fe.Ubuntu1804.home/.env +++ b/tests/TestCompose_fe-fe.Ubuntu1804.home/.env @@ -1,3 +1,2 @@ FENICS_TAG=latest -SYSTEST_REMOTE=precice/ PRECICE_BASE= diff --git a/tests/TestCompose_nutils-of.Ubuntu1804.home/.env b/tests/TestCompose_nutils-of.Ubuntu1804.home/.env index eff569fc5..ca8619f65 100644 --- a/tests/TestCompose_nutils-of.Ubuntu1804.home/.env +++ b/tests/TestCompose_nutils-of.Ubuntu1804.home/.env @@ -1,3 +1,2 @@ OPENFOAM_TAG=latest -SYSTEST_REMOTE=precice/ PRECICE_BASE= diff --git a/tests/TestCompose_of-ccx.Ubuntu1604.home/.env b/tests/TestCompose_of-ccx.Ubuntu1604.home/.env index 22dc4f245..ed2c8fdeb 100644 --- a/tests/TestCompose_of-ccx.Ubuntu1604.home/.env +++ b/tests/TestCompose_of-ccx.Ubuntu1604.home/.env @@ -1,5 +1,3 @@ OPENFOAM_TAG=latest CALCULIX_TAG=latest -SYSTEST_REMOTE=precice/ - PRECICE_BASE= diff --git a/tests/TestCompose_of-ccx_fsi.Ubuntu1604.home.PETSc/.env b/tests/TestCompose_of-ccx_fsi.Ubuntu1604.home.PETSc/.env index 594d0464c..ed2c8fdeb 100644 --- a/tests/TestCompose_of-ccx_fsi.Ubuntu1604.home.PETSc/.env +++ b/tests/TestCompose_of-ccx_fsi.Ubuntu1604.home.PETSc/.env @@ -1,4 +1,3 @@ OPENFOAM_TAG=latest CALCULIX_TAG=latest -SYSTEST_REMOTE=precice/ PRECICE_BASE= diff --git a/tests/TestCompose_of-of.Ubuntu1604.home/.env b/tests/TestCompose_of-of.Ubuntu1604.home/.env index eff569fc5..ca8619f65 100644 --- a/tests/TestCompose_of-of.Ubuntu1604.home/.env +++ b/tests/TestCompose_of-of.Ubuntu1604.home/.env @@ -1,3 +1,2 @@ OPENFOAM_TAG=latest -SYSTEST_REMOTE=precice/ PRECICE_BASE= diff --git a/tests/TestCompose_of-of_np.Ubuntu1604.home/.env b/tests/TestCompose_of-of_np.Ubuntu1604.home/.env index eff569fc5..ca8619f65 100644 --- a/tests/TestCompose_of-of_np.Ubuntu1604.home/.env +++ b/tests/TestCompose_of-of_np.Ubuntu1604.home/.env @@ -1,3 +1,2 @@ OPENFOAM_TAG=latest -SYSTEST_REMOTE=precice/ PRECICE_BASE= diff --git a/tests/TestCompose_su2-ccx.Ubuntu1604.home/.env b/tests/TestCompose_su2-ccx.Ubuntu1604.home/.env index 1953e4e18..ee614e268 100644 --- a/tests/TestCompose_su2-ccx.Ubuntu1604.home/.env +++ b/tests/TestCompose_su2-ccx.Ubuntu1604.home/.env @@ -1,4 +1,3 @@ SU2_TAG=latest CALCULIX_TAG=latest -SYSTEST_REMOTE=precice/ PRECICE_BASE= From c0f47b62cc6555070b06f01226f364dcda3906cc Mon Sep 17 00:00:00 2001 From: BenjaminRueth Date: Sat, 22 Feb 2020 17:47:07 +0100 Subject: [PATCH 47/52] revert .travis.yml --- .travis.yml | 112 +++++++++++++++++++++++++++++++++------------------- 1 file changed, 71 insertions(+), 41 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9356c4262..fbae8a38b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,8 @@ python: - "3.5" services: - docker +install: + - pip install Jinja2 jobs: allow_failures: @@ -17,8 +19,9 @@ jobs: include: - stage: Building preCICE name: "Arch Linux" + if: fork = false script: - - python build_precice.py --dockerfile precice/Dockerfile.Arch --docker-username $DOCKER_USERNAME --branch $TRAVIS_BRANCH + - python build_precice.py --dockerfile precice/Dockerfile.Arch deploy: skip_cleanup: true provider: script @@ -26,12 +29,13 @@ jobs: all_branches: true script: >- echo $DOCKER_PASSWORD | docker login -u $DOCKER_USERNAME --password-stdin && - python push_precice.py --dockerfile precice/Dockerfile.Arch --docker-username $DOCKER_USERNAME --branch $TRAVIS_BRANCH + python push_precice.py --dockerfile precice/Dockerfile.Arch - stage: Building preCICE name: "Ubuntu 16.04 home" + if: fork = false script: - - python build_precice.py --dockerfile precice/Dockerfile.Ubuntu1604.home --docker-username $DOCKER_USERNAME --branch $TRAVIS_BRANCH + - python build_precice.py --dockerfile precice/Dockerfile.Ubuntu1604.home deploy: skip_cleanup: true provider: script @@ -39,12 +43,13 @@ jobs: all_branches: true script: >- echo $DOCKER_PASSWORD | docker login -u $DOCKER_USERNAME --password-stdin && - python push_precice.py --dockerfile precice/Dockerfile.Ubuntu1604.home --docker-username $DOCKER_USERNAME --branch $TRAVIS_BRANCH + python push_precice.py --dockerfile precice/Dockerfile.Ubuntu1604.home - stage: Building preCICE name: "Ubuntu 16.04 home PETSc [Job failure permitted]" + if: fork = false script: - - python build_precice.py --dockerfile precice/Dockerfile.Ubuntu1604.home --petsc yes --docker-username $DOCKER_USERNAME --branch $TRAVIS_BRANCH + - python build_precice.py --dockerfile precice/Dockerfile.Ubuntu1604.home --petsc yes deploy: skip_cleanup: true provider: script @@ -52,12 +57,13 @@ jobs: all_branches: true script: >- echo $DOCKER_PASSWORD | docker login -u $DOCKER_USERNAME --password-stdin && - python push_precice.py --dockerfile precice/Dockerfile.Ubuntu1604.home --petsc yes --docker-username $DOCKER_USERNAME --branch $TRAVIS_BRANCH + python push_precice.py --dockerfile precice/Dockerfile.Ubuntu1604.home --petsc yes - stage: Building preCICE name: "Ubuntu 16.04.sudo" + if: type = cron script: - - python build_precice.py --dockerfile precice/Dockerfile.Ubuntu1604.sudo --docker-username $DOCKER_USERNAME --branch $TRAVIS_BRANCH + - python build_precice.py --dockerfile precice/Dockerfile.Ubuntu1604.sudo deploy: skip_cleanup: true provider: script @@ -65,12 +71,13 @@ jobs: all_branches: true script: >- echo $DOCKER_PASSWORD | docker login -u $DOCKER_USERNAME --password-stdin && - python push_precice.py --dockerfile precice/Dockerfile.Ubuntu1604.sudo --docker-username $DOCKER_USERNAME --branch $TRAVIS_BRANCH + python push_precice.py --dockerfile precice/Dockerfile.Ubuntu1604.sudo - stage: Building preCICE name: "Ubuntu 18.04.home" + if: fork = false script: - - python build_precice.py --dockerfile precice/Dockerfile.Ubuntu1804.home --docker-username $DOCKER_USERNAME --branch $TRAVIS_BRANCH + - python build_precice.py --dockerfile precice/Dockerfile.Ubuntu1804.home deploy: skip_cleanup: true provider: script @@ -78,12 +85,13 @@ jobs: all_branches: true script: >- echo $DOCKER_PASSWORD | docker login -u $DOCKER_USERNAME --password-stdin && - python push_precice.py --dockerfile precice/Dockerfile.Ubuntu1804.home --docker-username $DOCKER_USERNAME --branch $TRAVIS_BRANCH + python push_precice.py --dockerfile precice/Dockerfile.Ubuntu1804.home - stage: Building preCICE name: "Ubuntu 18.04.sudo" + if: type = cron script: - - python build_precice.py --dockerfile precice/Dockerfile.Ubuntu1804.sudo --docker-username $DOCKER_USERNAME --branch $TRAVIS_BRANCH + - python build_precice.py --dockerfile precice/Dockerfile.Ubuntu1804.sudo deploy: skip_cleanup: true provider: script @@ -91,12 +99,13 @@ jobs: all_branches: true script: >- echo $DOCKER_PASSWORD | docker login -u $DOCKER_USERNAME --password-stdin && - python push_precice.py --dockerfile precice/Dockerfile.Ubuntu1804.sudo --docker-username $DOCKER_USERNAME --branch $TRAVIS_BRANCH + python push_precice.py --dockerfile precice/Dockerfile.Ubuntu1804.sudo - stage: Building preCICE name: "Ubuntu 18.04.sudo.mpich [Job failure permitted]" + if: type = cron script: - - python build_precice.py --dockerfile precice/Dockerfile.Ubuntu1804.sudo.mpich --docker-username $DOCKER_USERNAME --branch $TRAVIS_BRANCH + - python build_precice.py --dockerfile precice/Dockerfile.Ubuntu1804.sudo.mpich deploy: skip_cleanup: true provider: script @@ -104,12 +113,13 @@ jobs: all_branches: true script: >- echo $DOCKER_PASSWORD | docker login -u $DOCKER_USERNAME --password-stdin && - python push_precice.py --dockerfile precice/Dockerfile.Ubuntu1804.sudo.mpich --docker-username $DOCKER_USERNAME --branch $TRAVIS_BRANCH + python push_precice.py --dockerfile precice/Dockerfile.Ubuntu1804.sudo.mpich - stage: Building preCICE name: "Ubuntu 18.04.package" + if: fork = false script: - - python build_precice.py --dockerfile precice/Dockerfile.Ubuntu1804.package --docker-username $DOCKER_USERNAME --branch $TRAVIS_BRANCH + - python build_precice.py --dockerfile precice/Dockerfile.Ubuntu1804.package deploy: skip_cleanup: true provider: script @@ -117,12 +127,19 @@ jobs: all_branches: true script: >- echo $DOCKER_PASSWORD | docker login -u $DOCKER_USERNAME --password-stdin && - python push_precice.py --dockerfile precice/Dockerfile.Ubuntu1804.package --docker-username $DOCKER_USERNAME --branch $TRAVIS_BRANCH + python push_precice.py --dockerfile precice/Dockerfile.Ubuntu1804.package + + - name: "[Build preCICE on fork] Using cached version" + if: fork = true + script: true + + - stage: Building adapters name: SU2 adapter + if: fork = false script: - - python build_adapter.py --dockerfile adapters/Dockerfile.su2-adapter --operating-system ubuntu1604 --precice-installation home --docker-username $DOCKER_USERNAME --branch $TRAVIS_BRANCH + - python build_adapter.py --dockerfile adapters/Dockerfile.su2-adapter --operating-system ubuntu1604 --precice-installation home deploy: skip_cleanup: true provider: script @@ -130,11 +147,12 @@ jobs: all_branches: true script: >- echo $DOCKER_PASSWORD | docker login -u $DOCKER_USERNAME --password-stdin && - python push_adapter.py --dockerfile adapters/Dockerfile.su2-adapter --operating-system ubuntu1604 --precice-installation home --docker-username $DOCKER_USERNAME --branch $TRAVIS_BRANCH + python push_adapter.py --dockerfile adapters/Dockerfile.su2-adapter --operating-system ubuntu1604 --precice-installation home - name: CalculiX adapter + if: fork = false script: - - python build_adapter.py --dockerfile adapters/Dockerfile.calculix-adapter --operating-system ubuntu1604 --precice-installation home --docker-username $DOCKER_USERNAME --branch $TRAVIS_BRANCH + - python build_adapter.py --dockerfile adapters/Dockerfile.calculix-adapter --operating-system ubuntu1604 --precice-installation home deploy: skip_cleanup: true provider: script @@ -142,11 +160,12 @@ jobs: all_branches: true script: >- echo $DOCKER_PASSWORD | docker login -u $DOCKER_USERNAME --password-stdin && - python push_adapter.py --dockerfile adapters/Dockerfile.calculix-adapter --operating-system ubuntu1604 --precice-installation home --docker-username $DOCKER_USERNAME --branch $TRAVIS_BRANCH + python push_adapter.py --dockerfile adapters/Dockerfile.calculix-adapter --operating-system ubuntu1604 --precice-installation home - name: deal.ii adapter + if: fork = false script: - - python build_adapter.py --dockerfile adapters/Dockerfile.dealii-adapter --operating-system ubuntu1604 --precice-installation home --docker-username $DOCKER_USERNAME --branch $TRAVIS_BRANCH + - python build_adapter.py --dockerfile adapters/Dockerfile.dealii-adapter --operating-system ubuntu1604 --precice-installation home deploy: skip_cleanup: true provider: script @@ -154,11 +173,12 @@ jobs: all_branches: true script: >- echo $DOCKER_PASSWORD | docker login -u $DOCKER_USERNAME --password-stdin && - python push_adapter.py --dockerfile adapters/Dockerfile.dealii-adapter --operating-system ubuntu1604 --precice-installation home --docker-username $DOCKER_USERNAME --branch $TRAVIS_BRANCH + python push_adapter.py --dockerfile adapters/Dockerfile.dealii-adapter --operating-system ubuntu1604 --precice-installation home - name: "[16.04] openFOAM adapter" + if: fork = false script: - - python build_adapter.py --dockerfile adapters/Dockerfile.openfoam-adapter --operating-system ubuntu1604 --precice-installation home --docker-username $DOCKER_USERNAME --branch $TRAVIS_BRANCH + - python build_adapter.py --dockerfile adapters/Dockerfile.openfoam-adapter --operating-system ubuntu1604 --precice-installation home deploy: skip_cleanup: true provider: script @@ -166,11 +186,12 @@ jobs: all_branches: true script: >- echo $DOCKER_PASSWORD | docker login -u $DOCKER_USERNAME --password-stdin && - python push_adapter.py --dockerfile adapters/Dockerfile.openfoam-adapter --operating-system ubuntu1604 --precice-installation home --docker-username $DOCKER_USERNAME --branch $TRAVIS_BRANCH + python push_adapter.py --dockerfile adapters/Dockerfile.openfoam-adapter --operating-system ubuntu1604 --precice-installation home - name: "[18.04] openFOAM adapter" + if: fork = false script: - - python build_adapter.py --dockerfile adapters/Dockerfile.openfoam-adapter --operating-system ubuntu1804 --precice-installation home --docker-username $DOCKER_USERNAME --branch $TRAVIS_BRANCH + - python build_adapter.py --dockerfile adapters/Dockerfile.openfoam-adapter --operating-system ubuntu1804 --precice-installation home deploy: skip_cleanup: true provider: script @@ -178,11 +199,12 @@ jobs: all_branches: true script: >- echo $DOCKER_PASSWORD | docker login -u $DOCKER_USERNAME --password-stdin && - python push_adapter.py --dockerfile adapters/Dockerfile.openfoam-adapter --operating-system ubuntu1804 --precice-installation home --docker-username $DOCKER_USERNAME --branch $TRAVIS_BRANCH + python push_adapter.py --dockerfile adapters/Dockerfile.openfoam-adapter --operating-system ubuntu1804 --precice-installation home - name: FEniCS adapter + if: fork = false script: - - python build_adapter.py --dockerfile adapters/Dockerfile.fenics-adapter --operating-system ubuntu1804 --precice-installation home --docker-username $DOCKER_USERNAME --branch $TRAVIS_BRANCH + - python build_adapter.py --dockerfile adapters/Dockerfile.fenics-adapter --operating-system ubuntu1804 --precice-installation home deploy: skip_cleanup: true provider: script @@ -190,11 +212,12 @@ jobs: all_branches: true script: >- echo $DOCKER_PASSWORD | docker login -u $DOCKER_USERNAME --password-stdin && - python push_adapter.py --dockerfile adapters/Dockerfile.fenics-adapter --operating-system ubuntu1804 --precice-installation home --docker-username $DOCKER_USERNAME --branch $TRAVIS_BRANCH + python push_adapter.py --dockerfile adapters/Dockerfile.fenics-adapter --operating-system ubuntu1804 --precice-installation home - name: openFOAM adapter [PETSc] [Job failure permitted] + if: fork = false script: - - python build_adapter.py --dockerfile adapters/Dockerfile.openfoam-adapter --operating-system ubuntu1604 --precice-installation home --petsc yes --docker-username $DOCKER_USERNAME --branch $TRAVIS_BRANCH + - python build_adapter.py --dockerfile adapters/Dockerfile.openfoam-adapter --operating-system ubuntu1604 --precice-installation home --petsc yes deploy: skip_cleanup: true provider: script @@ -202,11 +225,12 @@ jobs: all_branches: true script: >- echo $DOCKER_PASSWORD | docker login -u $DOCKER_USERNAME --password-stdin && - python push_adapter.py --dockerfile adapters/Dockerfile.openfoam-adapter --operating-system ubuntu1604 --precice-installation home --petsc yes --docker-username $DOCKER_USERNAME --branch $TRAVIS_BRANCH + python push_adapter.py --dockerfile adapters/Dockerfile.openfoam-adapter --operating-system ubuntu1604 --precice-installation home --petsc yes - name: CalculiX adapter [PETSc] [Job failure permitted] + if: fork = false script: - - python build_adapter.py --dockerfile adapters/Dockerfile.calculix-adapter --operating-system ubuntu1604 --precice-installation home --petsc yes --docker-username $DOCKER_USERNAME --branch $TRAVIS_BRANCH + - python build_adapter.py --dockerfile adapters/Dockerfile.calculix-adapter --operating-system ubuntu1604 --precice-installation home --petsc yes deploy: skip_cleanup: true provider: script @@ -214,50 +238,56 @@ jobs: all_branches: true script: >- echo $DOCKER_PASSWORD | docker login -u $DOCKER_USERNAME --password-stdin && - python push_adapter.py --dockerfile adapters/Dockerfile.calculix-adapter --operating-system ubuntu1604 --precice-installation home --petsc yes --docker-username $DOCKER_USERNAME --branch $TRAVIS_BRANCH + python push_adapter.py --dockerfile adapters/Dockerfile.calculix-adapter --operating-system ubuntu1604 --precice-installation home --petsc yes + + - name: "[Build adapters on fork] Using cached version" + if: fork = true + script: true + + - stage: Tests name: "[16.04] SU2 <-> Calculix" script: - - python system_testing.py -s su2-ccx --branch $TRAVIS_BRANCH + - python system_testing.py -s su2-ccx - python push.py -t su2-ccx - name: "[16.04] OpenFOAM <-> OpenFOAM" script: - - python system_testing.py -s of-of --branch $TRAVIS_BRANCH + - python system_testing.py -s of-of - python push.py -t of-of - name: "[16.04] Calculix <-> OpenFOAM" script: - - python system_testing.py -s of-ccx --branch $TRAVIS_BRANCH + - python system_testing.py -s of-ccx - python push.py -t of-ccx - name: "[18.04] FEniCS <-> FEniCS" script: - - python system_testing.py -s fe-fe --base Ubuntu1804.home --branch $TRAVIS_BRANCH + - python system_testing.py -s fe-fe --base Ubuntu1804.home - python push.py -t fe-fe --base Ubuntu1804.home - name: "[16.04] Bindings/Solverdummies" script: - - python system_testing.py -s bindings --branch $TRAVIS_BRANCH + - python system_testing.py -s bindings - python push.py -t bindings - name: "[16.04] deal.ii <-> OpenFOAM" script: - - python system_testing.py -s dealii-of --branch $TRAVIS_BRANCH + - python system_testing.py -s dealii-of - python push.py -t dealii-of - name: "[18.04] nutils <-> OpenFOAM" script: - - python system_testing.py -s nutils-of --base Ubuntu1804.home --branch $TRAVIS_BRANCH + - python system_testing.py -s nutils-of --base Ubuntu1804.home - python push.py -t nutils-of --base Ubuntu1804.home - name: "[16.04] OpenFOAM <-> OpenFOAM [nearest projection]" script: - - python system_testing.py -s of-of_np --branch $TRAVIS_BRANCH + - python system_testing.py -s of-of_np - python push.py -t of-of_np - name: "[16.04 PETSc] OpenFOAM <-> CalculiX [FSI] [Job failure permitted]" script: - - python system_testing.py -s of-ccx_fsi --base Ubuntu1604.home.PETSc --branch $TRAVIS_BRANCH + - python system_testing.py -s of-ccx_fsi --base Ubuntu1604.home.PETSc - python push.py -t of-ccx_fsi --petsc From 65dfd83dd29398f5c5db6d9632e254d24a10bbef Mon Sep 17 00:00:00 2001 From: BenjaminRueth Date: Sun, 23 Feb 2020 14:18:18 +0100 Subject: [PATCH 48/52] Keep SYSTEST_REMOTE in .env files (will be used as default by docker-compose up) --- tests/TestCompose_dealii-of.Ubuntu1604.home/.env | 1 + tests/TestCompose_fe-fe.Ubuntu1804.home/.env | 1 + tests/TestCompose_nutils-of.Ubuntu1804.home/.env | 1 + tests/TestCompose_of-ccx.Ubuntu1604.home/.env | 2 ++ tests/TestCompose_of-ccx_fsi.Ubuntu1604.home.PETSc/.env | 1 + tests/TestCompose_of-of.Ubuntu1604.home/.env | 1 + tests/TestCompose_of-of_np.Ubuntu1604.home/.env | 1 + tests/TestCompose_su2-ccx.Ubuntu1604.home/.env | 1 + 8 files changed, 9 insertions(+) diff --git a/tests/TestCompose_dealii-of.Ubuntu1604.home/.env b/tests/TestCompose_dealii-of.Ubuntu1604.home/.env index 5763dd8c5..14870797b 100644 --- a/tests/TestCompose_dealii-of.Ubuntu1604.home/.env +++ b/tests/TestCompose_dealii-of.Ubuntu1604.home/.env @@ -1,3 +1,4 @@ OPENFOAM_TAG=latest DEALII_TAG=latest +SYSTEST_REMOTE=precice/ PRECICE_BASE= diff --git a/tests/TestCompose_fe-fe.Ubuntu1804.home/.env b/tests/TestCompose_fe-fe.Ubuntu1804.home/.env index 91ddd0deb..988195074 100644 --- a/tests/TestCompose_fe-fe.Ubuntu1804.home/.env +++ b/tests/TestCompose_fe-fe.Ubuntu1804.home/.env @@ -1,2 +1,3 @@ FENICS_TAG=latest +SYSTEST_REMOTE=precice/ PRECICE_BASE= diff --git a/tests/TestCompose_nutils-of.Ubuntu1804.home/.env b/tests/TestCompose_nutils-of.Ubuntu1804.home/.env index ca8619f65..eff569fc5 100644 --- a/tests/TestCompose_nutils-of.Ubuntu1804.home/.env +++ b/tests/TestCompose_nutils-of.Ubuntu1804.home/.env @@ -1,2 +1,3 @@ OPENFOAM_TAG=latest +SYSTEST_REMOTE=precice/ PRECICE_BASE= diff --git a/tests/TestCompose_of-ccx.Ubuntu1604.home/.env b/tests/TestCompose_of-ccx.Ubuntu1604.home/.env index ed2c8fdeb..22dc4f245 100644 --- a/tests/TestCompose_of-ccx.Ubuntu1604.home/.env +++ b/tests/TestCompose_of-ccx.Ubuntu1604.home/.env @@ -1,3 +1,5 @@ OPENFOAM_TAG=latest CALCULIX_TAG=latest +SYSTEST_REMOTE=precice/ + PRECICE_BASE= diff --git a/tests/TestCompose_of-ccx_fsi.Ubuntu1604.home.PETSc/.env b/tests/TestCompose_of-ccx_fsi.Ubuntu1604.home.PETSc/.env index ed2c8fdeb..594d0464c 100644 --- a/tests/TestCompose_of-ccx_fsi.Ubuntu1604.home.PETSc/.env +++ b/tests/TestCompose_of-ccx_fsi.Ubuntu1604.home.PETSc/.env @@ -1,3 +1,4 @@ OPENFOAM_TAG=latest CALCULIX_TAG=latest +SYSTEST_REMOTE=precice/ PRECICE_BASE= diff --git a/tests/TestCompose_of-of.Ubuntu1604.home/.env b/tests/TestCompose_of-of.Ubuntu1604.home/.env index ca8619f65..eff569fc5 100644 --- a/tests/TestCompose_of-of.Ubuntu1604.home/.env +++ b/tests/TestCompose_of-of.Ubuntu1604.home/.env @@ -1,2 +1,3 @@ OPENFOAM_TAG=latest +SYSTEST_REMOTE=precice/ PRECICE_BASE= diff --git a/tests/TestCompose_of-of_np.Ubuntu1604.home/.env b/tests/TestCompose_of-of_np.Ubuntu1604.home/.env index ca8619f65..eff569fc5 100644 --- a/tests/TestCompose_of-of_np.Ubuntu1604.home/.env +++ b/tests/TestCompose_of-of_np.Ubuntu1604.home/.env @@ -1,2 +1,3 @@ OPENFOAM_TAG=latest +SYSTEST_REMOTE=precice/ PRECICE_BASE= diff --git a/tests/TestCompose_su2-ccx.Ubuntu1604.home/.env b/tests/TestCompose_su2-ccx.Ubuntu1604.home/.env index ee614e268..1953e4e18 100644 --- a/tests/TestCompose_su2-ccx.Ubuntu1604.home/.env +++ b/tests/TestCompose_su2-ccx.Ubuntu1604.home/.env @@ -1,3 +1,4 @@ SU2_TAG=latest CALCULIX_TAG=latest +SYSTEST_REMOTE=precice/ PRECICE_BASE= From 7259fcb1bf48284f089683ff8729d24397e8baaa Mon Sep 17 00:00:00 2001 From: BenjaminRueth Date: Sun, 23 Feb 2020 15:02:59 +0100 Subject: [PATCH 49/52] Fix generate_test.py w.r.t PRECICE_BASE in .env --- generate_test.py | 5 +++++ templates/{ => test_template}/.env.jinja | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) rename templates/{ => test_template}/.env.jinja (76%) diff --git a/generate_test.py b/generate_test.py index 3961536c4..53f8ff776 100644 --- a/generate_test.py +++ b/generate_test.py @@ -15,6 +15,7 @@ def generate_test_structure(test_name = None, base_image = None, solvers = [ a.replace('-adapter','') for a in adapters ] participants = [ p.replace(':','_') for p in participants] input_volumes = ['input_' + p for p in participants] + precice_base = '-' + base_image.lower() + '-develop' # to pass zip to jinja zipped_input = zip(participants, solvers, adapters) @@ -23,6 +24,10 @@ def generate_test_structure(test_name = None, base_image = None, for tmp_file in tmp_files: with open(os.path.join('templates','test_template', tmp_file)) as f: tmp = Template(f.read()) + print("###") + print(f) + print(tmp.render(locals())) + print("###") renders[tmp_file.replace('.jinja', '')] = tmp.render(locals()) otp_dir = os.path.join('tests', "TestCompose_{test}.{base}".format(test = diff --git a/templates/.env.jinja b/templates/test_template/.env.jinja similarity index 76% rename from templates/.env.jinja rename to templates/test_template/.env.jinja index b360d7e01..95190ac80 100644 --- a/templates/.env.jinja +++ b/templates/test_template/.env.jinja @@ -3,4 +3,4 @@ {%- endfor %} SYSTEST_REMOTE=precice/ -PRECICE_BASE= +PRECICE_BASE={{precice_base}} From 74dd0cdb51ba80dc733996200676b7cb76b1f049 Mon Sep 17 00:00:00 2001 From: BenjaminRueth Date: Sun, 23 Feb 2020 15:03:24 +0100 Subject: [PATCH 50/52] Extend documentation with respect to environment variables and running tests --- docs/architecture.md | 20 +++++++++++++++++--- system_testing.py | 4 ++-- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/docs/architecture.md b/docs/architecture.md index c9857444c..0485f0621 100644 --- a/docs/architecture.md +++ b/docs/architecture.md @@ -51,10 +51,9 @@ All adapters are built using user `precice` with `gid` and `uid` equal to 1000 ( This is done to ensure consistent user rights for writing and reading from mounted directories without a need to use root user on the host system. Running root within container will work, but will lead to output directory being owned by root on host. Running with different users in different directories will cause problems with access to e.g. `/home/precice/Data/Exchange` directory. More information and motivation behind the solution can be found [this blogs post](https://medium.com/@nielssj/docker-volumes-and-file-system-permissions-772c1aee23ca) and [this issue](https://github.com/moby/moby/issues/2259). -## Running tests +## The tests -At this stage, we spawn containers with the necessary solvers for the simulation. The execution is controlled using [docker-compose](https://docs.docker.com/compose/). Separate volumes are created for the input and the output of every adapter. An additional docker network is created and used for the communication between containers. Exchange of data is done using an additional, common volume. The general pattern across the tests for such volumes are paths -such as `/home/precice/Data/Exchange`, `/home/precice/Data/Input`, `/home/precice/Data/Output`, as explained above. +The actual tests are provided in `systemtests/tests`. For testing, we spawn containers with the necessary solvers for the simulation. The execution is controlled using [docker-compose](https://docs.docker.com/compose/). Separate volumes are created for the input and the output of every adapter. An additional docker network is created and used for the communication between containers. Exchange of data is done using an additional, common volume. The general pattern across the tests for such volumes are paths such as `/home/precice/Data/Exchange`, `/home/precice/Data/Input`, `/home/precice/Data/Output`, as explained above. The tests are based on the corresponding tutorials from the [tutorials repository](https://github.com/precice/tutorials). Since tests run using independent containers, several modifications are necessary to split the input to solvers in different directories, to adjust the simulated time, or to potentially change a solver's version, as well as to modify the `precice-config.xml` for the communication pattern we use in docker. This is done using the `Dockerfile.tutorial_data` image, which clones the tutorial data and adjusts and splits the input to different solvers. It is then used as the first container spawned by `docker-compose`. @@ -64,3 +63,18 @@ Since it is possible for the output of two identical tests to differ in floating the files are also compared numerically using `compare_results.sh`. This script strips away non-numerical data and then compares files field by field with respect to a specified relative tolerance (default maximum allowed difference is 1 percent) In either case after a test finishes, all the related volumes, networks and containers are removed. + +### Required environment variables + +The following environment variables are required for running the tests: + +* `SYSTEST_REMOTE`: Specifies the user on Dockerhub from which the baseimage is pulled. Example: `precice/` +* `PRECICE_BASE`: Specifies the features of the baseimage used for running the test. Example: `ubuntu1604.home-develop` or `ubuntu1804.home-develop` +* `_TAG`: Specifies the tag that will be used for the baseimage for each of the participants. Example: `latest` + +### Running the tests + +There are two possibilities for running the tests: + +1. Use `system_testing.py`: Go to `systemtests` and run `python3 system_testing.py -s ` (e.g. `python3 system_testing.py -s fe-fe --base Ubuntu1804.home`). For more information on the script run `python3 system_testing.py --help`. +2. Use `docker compose up`: Go to the corresponding test (e.g. `systemtests/tests/TestCompose_fe-fe.Ubuntu1804.home`) and run `docker-compose up`. Note that `.env` defines the previously mentioned environment variables required for running the tests. diff --git a/system_testing.py b/system_testing.py index 123763f74..d91a51110 100644 --- a/system_testing.py +++ b/system_testing.py @@ -226,10 +226,10 @@ def compose_tag(docker_username, base, features, branch): parser.add_argument('-s', '--systemtest', type=str, help="Choose system tests you want to use", choices = common.get_tests(), required = True) parser.add_argument('-b', '--branch', help="preCICE branch to use", default=os.environ["TRAVIS_BRANCH"] if ("TRAVIS_BRANCH" in os.environ and os.environ["TRAVIS_PULL_REQUEST"] == "false") else (os.environ["TRAVIS_PULL_REQUEST_BRANCH"] if ("TRAVIS_PULL_REQUEST_BRANCH" in os.environ) else "develop")) # make sure that branch corresponding to system tests branch is used, if no branch is explicitly specified. If we are testing a pull request, make sure to test agains branch from which PR originated. - parser.add_argument('-u', '--docker-username', help="docker username", default=os.environ["DOCKER_USERNAME"] if "DOCKER_USERNAME" in os.environ else "precice") + parser.add_argument('-u', '--docker-username', default=os.environ["DOCKER_USERNAME"] if "DOCKER_USERNAME" in os.environ else "precice", help="Name of the docker user on dockerhub that provides the preCICE and adapter base images for the tests. Defines the environment variable SYSTEST_REMOTE.") parser.add_argument('-f', '--force_rebuild', nargs='+', help="Force rebuild of variable parts of docker image", default = [], choices = ["precice", "tests"]) - parser.add_argument('--base', type=str,help="Base preCICE image to use", + parser.add_argument('--base', type=str, help="Base preCICE image to use. Defines the environmental variable PRECICE_BASE.", default= "Ubuntu1604.home") parser.add_argument('-v', '--verbose', action='store_true', help="Verbose output of participant containers") args = parser.parse_args() From 156acbcc978be461c15d323a39bfb4d57338fed5 Mon Sep 17 00:00:00 2001 From: BenjaminRueth Date: Sun, 23 Feb 2020 15:25:52 +0100 Subject: [PATCH 51/52] Provide reasonable default for PRECICE_BASE in .env files --- tests/TestCompose_fe-fe.Ubuntu1804.home/.env | 2 +- tests/TestCompose_nutils-of.Ubuntu1804.home/.env | 2 +- tests/TestCompose_of-ccx.Ubuntu1604.home/.env | 2 +- tests/TestCompose_of-ccx_fsi.Ubuntu1604.home.PETSc/.env | 3 ++- tests/TestCompose_of-of.Ubuntu1604.home/.env | 2 +- tests/TestCompose_of-of_np.Ubuntu1604.home/.env | 2 +- tests/TestCompose_su2-ccx.Ubuntu1604.home/.env | 2 +- 7 files changed, 8 insertions(+), 7 deletions(-) diff --git a/tests/TestCompose_fe-fe.Ubuntu1804.home/.env b/tests/TestCompose_fe-fe.Ubuntu1804.home/.env index 988195074..f2e35a1a2 100644 --- a/tests/TestCompose_fe-fe.Ubuntu1804.home/.env +++ b/tests/TestCompose_fe-fe.Ubuntu1804.home/.env @@ -1,3 +1,3 @@ FENICS_TAG=latest SYSTEST_REMOTE=precice/ -PRECICE_BASE= +PRECICE_BASE=-ubuntu1804.home-develop diff --git a/tests/TestCompose_nutils-of.Ubuntu1804.home/.env b/tests/TestCompose_nutils-of.Ubuntu1804.home/.env index eff569fc5..d5ba40f7a 100644 --- a/tests/TestCompose_nutils-of.Ubuntu1804.home/.env +++ b/tests/TestCompose_nutils-of.Ubuntu1804.home/.env @@ -1,3 +1,3 @@ OPENFOAM_TAG=latest SYSTEST_REMOTE=precice/ -PRECICE_BASE= +PRECICE_BASE=-ubuntu1804.home-develop diff --git a/tests/TestCompose_of-ccx.Ubuntu1604.home/.env b/tests/TestCompose_of-ccx.Ubuntu1604.home/.env index 22dc4f245..a3d795792 100644 --- a/tests/TestCompose_of-ccx.Ubuntu1604.home/.env +++ b/tests/TestCompose_of-ccx.Ubuntu1604.home/.env @@ -2,4 +2,4 @@ OPENFOAM_TAG=latest CALCULIX_TAG=latest SYSTEST_REMOTE=precice/ -PRECICE_BASE= +PRECICE_BASE=-ubuntu1604.home-develop diff --git a/tests/TestCompose_of-ccx_fsi.Ubuntu1604.home.PETSc/.env b/tests/TestCompose_of-ccx_fsi.Ubuntu1604.home.PETSc/.env index 594d0464c..50c804675 100644 --- a/tests/TestCompose_of-ccx_fsi.Ubuntu1604.home.PETSc/.env +++ b/tests/TestCompose_of-ccx_fsi.Ubuntu1604.home.PETSc/.env @@ -1,4 +1,5 @@ OPENFOAM_TAG=latest CALCULIX_TAG=latest SYSTEST_REMOTE=precice/ -PRECICE_BASE= + +PRECICE_BASE=-ubuntu1604.home.petsc-develop diff --git a/tests/TestCompose_of-of.Ubuntu1604.home/.env b/tests/TestCompose_of-of.Ubuntu1604.home/.env index eff569fc5..dead7f361 100644 --- a/tests/TestCompose_of-of.Ubuntu1604.home/.env +++ b/tests/TestCompose_of-of.Ubuntu1604.home/.env @@ -1,3 +1,3 @@ OPENFOAM_TAG=latest SYSTEST_REMOTE=precice/ -PRECICE_BASE= +PRECICE_BASE=-ubuntu1604.home-develop diff --git a/tests/TestCompose_of-of_np.Ubuntu1604.home/.env b/tests/TestCompose_of-of_np.Ubuntu1604.home/.env index eff569fc5..dead7f361 100644 --- a/tests/TestCompose_of-of_np.Ubuntu1604.home/.env +++ b/tests/TestCompose_of-of_np.Ubuntu1604.home/.env @@ -1,3 +1,3 @@ OPENFOAM_TAG=latest SYSTEST_REMOTE=precice/ -PRECICE_BASE= +PRECICE_BASE=-ubuntu1604.home-develop diff --git a/tests/TestCompose_su2-ccx.Ubuntu1604.home/.env b/tests/TestCompose_su2-ccx.Ubuntu1604.home/.env index 1953e4e18..ab314ac07 100644 --- a/tests/TestCompose_su2-ccx.Ubuntu1604.home/.env +++ b/tests/TestCompose_su2-ccx.Ubuntu1604.home/.env @@ -1,4 +1,4 @@ SU2_TAG=latest CALCULIX_TAG=latest SYSTEST_REMOTE=precice/ -PRECICE_BASE= +PRECICE_BASE=-ubuntu1604.home-develop From b05e7a93b8e31b9123466006fd06971c6eeb4fac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20R=C3=BCth?= Date: Mon, 2 Mar 2020 10:24:20 +0100 Subject: [PATCH 52/52] Remove debugging output --- generate_test.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/generate_test.py b/generate_test.py index 53f8ff776..7211e51f0 100644 --- a/generate_test.py +++ b/generate_test.py @@ -24,10 +24,6 @@ def generate_test_structure(test_name = None, base_image = None, for tmp_file in tmp_files: with open(os.path.join('templates','test_template', tmp_file)) as f: tmp = Template(f.read()) - print("###") - print(f) - print(tmp.render(locals())) - print("###") renders[tmp_file.replace('.jinja', '')] = tmp.render(locals()) otp_dir = os.path.join('tests', "TestCompose_{test}.{base}".format(test =