From: Radoslaw Zarzynski <rzarzyns@redhat.com>
Date: Mon, 17 Jun 2024 17:50:45 +0000 (+0200)
Subject: Merge pull request #40849 from dvanders/drainpeeringbug
X-Git-Tag: v20.0.0~1724
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f0a54054dd5fec85355fa2ad92efeddd594144fa;p=ceph.git

Merge pull request #40849 from dvanders/drainpeeringbug

test: test osd drain flap peering bug

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
---

f0a54054dd5fec85355fa2ad92efeddd594144fa
diff --cc src/test/CMakeLists.txt
index 2e756eeb5838,1cfe7990fce0..eb73fe3c1910
--- a/src/test/CMakeLists.txt
+++ b/src/test/CMakeLists.txt
@@@ -644,7 -609,29 +644,8 @@@ add_ceph_test(run-cli-tests ${CMAKE_CUR
  #add_ceph_test(test_pidfile.sh ${CMAKE_CURRENT_SOURCE_DIR}/test_pidfile.sh)
  
  add_ceph_test(smoke.sh ${CMAKE_CURRENT_SOURCE_DIR}/smoke.sh)
+ add_ceph_test(flap.sh ${CMAKE_CURRENT_SOURCE_DIR}/flap.sh)
  
 -if(DEFINED PROMTOOL_EXECUTABLE)
 -  set(promtool_executable_checked TRUE)
 -endif()
 -
 -find_program(PROMTOOL_EXECUTABLE promtool)
 -if(PROMTOOL_EXECUTABLE)
 -  execute_process(
 -    COMMAND ${PROMTOOL_EXECUTABLE} test rules /dev/null
 -    RESULT_VARIABLE rc
 -    OUTPUT_QUIET)
 -  if(NOT rc)
 -    add_ceph_test(run-promtool-unittests
 -      ${PROMTOOL_EXECUTABLE} test rules ${CMAKE_SOURCE_DIR}/monitoring/prometheus/tests/test_alerts.yml)
 -  elseif(NOT promtool_executable_checked)
 -    message(WARNING "'${PROMTOOL_EXECUTABLE} test rules' does not work, "
 -      "please use a newer prometheus")
 -  endif()
 -elseif(NOT promtool_executable_checked)
 -  message(WARNING "run-promtool-unittests is skipped due to missing promtool")
 -endif()
 -
  set_property(
    TEST ${tox_tests}
    PROPERTY ENVIRONMENT ${env_vars_for_tox_tests})