summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-03-28 09:53:35 +0000
committerGerrit Code Review <review@openstack.org>2017-03-28 09:53:35 +0000
commitb013b41a6a7b6d53deecc36cae2987e1fef76a78 (patch)
tree9760bd8debf0960554a113bc44ed6ae44a6d645f
parentad8c0de27e497abbedcd6149d1a6e3820d0cb765 (diff)
parent396a3d534f22e7d88b4f521c4e484ad468d1846d (diff)
Merge "Disable Murano tests"
-rw-r--r--fuelweb_test/tests/test_ha_one_controller.py14
1 files changed, 5 insertions, 9 deletions
diff --git a/fuelweb_test/tests/test_ha_one_controller.py b/fuelweb_test/tests/test_ha_one_controller.py
index 4716932..37e5a2b 100644
--- a/fuelweb_test/tests/test_ha_one_controller.py
+++ b/fuelweb_test/tests/test_ha_one_controller.py
@@ -425,14 +425,14 @@ class MultiroleComputeCinder(TestBasic):
425class MultiroleMultipleServices(TestBasic): 425class MultiroleMultipleServices(TestBasic):
426 """MultiroleMultipleServices.""" # TODO documentation 426 """MultiroleMultipleServices.""" # TODO documentation
427 427
428 @test(depends_on=[SetupEnvironment.prepare_slaves_5], 428 @test(depends_on=[SetupEnvironment.prepare_slaves_3],
429 groups=["deploy_multiple_services_local_mirror"]) 429 groups=["deploy_multiple_services_local_mirror"])
430 @log_snapshot_after_test 430 @log_snapshot_after_test
431 def deploy_multiple_services_local_mirror(self): 431 def deploy_multiple_services_local_mirror(self):
432 """Deploy cluster with multiple services using local mirror 432 """Deploy cluster with multiple services using local mirror
433 433
434 Scenario: 434 Scenario:
435 1. Revert snapshot 'prepare_slaves_5' with default set of mirrors 435 1. Revert snapshot 'prepare_slaves_3' with default set of mirrors
436 2. Run 'fuel-mirror' to create mirror repositories 436 2. Run 'fuel-mirror' to create mirror repositories
437 3. Create cluster with many components to check as many 437 3. Create cluster with many components to check as many
438 packages in local mirrors have correct dependencies 438 packages in local mirrors have correct dependencies
@@ -445,7 +445,7 @@ class MultiroleMultipleServices(TestBasic):
445 Duration 140m 445 Duration 140m
446 """ 446 """
447 self.show_step(1) 447 self.show_step(1)
448 self.env.revert_snapshot('ready_with_5_slaves') 448 self.env.revert_snapshot('ready_with_3_slaves')
449 449
450 self.show_step(2) 450 self.show_step(2)
451 admin_ip = self.ssh_manager.admin_ip 451 admin_ip = self.ssh_manager.admin_ip
@@ -468,8 +468,6 @@ class MultiroleMultipleServices(TestBasic):
468 'net_provider': 'neutron', 468 'net_provider': 'neutron',
469 'net_segment_type': NEUTRON_SEGMENT['tun'], 469 'net_segment_type': NEUTRON_SEGMENT['tun'],
470 'sahara': True, 470 'sahara': True,
471 'murano': True,
472 'ceilometer': True,
473 'volumes_lvm': True, 471 'volumes_lvm': True,
474 'volumes_ceph': False, 472 'volumes_ceph': False,
475 'images_ceph': True 473 'images_ceph': True
@@ -486,9 +484,7 @@ class MultiroleMultipleServices(TestBasic):
486 { 484 {
487 'slave-01': ['controller', 'ceph-osd'], 485 'slave-01': ['controller', 'ceph-osd'],
488 'slave-02': ['compute', 'ceph-osd'], 486 'slave-02': ['compute', 'ceph-osd'],
489 'slave-03': ['cinder', 'ceph-osd'], 487 'slave-03': ['cinder', 'ceph-osd']
490 'slave-04': ['mongo'],
491 'slave-05': ['mongo']
492 } 488 }
493 ) 489 )
494 490
@@ -510,7 +506,7 @@ class MultiroleMultipleServices(TestBasic):
510 self.show_step(7) 506 self.show_step(7)
511 self.fuel_web.run_ostf( 507 self.fuel_web.run_ostf(
512 cluster_id=cluster_id, 508 cluster_id=cluster_id,
513 test_sets=['ha', 'smoke', 'sanity']) 509 test_sets=['smoke'])
514 510
515 511
516@test 512@test