From 062e0365ea657b3e5138675efc2edfa7f090fd61 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Fri, 31 Jan 2020 13:52:49 +0800 Subject: [PATCH] qa/tasks: drop test_cephadm_orchestrator.py this test will end with a failure like ``` 2020-01-30T18:15:15.870 INFO:tasks.ceph.mgr.x.smithi042.stderr:Warning: Permanently added 'smithi042.front.sepia.ceph.com,172.21.15.42' (ECDSA) to the list of known hosts. 2020-01-30T18:15:15.925 INFO:tasks.ceph.mgr.x.smithi042.stderr:Permission denied, please try again. 2020-01-30T18:15:15.932 INFO:tasks.ceph.mgr.x.smithi042.stderr:Permission denied, please try again. 2020-01-30T18:15:15.939 INFO:tasks.ceph.mgr.x.smithi042.stderr:root@smithi042.front.sepia.ceph.com: Permission denied (publickey,gssapi-keyex,gssapi-with-mic,password). ``` because mgr is not able to establish an ssh connection to that host with "root". please note, the teuthology worker is acting using the "ubuntu" account on the test node, and by default, "root" does not have its pubkey. and actually `qa/tasks/cephadm.py` does push the pubkey to all the managed hosts before testing cephadm. since `qa/tasks/cephadm.py` is a better test for cephadm, let's just drop this one. as suites/rados/cephadm already covers cephadm Signed-off-by: Kefu Chai --- .../singleton-flat/cephadm_orchestrator/+ | 0 .../singleton-flat/cephadm_orchestrator/.qa | 1 - .../cephadm_orchestrator/2-node-mgr.yaml | 1 - .../cephadm_orchestrator/centos_latest.yaml | 1 - .../cephadm_orchestrator.yaml | 18 --------------- .../cephadm_orchestrator/mgr.yaml | 1 - qa/tasks/mgr/test_cephadm_orchestrator.py | 23 ------------------- 7 files changed, 45 deletions(-) delete mode 100644 qa/suites/rados/singleton-flat/cephadm_orchestrator/+ delete mode 120000 qa/suites/rados/singleton-flat/cephadm_orchestrator/.qa delete mode 120000 qa/suites/rados/singleton-flat/cephadm_orchestrator/2-node-mgr.yaml delete mode 120000 qa/suites/rados/singleton-flat/cephadm_orchestrator/centos_latest.yaml delete mode 100644 qa/suites/rados/singleton-flat/cephadm_orchestrator/cephadm_orchestrator.yaml delete mode 120000 qa/suites/rados/singleton-flat/cephadm_orchestrator/mgr.yaml delete mode 100644 qa/tasks/mgr/test_cephadm_orchestrator.py diff --git a/qa/suites/rados/singleton-flat/cephadm_orchestrator/+ b/qa/suites/rados/singleton-flat/cephadm_orchestrator/+ deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/qa/suites/rados/singleton-flat/cephadm_orchestrator/.qa b/qa/suites/rados/singleton-flat/cephadm_orchestrator/.qa deleted file mode 120000 index fea2489fdf6..00000000000 --- a/qa/suites/rados/singleton-flat/cephadm_orchestrator/.qa +++ /dev/null @@ -1 +0,0 @@ -../.qa \ No newline at end of file diff --git a/qa/suites/rados/singleton-flat/cephadm_orchestrator/2-node-mgr.yaml b/qa/suites/rados/singleton-flat/cephadm_orchestrator/2-node-mgr.yaml deleted file mode 120000 index 8a0b9123b38..00000000000 --- a/qa/suites/rados/singleton-flat/cephadm_orchestrator/2-node-mgr.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/clusters/2-node-mgr.yaml \ No newline at end of file diff --git a/qa/suites/rados/singleton-flat/cephadm_orchestrator/centos_latest.yaml b/qa/suites/rados/singleton-flat/cephadm_orchestrator/centos_latest.yaml deleted file mode 120000 index bd9854e7029..00000000000 --- a/qa/suites/rados/singleton-flat/cephadm_orchestrator/centos_latest.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/distros/supported/centos_latest.yaml \ No newline at end of file diff --git a/qa/suites/rados/singleton-flat/cephadm_orchestrator/cephadm_orchestrator.yaml b/qa/suites/rados/singleton-flat/cephadm_orchestrator/cephadm_orchestrator.yaml deleted file mode 100644 index 6b88bfb4b55..00000000000 --- a/qa/suites/rados/singleton-flat/cephadm_orchestrator/cephadm_orchestrator.yaml +++ /dev/null @@ -1,18 +0,0 @@ - -tasks: - - install: - - ceph: - # tests may leave mgrs broken, so don't try and call into them - # to invoke e.g. pg dump during teardown. - wait-for-scrub: false - log-whitelist: - - overall HEALTH_ - - \(MGR_DOWN\) - - \(MGR_INSIGHTS_WARNING\) - - \(insights_health_check - - \(PG_ - - replacing it with standby - - No standby daemons available - - cephfs_test_runner: - modules: - - tasks.mgr.test_cephadm_orchestrator diff --git a/qa/suites/rados/singleton-flat/cephadm_orchestrator/mgr.yaml b/qa/suites/rados/singleton-flat/cephadm_orchestrator/mgr.yaml deleted file mode 120000 index 651e5f8a89e..00000000000 --- a/qa/suites/rados/singleton-flat/cephadm_orchestrator/mgr.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/debug/mgr.yaml \ No newline at end of file diff --git a/qa/tasks/mgr/test_cephadm_orchestrator.py b/qa/tasks/mgr/test_cephadm_orchestrator.py deleted file mode 100644 index 16966b2afbc..00000000000 --- a/qa/tasks/mgr/test_cephadm_orchestrator.py +++ /dev/null @@ -1,23 +0,0 @@ -import logging -from mgr_test_case import MgrTestCase - -log = logging.getLogger(__name__) - -class TestOrchestratorCli(MgrTestCase): - MGRS_REQUIRED = 1 - - def _orch_cmd(self, *args): - return self.mgr_cluster.mon_manager.raw_cluster_cmd("orchestrator", *args) - - def setUp(self): - super(TestOrchestratorCli, self).setUp() - self._load_module("orchestrator_cli") - self._load_module("cephadm") - self._orch_cmd("set", "backend", "cephadm") - - def test_host_ls(self): - self._orch_cmd("host", "add", "osd0") - self._orch_cmd("host", "add", "mon0") - ret = self._orch_cmd("host", "ls") - self.assertIn("osd0", ret) - self.assertIn("mon0", ret) -- 2.39.5