summaryrefslogtreecommitdiff
path: root/repo/ceph/37-fix_tests.patch
diff options
context:
space:
mode:
authordavidovski <david@davidovski.xyz>2022-06-27 23:08:34 +0100
committerdavidovski <david@davidovski.xyz>2022-06-27 23:08:34 +0100
commitf13e0cac13f90f7f57bce3b26b2e6383de6e4ad2 (patch)
tree31fe2a493efcc3ec8721b8ae9943a0f938cd3f4d /repo/ceph/37-fix_tests.patch
parente4a392b4e1e547c9569abdd1f08ec51da3dc4562 (diff)
added qemu
Diffstat (limited to 'repo/ceph/37-fix_tests.patch')
-rw-r--r--repo/ceph/37-fix_tests.patch86
1 files changed, 0 insertions, 86 deletions
diff --git a/repo/ceph/37-fix_tests.patch b/repo/ceph/37-fix_tests.patch
deleted file mode 100644
index 169f6ef..0000000
--- a/repo/ceph/37-fix_tests.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-patch by Vladimir Bashkirtsev
-increase timeouts for armv7 ci
-
-diff -uNr ceph-15.2.4/src/test/CMakeLists.txt ceph-15.2.4-fix_tests/src/test/CMakeLists.txt
---- ceph-15.2.4/src/test/CMakeLists.txt 2020-07-01 01:10:51.000000000 +0930
-+++ ceph-15.2.4-fix_tests/src/test/CMakeLists.txt 2020-11-08 17:37:15.788767448 +1030
-@@ -528,11 +528,17 @@
- # Run rbd-unit-tests separate so they an run in parallel
- # For values see: src/include/rbd/features.h
- add_ceph_test(run-rbd-unit-tests-N.sh ${CMAKE_CURRENT_SOURCE_DIR}/run-rbd-unit-tests.sh N)
-+ set_tests_properties(run-rbd-unit-tests-N.sh PROPERTIES TIMEOUT 7200)
- add_ceph_test(run-rbd-unit-tests-0.sh ${CMAKE_CURRENT_SOURCE_DIR}/run-rbd-unit-tests.sh 0)
-+ set_tests_properties(run-rbd-unit-tests-0.sh PROPERTIES TIMEOUT 7200)
- add_ceph_test(run-rbd-unit-tests-1.sh ${CMAKE_CURRENT_SOURCE_DIR}/run-rbd-unit-tests.sh 1)
-+ set_tests_properties(run-rbd-unit-tests-1.sh PROPERTIES TIMEOUT 7200)
- add_ceph_test(run-rbd-unit-tests-61.sh ${CMAKE_CURRENT_SOURCE_DIR}/run-rbd-unit-tests.sh 61)
-+ set_tests_properties(run-rbd-unit-tests-61.sh PROPERTIES TIMEOUT 7200)
- add_ceph_test(run-rbd-unit-tests-109.sh ${CMAKE_CURRENT_SOURCE_DIR}/run-rbd-unit-tests.sh 109)
-+ set_tests_properties(run-rbd-unit-tests-109.sh PROPERTIES TIMEOUT 7200)
- add_ceph_test(run-rbd-unit-tests-127.sh ${CMAKE_CURRENT_SOURCE_DIR}/run-rbd-unit-tests.sh 127)
-+ set_tests_properties(run-rbd-unit-tests-127.sh PROPERTIES TIMEOUT 7200)
- if(FREEBSD)
- add_ceph_test(rbd-ggate.sh ${CMAKE_CURRENT_SOURCE_DIR}/rbd-ggate.sh)
- endif(FREEBSD)
-@@ -546,6 +552,7 @@
- #add_ceph_test(test_pidfile.sh ${CMAKE_CURRENT_SOURCE_DIR}/test_pidfile.sh)
-
- add_ceph_test(smoke.sh ${CMAKE_CURRENT_SOURCE_DIR}/smoke.sh)
-+set_tests_properties(smoke.sh PROPERTIES TIMEOUT 14400)
-
- set_property(
- TEST ${tox_tests}
-diff -uNr ceph-15.2.4/src/test/encoding/CMakeLists.txt ceph-15.2.4-fix_tests/src/test/encoding/CMakeLists.txt
---- ceph-15.2.4/src/test/encoding/CMakeLists.txt 2020-07-01 01:10:51.000000000 +0930
-+++ ceph-15.2.4-fix_tests/src/test/encoding/CMakeLists.txt 2020-11-08 17:37:15.789767451 +1030
-@@ -1,3 +1,5 @@
- # scripts
- add_ceph_test(check-generated.sh ${CMAKE_CURRENT_SOURCE_DIR}/check-generated.sh)
-+set_tests_properties(check-generated.sh PROPERTIES TIMEOUT 18000)
- add_ceph_test(readable.sh ${CMAKE_CURRENT_SOURCE_DIR}/readable.sh)
-+set_tests_properties(readable.sh PROPERTIES TIMEOUT 18000)
-diff -uNr ceph-15.2.4/src/test/mgr/CMakeLists.txt ceph-15.2.4-fix_tests/src/test/mgr/CMakeLists.txt
---- ceph-15.2.4/src/test/mgr/CMakeLists.txt 2020-07-01 01:10:51.000000000 +0930
-+++ ceph-15.2.4-fix_tests/src/test/mgr/CMakeLists.txt 2020-11-08 17:37:15.790767454 +1030
-@@ -9,6 +9,7 @@
- if(WITH_MGR_DASHBOARD_FRONTEND)
- if(NOT CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|AARCH64|arm|ARM")
- add_ceph_test(mgr-dashboard-frontend-unittests ${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard/run-frontend-unittests.sh)
-+ set_tests_properties(mgr-dashboard-frontend-unittests PROPERTIES TIMEOUT 72000)
- endif(NOT CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|AARCH64|arm|ARM")
-
- add_ceph_test(mgr-dashboard-smoke.sh ${CMAKE_CURRENT_SOURCE_DIR}/mgr-dashboard-smoke.sh)
-diff -uNr ceph-15.2.4/src/test/objectstore/CMakeLists.txt ceph-15.2.4-fix_tests/src/test/objectstore/CMakeLists.txt
---- ceph-15.2.4/src/test/objectstore/CMakeLists.txt 2020-07-01 01:10:51.000000000 +0930
-+++ ceph-15.2.4-fix_tests/src/test/objectstore/CMakeLists.txt 2020-11-08 17:37:15.791767457 +1030
-@@ -131,6 +131,7 @@
- test_bluefs.cc
- )
- add_ceph_unittest(unittest_bluefs)
-+ set_tests_properties(unittest_bluefs PROPERTIES TIMEOUT 7200)
- target_link_libraries(unittest_bluefs os global)
-
- # unittest_bluestore_types
-diff -uNr ceph-15.2.4/src/test/osd/CMakeLists.txt ceph-15.2.4-fix_tests/src/test/osd/CMakeLists.txt
---- ceph-15.2.4/src/test/osd/CMakeLists.txt 2020-07-01 01:10:51.000000000 +0930
-+++ ceph-15.2.4-fix_tests/src/test/osd/CMakeLists.txt 2020-11-08 17:41:54.515606236 +1030
-@@ -35,6 +35,7 @@
-
- # scripts
- add_ceph_test(safe-to-destroy.sh ${CMAKE_CURRENT_SOURCE_DIR}/safe-to-destroy.sh)
-+set_tests_properties(safe-to-destroy.sh PROPERTIES TIMEOUT 7200)
-
- # unittest_osdmap
- add_executable(unittest_osdmap
-diff -uNr ceph-15.2.4/src/test/osd/TestOSDScrub.cc ceph-15.2.4-fix_tests/src/test/osd/TestOSDScrub.cc
---- ceph-15.2.4/src/test/osd/TestOSDScrub.cc 2020-07-01 01:10:51.000000000 +0930
-+++ ceph-15.2.4-fix_tests/src/test/osd/TestOSDScrub.cc 2020-11-08 17:37:15.793767463 +1030
-@@ -70,7 +70,7 @@
- g_ceph_context->_conf.set_val("osd_scrub_begin_hour", "0");
- g_ceph_context->_conf.set_val("osd_scrub_end_hour", "24");
- g_ceph_context->_conf.apply_changes(nullptr);
-- tm tm;
-+ tm tm = {0};
- tm.tm_isdst = -1;
- strptime("2015-01-16 12:05:13", "%Y-%m-%d %H:%M:%S", &tm);
- utime_t now = utime_t(mktime(&tm), 0);