diff --git a/tools/tests/README.md b/tools/tests/README.md index e3a163a2b..22144d769 100644 --- a/tools/tests/README.md +++ b/tools/tests/README.md @@ -21,7 +21,7 @@ Workflow for the preCICE v3 release testing: 3. Trigger the GitHub Actions Workflow. Until we merge the workflow to develop, this can only happen via the [GitHub CLI](https://cli.github.com/): ```bash - gh workflow run run_testsuite_manual.yml -f suites=release_test -f build_args="PRECICE_REF:v3.1.1,OPENFOAM_ADAPTER_REF:v1.3.0,PYTHON_BINDINGS_REF:v3.1.0,FENICS_ADAPTER_REF:v2.1.0,SU2_VERSION:7.5.1,SU2_ADAPTER_REF:64d4aff,TUTORIALS_REF:340b447" --ref=develop + gh workflow run run_testsuite_manual.yml -f suites=release_test -f build_args="PRECICE_REF:v3.1.1,PRECICE_PRESET:production-audit,OPENFOAM_ADAPTER_REF:v1.3.0,PYTHON_BINDINGS_REF:v3.1.0,FENICS_ADAPTER_REF:v2.1.0,SU2_VERSION:7.5.1,SU2_ADAPTER_REF:64d4aff,TUTORIALS_REF:340b447" --ref=develop ``` 4. Go to the tutorials [Actions](https://github.com/precice/tutorials/actions) page and find the running workflow @@ -61,7 +61,7 @@ gh workflow run run_testsuite_manual.yml -f suites=fenics_test --ref=develop Another example, to use the latest releases and enable debug information of the tests: ```shell -gh workflow run run_testsuite_manual.yml -f suites=fenics_test -f build_args="PRECICE_REF:v3.1.1,OPENFOAM_ADAPTER_REF:v1.3.0,PYTHON_BINDINGS_REF:v3.1.0,FENICS_ADAPTER_REF:v2.1.0,SU2_VERSION:7.5.1,SU2_ADAPTER_REF:64d4aff,TUTORIALS_REF:340b447" -f loglevel=DEBUG --ref=develop +gh workflow run run_testsuite_manual.yml -f suites=fenics_test -f build_args="PRECICE_REF:v3.1.1,PRECICE_PRESET:production-audit,OPENFOAM_ADAPTER_REF:v1.3.0,PYTHON_BINDINGS_REF:v3.1.0,FENICS_ADAPTER_REF:v2.1.0,SU2_VERSION:7.5.1,SU2_ADAPTER_REF:64d4aff,TUTORIALS_REF:340b447" -f loglevel=DEBUG --ref=develop ``` where the `*_REF` should be a specific [commit-ish](https://git-scm.com/docs/gitglossary#Documentation/gitglossary.txt-aiddefcommit-ishacommit-ishalsocommittish). @@ -71,7 +71,7 @@ Example output: ```text Run cd tools/tests cd tools/tests - python systemtests.py --build_args=PRECICE_REF:v3.1.1,OPENFOAM_ADAPTER_REF:v1.3.0,PYTHON_BINDINGS_REF:v3.1.0,FENICS_ADAPTER_REF:v2.1.0 --suites=fenics_test --log-level=DEBUG + python systemtests.py --build_args=PRECICE_REF:v3.1.1,PRECICE_PRESET:production-audit,OPENFOAM_ADAPTER_REF:v1.3.0,PYTHON_BINDINGS_REF:v3.1.0,FENICS_ADAPTER_REF:v2.1.0 --suites=fenics_test --log-level=DEBUG cd ../../ shell: /usr/bin/bash -e {0} INFO: About to run the following systemtest in the directory /home/precice/runners_root/actions-runner-tutorial/_work/tutorials/tutorials/runs: @@ -248,6 +248,9 @@ openfoam-adapter: PRECICE_REF: description: Version of preCICE to use default: "main" + PRECICE_PRESET: + description: CMake preset of preCICE + default: "production-audit" PLATFORM: description: Dockerfile platform used default: "ubuntu_2204" diff --git a/tools/tests/components.yaml b/tools/tests/components.yaml index 3ca370bd7..ccd6e1f87 100644 --- a/tools/tests/components.yaml +++ b/tools/tests/components.yaml @@ -5,6 +5,9 @@ bare: # A default component used when the solver does not have any dependencies PRECICE_REF: description: Version of preCICE to use default: "main" + PRECICE_PRESET: + description: CMake preset of preCICE + default: "production-audit" PLATFORM: description: Dockerfile platform used default: "ubuntu_2204" @@ -19,6 +22,9 @@ python-bindings: PRECICE_REF: description: Version of preCICE to use default: "main" + PRECICE_PRESET: + description: CMake preset of preCICE + default: "production-audit" PLATFORM: description: Dockerfile platform used default: "ubuntu_2204" @@ -36,6 +42,9 @@ openfoam-adapter: PRECICE_REF: description: Version of preCICE to use default: "main" + PRECICE_PRESET: + description: CMake preset of preCICE + default: "production-audit" PLATFORM: description: Dockerfile platform used default: "ubuntu_2204" @@ -58,6 +67,9 @@ fenics-adapter: PRECICE_REF: description: Version of preCICE to use default: "main" + PRECICE_PRESET: + description: CMake preset of preCICE + default: "production-audit" PLATFORM: description: Dockerfile platform used default: "ubuntu_2204" @@ -78,6 +90,9 @@ nutils-adapter: PRECICE_REF: description: Version of preCICE to use default: "main" + PRECICE_PRESET: + description: CMake preset of preCICE + default: "production-audit" PLATFORM: description: Dockerfile platform used default: "ubuntu_2204" @@ -95,6 +110,9 @@ calculix-adapter: PRECICE_REF: description: Version of preCICE to use default: "main" + PRECICE_PRESET: + description: CMake preset of preCICE + default: "production-audit" PLATFORM: description: Dockerfile platform used default: "ubuntu_2204" @@ -115,6 +133,9 @@ su2-adapter: PRECICE_REF: description: Version of preCICE to use default: "main" + PRECICE_PRESET: + description: CMake preset of preCICE + default: "production-audit" PLATFORM: description: Dockerfile platform used default: "ubuntu_2204" diff --git a/tools/tests/docker-compose.template.yaml b/tools/tests/docker-compose.template.yaml index e8006f4ad..b71b515ce 100644 --- a/tools/tests/docker-compose.template.yaml +++ b/tools/tests/docker-compose.template.yaml @@ -13,6 +13,7 @@ services: command: > /bin/bash -c "id && cd '/runs/{{ tutorial_folder }}' && + sed -i 's|||g' precice-config.xml && sed -i 's%% %g' precice-config.xml && sed -i 's|m2n:sockets |m2n:sockets network=\"eth0\" |g' precice-config.xml && cat precice-config.xml" diff --git a/tools/tests/dockerfiles/ubuntu_2204/Dockerfile b/tools/tests/dockerfiles/ubuntu_2204/Dockerfile index 779605dfd..cdb71d40c 100644 --- a/tools/tests/dockerfiles/ubuntu_2204/Dockerfile +++ b/tools/tests/dockerfiles/ubuntu_2204/Dockerfile @@ -48,13 +48,14 @@ RUN python3 -m pip install --user --upgrade pip FROM precice_dependecies as precice # Install & build precice into /home/precice/precice ARG PRECICE_REF +ARG PRECICE_PRESET USER precice WORKDIR /home/precice RUN git clone https://github.com/precice/precice.git precice && \ cd precice && \ git checkout ${PRECICE_REF} && \ mkdir build && cd build &&\ - cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/home/precice/.local/ -DPRECICE_PETScMapping=OFF -DBUILD_TESTING=OFF && \ + cmake .. --preset=${PRECICE_PRESET} -DCMAKE_INSTALL_PREFIX=/home/precice/.local/ -DPRECICE_PETScMapping=OFF -DBUILD_TESTING=OFF && \ make all install -j $(nproc) FROM precice_dependecies as openfoam_adapter diff --git a/tools/tests/reference_versions.yaml b/tools/tests/reference_versions.yaml index 4cdbdf185..aadfd9782 100644 --- a/tools/tests/reference_versions.yaml +++ b/tools/tests/reference_versions.yaml @@ -1,4 +1,5 @@ PRECICE_REF: "v3.1.1" +PRECICE_PRESET: "production-audit" OPENFOAM_EXECUTABLE: "openfoam2312" OPENFOAM_ADAPTER_REF: "v1.3.0" PYTHON_BINDINGS_REF: "v3.1.0"