From 88782b2f7138cabf0dabbfb6b0246670cc39114b Mon Sep 17 00:00:00 2001 From: glukhman Date: Tue, 15 Aug 2023 11:39:44 +0000 Subject: [PATCH 1/2] Fix-nine-nodes-fqdns-typo --- cosmo_tester/test_suites/cluster/conftest.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cosmo_tester/test_suites/cluster/conftest.py b/cosmo_tester/test_suites/cluster/conftest.py index 49d26c261..4ade0794d 100644 --- a/cosmo_tester/test_suites/cluster/conftest.py +++ b/cosmo_tester/test_suites/cluster/conftest.py @@ -303,7 +303,7 @@ def nine_vms(nine_session_vms, test_config, logger, request): @pytest.fixture(scope='function') def nine_vms_fqdns(nine_session_vms_fqdns, test_config, logger, request): - util.reboot_if_required(nine_session_vms) + util.reboot_if_required(nine_session_vms_fqdns) for vm in nine_session_vms_fqdns: _ensure_installer_not_installed(vm) yield _get_hosts(nine_session_vms_fqdns, test_config, logger, @@ -877,3 +877,4 @@ def _remove_cluster(node): # yum clean all doesn't clean all, so let's be more forceful node.log_action('Cleaning yum cache') node.run_command('sudo rm -rf /var/cache/yum') + From a0476a3d9b794d217b7c815cda6a40c229f8d853 Mon Sep 17 00:00:00 2001 From: glukhman Date: Tue, 15 Aug 2023 11:41:27 +0000 Subject: [PATCH 2/2] Update cluster-manager to newest version --- cosmo_tester/config_schemas/cfy_cluster_manager.yaml | 3 ++- cosmo_tester/test_suites/cluster/conftest.py | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cosmo_tester/config_schemas/cfy_cluster_manager.yaml b/cosmo_tester/config_schemas/cfy_cluster_manager.yaml index 70c00c866..e9f0a85e2 100644 --- a/cosmo_tester/config_schemas/cfy_cluster_manager.yaml +++ b/cosmo_tester/config_schemas/cfy_cluster_manager.yaml @@ -1,4 +1,5 @@ namespace: cfy_cluster_manager rpm_path: description: The cfy_cluster_manager RPM path to install. - default: 'https://repository.cloudifysource.org/cloudify/cloudify-cluster-manager/1.1.4/ga-release/cloudify-cluster-manager-1.1.4-ga.el7.x86_64.rpm' + default: 'https://repository.cloudifysource.org/cloudify/cloudify-cluster-manager/1.1.6/ga-release/cloudify-cluster-manager-1.1.6-ga.el7.x86_64.rpm' + diff --git a/cosmo_tester/test_suites/cluster/conftest.py b/cosmo_tester/test_suites/cluster/conftest.py index 4ade0794d..07c2fb4e8 100644 --- a/cosmo_tester/test_suites/cluster/conftest.py +++ b/cosmo_tester/test_suites/cluster/conftest.py @@ -877,4 +877,3 @@ def _remove_cluster(node): # yum clean all doesn't clean all, so let's be more forceful node.log_action('Cleaning yum cache') node.run_command('sudo rm -rf /var/cache/yum') -