Patch SU2-CCX test output

.travis.yml

@@ -267,50 +267,50 @@ jobs:
     - 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 --test 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 --test 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 --test 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 --test 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 --test bindings
 
     - name: "[18.04] Bindings/Solverdummies"
       script:
-        - python system_testing.py -s bindings --base Ubuntu1804.home --branch $TRAVIS_BRANCH
+        - python system_testing.py -s bindings --base Ubuntu1804.home
         - python push.py --test bindings --base Ubuntu1804.home
 
     - 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 --test 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 --test 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 --test 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 --test of-ccx_fsi --petsc

system_testing.py

@@ -225,7 +225,11 @@ 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 os.environ["TRAVIS_PULL_REQUEST"] == "false" 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, will test against develop by default.
+# Usage of the branch argument:
+#   When on a PR, this will by default use the develop versions of preCICE and adapter images.
+#   This makes it easier to experiment with tests, which are most commonly addressed by PRs
+#   (otherwise you would need to also create preCICE and adapter images for your branch which are only different in name)
     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",

tests/TestCompose_su2-ccx.Ubuntu1604.home/docker-compose.yml

@@ -13,7 +13,7 @@ services:
             /bin/bash -c "ln -sf /home/precice/Data/Input Solid;
             ln -sf /home/precice/calculix-adapter/configs/* . &&
             ccx_preCICE -i Solid/flap -precice-participant Calculix &&
-            cp   Solid/*.dat  Solid/*.cvg Solid/*.sta *convergence.log *iterations.log *.out /home/precice/Data/Output/"
+            cp   Solid/*.dat  Solid/*.cvg Solid/*.sta *convergence.log *iterations.log *point1.log *.out /home/precice/Data/Output/"
     container_name: calculix-adapter
     depends_on:
     - tutorial-data
@@ -31,7 +31,7 @@ services:
               /bin/bash -c "ln -sf /home/precice/Data/Input Fluid &&
                 ln -sf /home/precice/su2-adapter/configs/* . &&
                 SU2_CFD Fluid/euler_config_coupled.cfg &&
-                cp flow*.vtk *.csv *.dat *convergence.log *iterations.log /home/precice/Data/Output/"
+                cp flow*.vtk *.csv *.dat *iterations.log *point1.log /home/precice/Data/Output/"
     container_name: su2-adapter
     depends_on:
     - tutorial-data