From 574b8d341939e9c64448c8f167b69312149439eb Mon Sep 17 00:00:00 2001
From: yangwei <yangwei@geedgenetworks.com>
Date: Thu, 28 Nov 2024 14:56:29 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=A7=AA=20test(fix=20timeout=20in=20el9):?=
 =?UTF-8?q?=20build=20type=20debug,=20gtest=20timeout?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitlab-ci.yml                    | 22 +++++++++++-----------
 deps/dablooms/test/CMakeLists.txt |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e0e3f47..52e76b2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,14 +10,14 @@ stages:
   - test
   - upload
 
-.predefined_matrix_x86_64: &predefined_matrix_x86_64
+.predefined_matrix_x86_64_el8: &predefined_matrix_x86_64_el8
   TAG: "tsg-os-builder-el8"
   BUILD_IMAGE: "git.mesalab.cn:7443/mesa_platform/build-env:rocky8-for-stellar"
   MRZCPD: "mrzcpd-corei7"
   PULP3_REPO_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"
   BUILD_IMAGE: "git.mesalab.cn:7443/mesa_platform/build-env:rocky9-aarch64"
   MRZCPD: "mrzcpd"
@@ -53,8 +53,8 @@ cppcheck:
   stage: cppcheck
   parallel:
     matrix:
-      - <<: *predefined_matrix_x86_64  
-      - <<: *predefined_matrix_aarch64  
+      - <<: *predefined_matrix_x86_64_el8  
+      - <<: *predefined_matrix_aarch64_el9  
   image: $BUILD_IMAGE
   tags:
     - $TAG
@@ -92,8 +92,8 @@ build:
   stage: build
   parallel:
     matrix:
-      - <<: *predefined_matrix_x86_64  
-      - <<: *predefined_matrix_aarch64  
+      - <<: *predefined_matrix_x86_64_el8  
+      - <<: *predefined_matrix_aarch64_el9  
   image: $BUILD_IMAGE
   tags:
     - $TAG
@@ -103,7 +103,7 @@ build:
     ASAN_OPTION: "OFF"
   script: *build_script
   artifacts:
-    name: "build-artifacts-${CI_COMMIT_REF_NAME}-${TAG}-${BUILD_TYPE}"
+    name: "artifacts-${CI_COMMIT_REF_NAME}-${TAG}-${BUILD_TYPE}"
     paths:
       - build/infra/*.rpm
     when: on_success
@@ -114,8 +114,8 @@ test:
   stage: test
   parallel:
     matrix:
-      - <<: *predefined_matrix_x86_64  
-      - <<: *predefined_matrix_aarch64  
+      - <<: *predefined_matrix_x86_64_el8  
+      - <<: *predefined_matrix_aarch64_el9  
   image: $BUILD_IMAGE
   tags:
     - $TAG
@@ -136,8 +136,8 @@ upload:
   stage: upload
   parallel:
     matrix:
-      - <<: *predefined_matrix_x86_64  
-      - <<: *predefined_matrix_aarch64  
+      - <<: *predefined_matrix_x86_64_el8  
+      - <<: *predefined_matrix_aarch64_el9  
   image: $BUILD_IMAGE
   tags:
     - $TAG
diff --git a/deps/dablooms/test/CMakeLists.txt b/deps/dablooms/test/CMakeLists.txt
index a15410c..cdb4cce 100644
--- a/deps/dablooms/test/CMakeLists.txt
+++ b/deps/dablooms/test/CMakeLists.txt
@@ -2,4 +2,4 @@ add_executable(gtest_dablooms gtest_dablooms.cpp)
 target_link_libraries(gtest_dablooms dablooms gtest)
 
 include(GoogleTest)
-gtest_discover_tests(gtest_dablooms)
\ No newline at end of file
+gtest_discover_tests(gtest_dablooms DISCOVERY_TIMEOUT 60)
\ No newline at end of file