diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 75c459b8e03ae3f7407ec957b0f3abe6cc9e40b3..51629caccc136034fe4b0330a89914f899c32561 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -55,7 +55,6 @@ include: - local: '/scripts/ci/jobs/build-gui-win.yml' - local: '/scripts/ci/jobs/build-gui-mac.yml' - local: '/scripts/ci/jobs/check-header.yml' - - local: '/scripts/ci/jobs/tests-large.yml' - local: '/scripts/ci/jobs/clang-sanitizer.yml' - local: '/scripts/ci/jobs/clang-tidy.yml' - local: '/scripts/ci/jobs/web.yml' diff --git a/scripts/ci/jobs/build-linux.yml b/scripts/ci/jobs/build-linux.yml index 5f95a0e10e0d227f31e9ef499e01905b5ad5793b..df835fd0902d8379e1f50b592bf710fba85823e3 100644 --- a/scripts/ci/jobs/build-linux.yml +++ b/scripts/ci/jobs/build-linux.yml @@ -3,8 +3,10 @@ build linux: tags: - envinf1 - docker + timeout: 2h variables: BUILD_DIR: "build" + BUILD_CTEST_LARGE_ON_MASTER: "true" CMAKE_ARGS: >- -DOGS_BUILD_UTILS=ON -DOGS_USE_CONAN=OFF diff --git a/scripts/ci/jobs/tests-large.yml b/scripts/ci/jobs/tests-large.yml deleted file mode 100644 index 4092a9d5b39095ab8849f92b96a3d5c8e21ac2b6..0000000000000000000000000000000000000000 --- a/scripts/ci/jobs/tests-large.yml +++ /dev/null @@ -1,26 +0,0 @@ -tests large: - stage: check - tags: - - docker - - envinf1 - extends: - - .rules-master-manual - dependencies: [meta_container] - variables: - BUILD_DIR: "build-tests-large" - CMAKE_ARGS: "-DOGS_USE_CONAN=OFF" - image: - name: $CONTAINER_GCC_IMAGE - timeout: 2h - script: - - mkdir -p $BUILD_DIR - - cd $BUILD_DIR - - > - cmake .. -G Ninja - $CMAKE_ARGS - -DCMAKE_BUILD_TYPE=$BUILD_TYPE - -DOGS_BUILD_PROCESSES=$BUILD_PROCESSES - - cmake --build . --target ctest-large - artifacts: - paths: - - $BUILD_DIR/Tests/ctest.xml