Fix timeout issue with macos-14-large

equinor · Oct 7, 2024 · 59bc774 · 59bc774
1 parent 2ce1f41
commit 59bc774
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
@@ -107,7 +107,7 @@ jobs:
       matrix:
         test-type: [ 'test', 'integration-test', 'everest-models-test' ]
         python-version: [ '3.8', '3.12' ]
-        os: [ 'macos-13', 'macos-14']
+        os: [ 'macos-13', 'macos-14', 'macos-14-large']
         exclude:
           - os: 'macos-14'
             python-version: '3.8'

diff --git a/tests/ert/ui_tests/cli/test_cli.py b/tests/ert/ui_tests/cli/test_cli.py
@@ -326,7 +326,6 @@ def test_that_setenv_sets_environment_variables_in_jobs(setenv_config):
         assert lines[3].strip() == "fourth:foo"
 
 
-@pytest.mark.timeout(30)
 @pytest.mark.usefixtures("copy_poly_case")
 @pytest.mark.parametrize(
     (