diff --git a/.gitlab/ci/ubuntu1604.yml b/.gitlab/ci/ubuntu1604.yml index 3fa967aab..c28413672 100644 --- a/.gitlab/ci/ubuntu1604.yml +++ b/.gitlab/ci/ubuntu1604.yml @@ -90,7 +90,6 @@ test:ubuntu1604_gcc48: #mpi location so that `built_against_test_install` tests #pass CMAKE_PREFIX_PATH: "/opt/openmpi/" - dependencies: - build:ubuntu1604_gcc48 needs: @@ -127,7 +126,6 @@ test:ubuntu1604_clang5: - .ubuntu1604 - .cmake_test_linux - .only-default - dependencies: - build:ubuntu1604_clang5 needs: diff --git a/.gitlab/ci/ubuntu1804.yml b/.gitlab/ci/ubuntu1804.yml index 478380056..5a23fd514 100644 --- a/.gitlab/ci/ubuntu1804.yml +++ b/.gitlab/ci/ubuntu1804.yml @@ -28,6 +28,10 @@ test:ubuntu1804_gcc9: - .ubuntu1804 - .cmake_test_linux - .only-default + variables: + #Restrict OpenMP number of threads since multiple test stages + #execute on the same hardware concurrently + OMP_NUM_THREADS: 4 dependencies: - build:ubuntu1804_gcc9 needs: @@ -98,6 +102,10 @@ test:ubuntu1804_gcc7_2: - .ubuntu1804 - .cmake_test_linux - .only-master + variables: + #Restrict OpenMP number of threads since multiple test stages + #execute on the same hardware concurrently + OMP_NUM_THREADS: 4 dependencies: - build:ubuntu1804_gcc7_2 needs: @@ -131,6 +139,10 @@ test:ubuntu1804_gcc6: - .ubuntu1804 - .cmake_test_linux - .only-master + variables: + #Restrict OpenMP number of threads since multiple test stages + #execute on the same hardware concurrently + OMP_NUM_THREADS: 3 dependencies: - build:ubuntu1804_gcc6 needs: