From a84fb6a653c815b35df36479207db3b7b036972e Mon Sep 17 00:00:00 2001 From: Konrad Eder <53946421+Eder-K@users.noreply.github.com> Date: Wed, 11 Nov 2020 01:53:53 +0100 Subject: [PATCH 1/3] Add debug print --- tests/TestCompose_nutils-of/Dockerfile.tutorial_data | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/TestCompose_nutils-of/Dockerfile.tutorial_data b/tests/TestCompose_nutils-of/Dockerfile.tutorial_data index 85f90516d..7ac6790e2 100644 --- a/tests/TestCompose_nutils-of/Dockerfile.tutorial_data +++ b/tests/TestCompose_nutils-of/Dockerfile.tutorial_data @@ -12,6 +12,7 @@ RUN mkdir configs && cp $tutorial_path/precice-config.xml configs/precice-confi s|\(\s\+\)\(\)|\1 \n\1\2|g' \ configs/precice-config.xml && \ sed -i 's|\.\./precice-config\.xml|configs/precice-config.xml|g' $tutorial_path/Nutils/cht.py && \ - sed -i 's|\.\./precice-config\.xml|configs/precice-config.xml|g' $tutorial_path/OpenFOAM/system/preciceDict + sed -i 's|\.\./precice-config\.xml|configs/precice-config.xml|g' $tutorial_path/OpenFOAM/system/preciceDict && \ + cat configs/precice-config.xml RUN addgroup -g 1000 precice && adduser -u 1000 -G precice -D precice && chown -R precice:precice tutorials configs USER precice From 5e9ae6945dd6ba4264d59c20baf1a55415da8819 Mon Sep 17 00:00:00 2001 From: Konrad Eder <53946421+Eder-K@users.noreply.github.com> Date: Wed, 11 Nov 2020 01:56:13 +0100 Subject: [PATCH 2/3] Use reduced travis build (debug) --- .travis.yml | 143 +--------------------------------------------------- 1 file changed, 2 insertions(+), 141 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4379e3c07..e54e5d3f2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -58,42 +58,7 @@ jobs: - stage: Building adapters - name: "[18.04] SU2 adapter" - if: fork = false - script: - - python build_adapter.py --dockerfile adapters/Dockerfile.su2-adapter --operating-system ubuntu1804 --precice-installation package --docker-username $DOCKER_USERNAME - - python push_adapter.py --dockerfile adapters/Dockerfile.su2-adapter --operating-system ubuntu1804 --precice-installation package --docker-username $DOCKER_USERNAME - - python push.py - - - name: "[20.04] SU2 adapter [PETSc]" - if: fork = false - script: - - python build_adapter.py --dockerfile adapters/Dockerfile.su2-adapter --operating-system ubuntu2004 --precice-installation package --petsc yes --docker-username $DOCKER_USERNAME - - python push_adapter.py --dockerfile adapters/Dockerfile.su2-adapter --operating-system ubuntu2004 --precice-installation package --petsc yes --docker-username $DOCKER_USERNAME - - python push.py - - - name: "[18.04] deal.ii adapter [3D]" - if: fork = false - script: - - python build_adapter.py --dockerfile adapters/Dockerfile.dealii-adapter_3D --operating-system ubuntu1804 --precice-installation package --docker-username $DOCKER_USERNAME - - python push_adapter.py --dockerfile adapters/Dockerfile.dealii-adapter_3D --operating-system ubuntu1804 --precice-installation package --docker-username $DOCKER_USERNAME - - python push.py - - - name: "[18.04] deal.ii adapter [2D]" - if: fork = false - script: - - python build_adapter.py --dockerfile adapters/Dockerfile.dealii-adapter --operating-system ubuntu1804 --precice-installation package --docker-username $DOCKER_USERNAME - - python push_adapter.py --dockerfile adapters/Dockerfile.dealii-adapter --operating-system ubuntu1804 --precice-installation package --docker-username $DOCKER_USERNAME - - python push.py - - - name: "[20.04] deal.ii adapter [2D][PETSc]" - if: fork = false - script: - - python build_adapter.py --dockerfile adapters/Dockerfile.dealii-adapter --operating-system ubuntu2004 --precice-installation package --petsc yes --docker-username $DOCKER_USERNAME --base-solver precice/deal.ii-ubuntu2004 - - python push_adapter.py --dockerfile adapters/Dockerfile.dealii-adapter --operating-system ubuntu2004 --precice-installation package --petsc yes --docker-username $DOCKER_USERNAME - - python push.py - - - name: "[18.04] OpenFOAM adapter" + name: "[18.04] OpenFOAM adapter" if: fork = false script: - python build_adapter.py --dockerfile adapters/Dockerfile.openfoam-adapter --operating-system ubuntu1804 --precice-installation package --docker-username $DOCKER_USERNAME @@ -114,41 +79,6 @@ jobs: - python push_adapter.py --dockerfile adapters/Dockerfile.openfoam-adapter --operating-system ubuntu2004 --precice-installation package --petsc yes --docker-username $DOCKER_USERNAME - python push.py - - name: "[18.04] FEniCS adapter" - if: fork = false - script: - - python build_adapter.py --dockerfile adapters/Dockerfile.fenics-adapter --operating-system ubuntu1804 --precice-installation package --docker-username $DOCKER_USERNAME - - python push_adapter.py --dockerfile adapters/Dockerfile.fenics-adapter --operating-system ubuntu1804 --precice-installation package --docker-username $DOCKER_USERNAME - - python push.py - - - name: "[18.04] Code_Aster adapter" - if: fork = false - script: - - python build_adapter.py --dockerfile adapters/Dockerfile.codeaster-adapter --operating-system ubuntu1804 --precice-installation package --docker-username $DOCKER_USERNAME - - python push_adapter.py --dockerfile adapters/Dockerfile.codeaster-adapter --operating-system ubuntu1804 --precice-installation package --docker-username $DOCKER_USERNAME - - python push.py - - - name: "[18.04] CalculiX adapter" - if: fork = false - script: - - python build_adapter.py --dockerfile adapters/Dockerfile.calculix-adapter --operating-system ubuntu1804 --precice-installation package --docker-username $DOCKER_USERNAME - - python push_adapter.py --dockerfile adapters/Dockerfile.calculix-adapter --operating-system ubuntu1804 --precice-installation package --docker-username $DOCKER_USERNAME - - python push.py - - - name: "[18.04] CalculiX adapter [PETSc]" - if: fork = false - script: - - python build_adapter.py --dockerfile adapters/Dockerfile.calculix-adapter --operating-system ubuntu1804 --precice-installation home --petsc yes --docker-username $DOCKER_USERNAME - - python push_adapter.py --dockerfile adapters/Dockerfile.calculix-adapter --operating-system ubuntu1804 --precice-installation home --petsc yes --docker-username $DOCKER_USERNAME - - python push.py - - - name: "[20.04] CalculiX adapter [PETSc]" - if: fork = false - script: - - python build_adapter.py --dockerfile adapters/Dockerfile.calculix-adapter --operating-system ubuntu2004 --precice-installation package --petsc yes --docker-username $DOCKER_USERNAME - - python push_adapter.py --dockerfile adapters/Dockerfile.calculix-adapter --operating-system ubuntu2004 --precice-installation package --petsc yes --docker-username $DOCKER_USERNAME - - python push.py - - name: "[Build adapters on fork] Using cached version" if: fork = true script: true @@ -156,77 +86,8 @@ jobs: - stage: Tests - name: "[18.04] SU2 <-> Calculix [unstable][failure allowed]" - script: - - python system_testing.py -s su2-ccx -v - - python push.py - - - name: "[20.04 PETSc] SU2 <-> Calculix [unstable][failure allowed]" - script: - - python system_testing.py -s su2-ccx --base Ubuntu2004.package.PETSc -v - - python push.py - - - name: "[18.04] OpenFOAM <-> OpenFOAM" - script: - - python system_testing.py -s of-of -v - - python push.py - - - name: "[18.04] Calculix <-> OpenFOAM" - script: - - python system_testing.py -s of-ccx -v - - python push.py - - - name: "[18.04] FEniCS <-> FEniCS" - script: - - python system_testing.py -s fe-fe --base Ubuntu1804.package -v - - python push.py - - - name: "[18.04] Bindings/Solverdummies" - script: - - python system_testing.py -s bindings -v - - python push.py - - - name: "[18.04] deal.ii <-> OpenFOAM [FSI][3D]" - script: - - python system_testing.py -s dealii-of_3D -v - - python push.py - - - name: "[18.04] deal.ii <-> OpenFOAM [FSI][2D]" - script: - - python system_testing.py -s dealii-of -v - - python push.py - - - name: "[20.04 PETSc] deal.ii <-> OpenFOAM [FSI][2D]" - script: - - python system_testing.py -s dealii-of --base Ubuntu2004.package.PETSc -v - - python push.py - - - name: "[18.04] nutils <-> OpenFOAM [failure allowed]" + name: "[18.04] nutils <-> OpenFOAM [failure allowed]" script: - python system_testing.py -s nutils-of -v - python push.py - - name: "[18.04] OpenFOAM <-> OpenFOAM [nearest projection]" - script: - - python system_testing.py -s of-of_np -v - - python push.py - - - name: "[18.04] OpenFOAM <-> Code_Aster" - script: - - python system_testing.py -s of-ca -v - - python push.py - - - name: "[18.04] Elastictube1D - Python" - script: - - python system_testing.py -s 1dtube_py -v - - python push.py - - - name: "[18.04] Elastictube1D - C++" - script: - - python system_testing.py -s 1dtube_cxx -v - - python push.py - - - name: "[18.04 PETSc] OpenFOAM <-> CalculiX [FSI][failure allowed]" - script: - - python system_testing.py -s of-ccx_fsi --base Ubuntu1804.home.PETSc -v - - python push.py From 2e84cc6903aca9e9e837bb89564c9ea4a89c6f83 Mon Sep 17 00:00:00 2001 From: Eder-K Date: Thu, 12 Nov 2020 10:02:03 +0100 Subject: [PATCH 3/3] Fix indentation in sed --- tests/TestCompose_nutils-of/Dockerfile.tutorial_data | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/TestCompose_nutils-of/Dockerfile.tutorial_data b/tests/TestCompose_nutils-of/Dockerfile.tutorial_data index 7ac6790e2..6f1b170ca 100644 --- a/tests/TestCompose_nutils-of/Dockerfile.tutorial_data +++ b/tests/TestCompose_nutils-of/Dockerfile.tutorial_data @@ -9,7 +9,7 @@ WORKDIR / # adjust configuration and paths RUN mkdir configs && cp $tutorial_path/precice-config.xml configs/precice-config.xml && \ sed -i 's|exchange-directory="\.\."|exchange-directory="/home/precice/Data/Exchange/" network="eth0"|g; \ - s|\(\s\+\)\(\)|\1 \n\1\2|g' \ + s|\(\s\+\)\(\)|\1 \n\1\2|g' \ configs/precice-config.xml && \ sed -i 's|\.\./precice-config\.xml|configs/precice-config.xml|g' $tutorial_path/Nutils/cht.py && \ sed -i 's|\.\./precice-config\.xml|configs/precice-config.xml|g' $tutorial_path/OpenFOAM/system/preciceDict && \