From e34ae7401ba21a6bf7dc12d5fe665269fd56c652 Mon Sep 17 00:00:00 2001
From: Peter Zhu <zhujiaxi@amazon.com>
Date: Tue, 6 Feb 2024 12:31:58 -0500
Subject: [PATCH] Disable remote cluster test settings added in 998 PR of
 ftrepo

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
---
 .../integ_test_suite_opensearch_dashboards.py   |   2 +-
 ...nteg_test_suite_opensearch_dashboards.py.swp | Bin 32768 -> 0 bytes
 ...st_integ_test_suite_opensearch_dashboards.py |   2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 delete mode 100644 tests/tests_test_workflow/test_integ_workflow/integ_test/.test_integ_test_suite_opensearch_dashboards.py.swp

diff --git a/src/test_workflow/integ_test/integ_test_suite_opensearch_dashboards.py b/src/test_workflow/integ_test/integ_test_suite_opensearch_dashboards.py
index 4deb6941b9..9296907d35 100644
--- a/src/test_workflow/integ_test/integ_test_suite_opensearch_dashboards.py
+++ b/src/test_workflow/integ_test/integ_test_suite_opensearch_dashboards.py
@@ -110,7 +110,7 @@ def custom_node_endpoint_encoder(node_endpoint: NodeEndpoint) -> dict:
             return {"endpoint": node_endpoint.endpoint, "port": node_endpoint.port, "transport": node_endpoint.transport}
         if os.path.exists(script):
             single_node = cluster_endpoints[0].data_nodes[0]
-            cmd = f"bash {script} -b {single_node.endpoint} -p {single_node.port} -s {str(security).lower()} -t {self.component.name} -v {self.bundle_manifest.build.version} -o default"
+            cmd = f"bash {script} -b {single_node.endpoint} -p {single_node.port} -s {str(security).lower()} -t {self.component.name} -v {self.bundle_manifest.build.version} -o default -r false"
             self.repo_work_dir = os.path.join(
                 self.repo.dir, self.test_config.working_directory) if self.test_config.working_directory is not None else self.repo.dir
             (status, stdout, stderr) = execute(cmd, self.repo_work_dir, True, False)
diff --git a/tests/tests_test_workflow/test_integ_workflow/integ_test/.test_integ_test_suite_opensearch_dashboards.py.swp b/tests/tests_test_workflow/test_integ_workflow/integ_test/.test_integ_test_suite_opensearch_dashboards.py.swp
deleted file mode 100644
index 717721711c060eba56a17dffcc363b77a7518d3f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 32768
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
Y3}#xxVA!sZm8r=L$<~6h6Q*JO5Bd1T%>V!Z

diff --git a/tests/tests_test_workflow/test_integ_workflow/integ_test/test_integ_test_suite_opensearch_dashboards.py b/tests/tests_test_workflow/test_integ_workflow/integ_test/test_integ_test_suite_opensearch_dashboards.py
index f36b7b55c1..463c84d081 100644
--- a/tests/tests_test_workflow/test_integ_workflow/integ_test/test_integ_test_suite_opensearch_dashboards.py
+++ b/tests/tests_test_workflow/test_integ_workflow/integ_test/test_integ_test_suite_opensearch_dashboards.py
@@ -193,7 +193,7 @@ def test_execute_integtest_sh(self, mock_execute: Mock, mock_git: Mock, mock_tes
         status = suite.execute_integtest_sh("test_endpoint", 1234, True, "with-security")
 
         self.assertEqual(status, "test_status")
-        mock_execute.assert_called_once_with('bash ./integtest.sh -b test_endpoint -p 1234 -s true -t sql -v 1.2.0 -o default', os.path.join("dir", "test_working_directory"), True, False)
+        mock_execute.assert_called_once_with('bash ./integtest.sh -b test_endpoint -p 1234 -s true -t sql -v 1.2.0 -o default -r false', os.path.join("dir", "test_working_directory"), True, False)
 
         mock_test_result_data.assert_called_once_with(
             "sql",