diff --git a/etc/rally/rally.conf.sample b/etc/rally/rally.conf.sample index 7f9d4da3..82a60285 100644 --- a/etc/rally/rally.conf.sample +++ b/etc/rally/rally.conf.sample @@ -268,15 +268,15 @@ # Time(in sec) to wait for magnum cluster to be created. (floating # point value) -#magnum_cluster_create_timeout = 1200.0 +#magnum_cluster_create_timeout = 2400.0 # Time interval(in sec) between checks when waiting for cluster # creation. (floating point value) -#magnum_cluster_create_poll_interval = 1.0 +#magnum_cluster_create_poll_interval = 2.0 # Time(in sec) to wait for k8s pod to be created. (floating point # value) -#k8s_pod_create_timeout = 600.0 +#k8s_pod_create_timeout = 1200.0 # Time interval(in sec) between checks when waiting for k8s pod # creation. (floating point value) diff --git a/rally-jobs/rally-magnum.yaml b/rally-jobs/rally-magnum.yaml index 73efc57f..c1f467ea 100644 --- a/rally-jobs/rally-magnum.yaml +++ b/rally-jobs/rally-magnum.yaml @@ -1,3 +1,4 @@ +{% set image = "Fedora-Atomic-26-20170723.0.x86_64" %} --- MagnumClusterTemplates.list_cluster_templates: - @@ -10,7 +11,7 @@ tenants: 1 users_per_tenant: 1 cluster_templates: - image_id: "fedora-atomic-latest" + image_id: {{ image }} flavor_id: "m1.small" master_flavor_id: "m1.small" external_network_id: "public" @@ -34,7 +35,7 @@ tenants: 1 users_per_tenant: 1 cluster_templates: - image_id: "fedora-atomic-latest" + image_id: {{ image }} flavor_id: "m1.small" master_flavor_id: "m1.small" external_network_id: "public" @@ -61,7 +62,7 @@ tenants: 1 users_per_tenant: 1 cluster_templates: - image_id: "fedora-atomic-latest" + image_id: {{ image }} flavor_id: "m1.small" master_flavor_id: "m1.small" external_network_id: "public" diff --git a/rally/plugins/openstack/cfg/magnum.py b/rally/plugins/openstack/cfg/magnum.py index b0619980..95d09b95 100644 --- a/rally/plugins/openstack/cfg/magnum.py +++ b/rally/plugins/openstack/cfg/magnum.py @@ -21,22 +21,22 @@ OPTS = {"benchmark": [ help="Time(in sec) to sleep after creating a resource before " "polling for the status."), cfg.FloatOpt("magnum_cluster_create_timeout", - default=1200.0, + default=2400.0, help="Time(in sec) to wait for magnum cluster to be " "created."), cfg.FloatOpt("magnum_cluster_create_poll_interval", - default=1.0, + default=2.0, help="Time interval(in sec) between checks when waiting for " "cluster creation."), cfg.FloatOpt("k8s_pod_create_timeout", - default=600.0, + default=1200.0, help="Time(in sec) to wait for k8s pod to be created."), cfg.FloatOpt("k8s_pod_create_poll_interval", default=1.0, help="Time interval(in sec) between checks when waiting for " "k8s pod creation."), cfg.FloatOpt("k8s_rc_create_timeout", - default=600.0, + default=1200.0, help="Time(in sec) to wait for k8s rc to be created."), cfg.FloatOpt("k8s_rc_create_poll_interval", default=1.0, diff --git a/tests/unit/plugins/openstack/scenarios/magnum/test_utils.py b/tests/unit/plugins/openstack/scenarios/magnum/test_utils.py index 2bf7bda5..efecadef 100644 --- a/tests/unit/plugins/openstack/scenarios/magnum/test_utils.py +++ b/tests/unit/plugins/openstack/scenarios/magnum/test_utils.py @@ -260,7 +260,7 @@ class MagnumScenarioTestCase(test.ScenarioTestCase): {"apiVersion": "v1", "kind": "Pod", "metadata": {"name": "nginx"}}) k8s_api.create_namespaced_pod.return_value = self.pod - mock_time.side_effect = [1, 2, 3, 4, 5, 900, 901] + mock_time.side_effect = [1, 2, 3, 4, 5, 1800, 1801] not_ready_pod = api_client.models.V1Pod() not_ready_status = api_client.models.V1PodStatus() not_ready_status.phase = "not_ready" @@ -348,7 +348,7 @@ class MagnumScenarioTestCase(test.ScenarioTestCase): rc = api_client.models.V1ReplicationController() rc.spec = api_client.models.V1ReplicationControllerSpec() rc.spec.replicas = manifest["spec"]["replicas"] - mock_time.side_effect = [1, 2, 3, 4, 5, 900, 901] + mock_time.side_effect = [1, 2, 3, 4, 5, 1800, 1801] k8s_api.create_namespaced_replication_controller.return_value = rc not_ready_rc = api_client.models.V1ReplicationController() not_ready_rc_status = (