diff --git a/.github/workflows/test_ert.yml b/.github/workflows/test_ert.yml index d7b9ee82154..3d4347b68e6 100644 --- a/.github/workflows/test_ert.yml +++ b/.github/workflows/test_ert.yml @@ -50,7 +50,7 @@ jobs: - name: CLI Test if: inputs.test-type == 'cli-tests' run: | - pytest --cov=ert --cov-report=xml:cov1.xml --junit-xml=junit.xml -n logical -v --benchmark-disable --dist loadgroup tests/ui_tests/cli + pytest --cov=ert --cov-report=xml:cov1.xml --junit-xml=junit.xml -o junit_family=legacy -n logical --maxprocesses=2 -v --benchmark-disable --dist loadgroup tests/ui_tests/cli - name: Unit Test if: inputs.test-type == 'unit-tests' diff --git a/ci/testkomodo.sh b/ci/testkomodo.sh index a21d73e10e8..d4ab91f3567 100755 --- a/ci/testkomodo.sh +++ b/ci/testkomodo.sh @@ -15,7 +15,7 @@ install_test_dependencies () { pip install ".[dev]" } -run_ert_with_opm () { +run_ert_with_opm() { pushd "${CI_TEST_ROOT}" cp -r "${CI_SOURCE_ROOT}/test-data/flow_example" ert_with_opm @@ -24,7 +24,7 @@ run_ert_with_opm () { ert test_run flow.ert || ( # In case ert fails, print log files if they are there: - cat spe1_out/realization-0/iter-0/STATUS || true + cat spe1_out/realization-0/iter-0/STATUS || true cat spe1_out/realization-0/iter-0/ERROR || true cat spe1_out/realization-0/iter-0/FLOW.stderr.0 || true cat spe1_out/realization-0/iter-0/FLOW.stdout.0 || true @@ -41,7 +41,7 @@ start_tests () { pushd ${CI_TEST_ROOT}/tests # Run all ert tests except tests evaluating memory consumption and tests requiring windows manager (GUI tests) - pytest --eclipse-simulator -n logical --show-capture=stderr -v --max-worker-restart 0 \ + pytest --eclipse-simulator -n auto --show-capture=stderr -v --max-worker-restart 0 \ -m "not limit_memory and not requires_window_manager" --benchmark-disable --dist loadgroup return_code_ert_main_tests=$? @@ -72,7 +72,6 @@ start_tests () { set -e - return_code_combined_tests=0 # We error if one or more returncodes are nonzero if [ "$return_code_ert_main_tests" -ne 0 ]; then