From 166bab6b94836b553f0a09af364cdc520d7a5946 Mon Sep 17 00:00:00 2001 From: Boris Pavlovic Date: Mon, 24 Nov 2014 18:09:58 +0400 Subject: [PATCH] Update rally-jobs files *) Rename rally-scenarios that is quite misleading to rally-jobs. rally-jobs makes much more sense, cause it actually contains files related to rally job *) Update rally-jobs/README.rst to add more info *) Update rally-jobs/plugins/README.rst to expaling plugins *) Add new directory rally-jobs/extra, this directory is copy pasted in gates and can be used for files that are required by some of benchmarks Change-Id: I6d0c0435a4bb4658ddf4adb871bc36ab8c157f3e --- rally-jobs/README.rst | 29 ++++++++++++++++++ rally-jobs/extra/README.rst | 6 ++++ .../neutron-neutron.yaml | 0 rally-jobs/plugins/README.rst | 9 ++++++ rally-jobs/plugins/__init__.py | 0 rally-scenarios/README.rst | 5 ---- rally-scenarios/plugins/sample.py | 30 ------------------- 7 files changed, 44 insertions(+), 35 deletions(-) create mode 100644 rally-jobs/README.rst create mode 100644 rally-jobs/extra/README.rst rename {rally-scenarios => rally-jobs}/neutron-neutron.yaml (100%) create mode 100644 rally-jobs/plugins/README.rst create mode 100644 rally-jobs/plugins/__init__.py delete mode 100644 rally-scenarios/README.rst delete mode 100644 rally-scenarios/plugins/sample.py diff --git a/rally-jobs/README.rst b/rally-jobs/README.rst new file mode 100644 index 0000000000..87300ffb55 --- /dev/null +++ b/rally-jobs/README.rst @@ -0,0 +1,29 @@ +Rally job related files +======================= + +This directory contains rally tasks and plugins that are run by OpenStack CI. + +Structure +--------- + +* plugins - directory where you can add rally plugins. Almost everything in + Rally is a plugin. Benchmark context, Benchmark scenario, SLA checks, Generic + cleanup resources, .... + +* extra - all files from this directory will be copy pasted to gates, so you + are able to use absolute paths in rally tasks. + Files will be located in ~/.rally/extra/* + +* neutron-neutron.yaml is a task that is run in gates against OpenStack with + Neutron Service deployed by DevStack + +Useful links +------------ + +* More about Rally: https://rally.readthedocs.org/en/latest/ + +* How to add rally-gates: https://rally.readthedocs.org/en/latest/rally_gatejob.html + +* About plugins: https://rally.readthedocs.org/en/latest/plugins.html + +* Plugin samples: https://github.com/stackforge/rally/tree/master/doc/samples/plugins diff --git a/rally-jobs/extra/README.rst b/rally-jobs/extra/README.rst new file mode 100644 index 0000000000..aab343c51d --- /dev/null +++ b/rally-jobs/extra/README.rst @@ -0,0 +1,6 @@ +Extra files +=========== + +All files from this directory will be copy pasted to gates, so you are able to +use absolute path in rally tasks. Files will be in ~/.rally/extra/* + diff --git a/rally-scenarios/neutron-neutron.yaml b/rally-jobs/neutron-neutron.yaml similarity index 100% rename from rally-scenarios/neutron-neutron.yaml rename to rally-jobs/neutron-neutron.yaml diff --git a/rally-jobs/plugins/README.rst b/rally-jobs/plugins/README.rst new file mode 100644 index 0000000000..33bec0d253 --- /dev/null +++ b/rally-jobs/plugins/README.rst @@ -0,0 +1,9 @@ +Rally plugins +============= + +All *.py modules from this directory will be auto-loaded by Rally and all +plugins will be discoverable. There is no need of any extra configuration +and there is no difference between writing them here and in rally code base. + +Note that it is better to push all interesting and useful benchmarks to Rally +code base, this simplifies administration for Operators. diff --git a/rally-jobs/plugins/__init__.py b/rally-jobs/plugins/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/rally-scenarios/README.rst b/rally-scenarios/README.rst deleted file mode 100644 index 9af99db509..0000000000 --- a/rally-scenarios/README.rst +++ /dev/null @@ -1,5 +0,0 @@ -This directory contains rally benchmark scenarios to be run by OpenStack CI. - - -* more about rally: https://wiki.openstack.org/wiki/Rally -* how to use rally-gates: https://wiki.openstack.org/wiki/Rally/RallyGates diff --git a/rally-scenarios/plugins/sample.py b/rally-scenarios/plugins/sample.py deleted file mode 100644 index 2b3952c517..0000000000 --- a/rally-scenarios/plugins/sample.py +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 2014: Mirantis Inc. -# All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - - -from rally.benchmark.scenarios.neutron import utils - - -class NeutronListNetworks(utils.NeutronScenario): - - @base.scenario() - def list_networks(self): - """Test listing all networks. - - This scenario is a very useful tool to measure - the "neutron net-list" command performance. - - """ - self._list_networks()