Merge branch 'develop' into partitioned-heat-conduction-openfoam-wave…

…form
precice · Nov 20, 2023 · f174aa4 · f174aa4
2 parents db532ef + 378b089
commit f174aa4
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 23 deletions.
diff --git a/.github/workflows/run_testsuite_manual.yml b/.github/workflows/run_testsuite_manual.yml
@@ -26,6 +26,14 @@ on:
             - 'WARNING'
             - 'ERROR'
             - 'CRITICAL'
+      upload_artifacts:
+        description: 'Upload artifacts also on success (not only on failure)'
+        default: 'FALSE'
+        type: choice
+        options:
+            - 'FALSE'
+            - 'TRUE'
+
 jobs:
   run_testsuite_manual:
     uses: ./.github/workflows/run_testsuite_workflow.yml

diff --git a/.github/workflows/run_testsuite_workflow.yml b/.github/workflows/run_testsuite_workflow.yml
@@ -1,4 +1,4 @@
-name: Run Testsuite Workflow 
+name: Run Testsuite reusable workflow 
 on:
   workflow_call:
     inputs:
@@ -20,42 +20,45 @@ on:
         default: 'INFO'
         required: false
         type: string
+      upload_artifacts:
+          description: 'TRUE or FALSE (Default: FALSE -> Upload only when the workflow fails)'
+          default: 'FALSE'
+          type: string
 jobs:
   run_testsuite:
-    runs-on: ubuntu-latest
+    runs-on: [self-hosted, linux, x64, precice-tests-vm]
     steps:
-    - name: Report log
+    - name: Display a quick job summary
       run: |
         echo "Initiated by: ${{ github.actor }}"
-        echo "Running systemtests --build_args=${{github.event.inputs.build_args}} --suites=${{github.event.inputs.suites}}"
-        echo "Systemtests branch: ${{ github.event.inputs.systests_branch }}"
+        echo "Running systemtests --build_args=${{inputs.build_args}} --suites=${{ inputs.suites}}"
+        echo "Systemtests branch: ${{ inputs.systests_branch }}"
+        echo "Uploading the runs folder on success: ${{ inputs.upload_artifacts }}"
+    - name: Move LFS URL to local LFS server
+      run: |
+        /home/precice/runners_root/scripts/make_lfs_local.sh
+    - name: 'Cleanup the folder'
+      run: |
+        ls -la ./
+        rm -rf ./*
+        rm -rf ./.??*
+        ls -la ./
     - name: Check out Tutorials for systest
       uses: actions/checkout@v4
       with:
-        ref: ${{ github.event.inputs.systests_branch }}
+        ref: ${{ inputs.systests_branch }}
         lfs: true
         fetch-depth: 0
-    - name: Log directory
-      run: |
-        ls -al
-        pwd
-    - uses: actions/setup-python@v4
-      with:
-        python-version: '3.11'
-    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v2
-    - name: install python depencies
+    - name: Install Python dependencies
       run: |
-        python -m pip install -r ./tools/tests/requirements.txt
-    - name: Expose GitHub Runtime (needed for accessing the gha cache)
-      uses: crazy-max/ghaction-github-runtime@v3
+        pip install --user -r tools/tests/requirements.txt
     - name: Run tests
       run: |
-        cd ./tools/tests
-        python systemtests.py --build_args=${{github.event.inputs.build_args}} --suites=${{github.event.inputs.suites}} --log-level=${{github.event.inputs.loglevel}} 
+        cd tools/tests
+        python systemtests.py --build_args=${{ inputs.build_args}} --suites=${{ inputs.suites}} --log-level=${{ inputs.loglevel}}
         cd ../../
     - name: Archive run files
-      if: success() || failure()
+      if: ${{  failure() || inputs.upload_artifacts == 'TRUE' }}
       uses: actions/upload-artifact@v3
       with:
         name: runs

diff --git a/flow-over-heated-plate-two-meshes/precice-config.xml b/flow-over-heated-plate-two-meshes/precice-config.xml
@@ -26,7 +26,6 @@
   <participant name="Fluid">
     <provide-mesh name="Fluid-Mesh" />
     <receive-mesh name="Solid-Mesh" from="Solid" />
-    <receive-mesh name="Solid-Mesh-nodes" from="Solid" />
     <read-data name="Heat-Flux" mesh="Fluid-Mesh" />
     <write-data name="Temperature" mesh="Fluid-Mesh" />
     <mapping:nearest-neighbor