gfwleak/stellar-stellar
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🧪 test(fix timeout in el9): build type debug, gtest timeout

Browse Source
This commit is contained in:
yangwei
2024-11-28 14:56:29 +08:00
parent 0defe31866
commit 574b8d3419
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
.gitlab-ci.yml
View File

@@ -10,14 +10,14 @@ stages:
- test - test
- upload - upload
.predefined_matrix_x86_64: &predefined_matrix_x86_64 .predefined_matrix_x86_64_el8: &predefined_matrix_x86_64_el8
TAG: "tsg-os-builder-el8" TAG: "tsg-os-builder-el8"
BUILD_IMAGE: "git.mesalab.cn:7443/mesa_platform/build-env:rocky8-for-stellar" BUILD_IMAGE: "git.mesalab.cn:7443/mesa_platform/build-env:rocky8-for-stellar"
MRZCPD: "mrzcpd-corei7" MRZCPD: "mrzcpd-corei7"
PULP3_REPO_NAME: "stellar-stable-x86_64.el8" PULP3_REPO_NAME: "stellar-stable-x86_64.el8"
PULP3_DIST_NAME: "stellar-stable-x86_64.el8" PULP3_DIST_NAME: "stellar-stable-x86_64.el8"
.predefined_matrix_aarch64: &predefined_matrix_aarch64 .predefined_matrix_aarch64_el9: &predefined_matrix_aarch64_el9
TAG: "tsg-os-builder-aarch64" TAG: "tsg-os-builder-aarch64"
BUILD_IMAGE: "git.mesalab.cn:7443/mesa_platform/build-env:rocky9-aarch64" BUILD_IMAGE: "git.mesalab.cn:7443/mesa_platform/build-env:rocky9-aarch64"
MRZCPD: "mrzcpd" MRZCPD: "mrzcpd"
@@ -53,8 +53,8 @@ cppcheck:
stage: cppcheck stage: cppcheck
parallel: parallel:
matrix: matrix:
- <<: *predefined_matrix_x86_64 - <<: *predefined_matrix_x86_64_el8
- <<: *predefined_matrix_aarch64 - <<: *predefined_matrix_aarch64_el9
image: $BUILD_IMAGE image: $BUILD_IMAGE
tags: tags:
- $TAG - $TAG
@@ -92,8 +92,8 @@ build:
stage: build stage: build
parallel: parallel:
matrix: matrix:
- <<: *predefined_matrix_x86_64 - <<: *predefined_matrix_x86_64_el8
- <<: *predefined_matrix_aarch64 - <<: *predefined_matrix_aarch64_el9
image: $BUILD_IMAGE image: $BUILD_IMAGE
tags: tags:
- $TAG - $TAG
@@ -103,7 +103,7 @@ build:
ASAN_OPTION: "OFF" ASAN_OPTION: "OFF"
script: *build_script script: *build_script
artifacts: artifacts:
name: "build-artifacts-${CI_COMMIT_REF_NAME}-${TAG}-${BUILD_TYPE}" name: "artifacts-${CI_COMMIT_REF_NAME}-${TAG}-${BUILD_TYPE}"
paths: paths:
- build/infra/*.rpm - build/infra/*.rpm
when: on_success when: on_success
@@ -114,8 +114,8 @@ test:
stage: test stage: test
parallel: parallel:
matrix: matrix:
- <<: *predefined_matrix_x86_64 - <<: *predefined_matrix_x86_64_el8
- <<: *predefined_matrix_aarch64 - <<: *predefined_matrix_aarch64_el9
image: $BUILD_IMAGE image: $BUILD_IMAGE
tags: tags:
- $TAG - $TAG
@@ -136,8 +136,8 @@ upload:
stage: upload stage: upload
parallel: parallel:
matrix: matrix:
- <<: *predefined_matrix_x86_64 - <<: *predefined_matrix_x86_64_el8
- <<: *predefined_matrix_aarch64 - <<: *predefined_matrix_aarch64_el9
image: $BUILD_IMAGE image: $BUILD_IMAGE
tags: tags:
- $TAG - $TAG

2
deps/dablooms/test/CMakeLists.txt vendored
View File

@@ -2,4 +2,4 @@ add_executable(gtest_dablooms gtest_dablooms.cpp)
target_link_libraries(gtest_dablooms dablooms gtest) target_link_libraries(gtest_dablooms dablooms gtest)
include(GoogleTest) include(GoogleTest)
gtest_discover_tests(gtest_dablooms) gtest_discover_tests(gtest_dablooms DISCOVERY_TIMEOUT 60)