Rename 1.7.0 to 2.0.0

As OpenStack release team suggested, as for backward incomaptible
changes we need to change major version.

+ get back jsoncshcema draft-4 as default, since it can break all
plugins at once.

Change-Id: Id1eadb69964c630f119eb00d5a7f69fac64ba825
This commit is contained in:
Andrey Kurilin 2019-09-13 23:58:35 +03:00
parent 9821d662b1
commit 02311d320b
9 changed files with 23 additions and 14 deletions

View File

@ -17,7 +17,7 @@ Changelog
.. Release notes for existing releases are MUTABLE! If there is something that .. Release notes for existing releases are MUTABLE! If there is something that
was missed or can be improved, feel free to change it! was missed or can be improved, feel free to change it!
[1.7.0] - 2019-09-10 [2.0.0] - 2019-09-13
-------------------- --------------------
Changed Changed

View File

@ -17,7 +17,7 @@ additional plugins:
# for rally user is used. # for rally user is used.
# #
# Tags of the image are the same as releases of xRally/Rally # Tags of the image are the same as releases of xRally/Rally
FROM xrally/xrally:1.7.0 FROM xrally/xrally:2.0.0
# "rally" user (which is selected by-default) is owner of "/rally" directory, # "rally" user (which is selected by-default) is owner of "/rally" directory,
# so there is no need to call chown or switch the user # so there is no need to call chown or switch the user
@ -39,8 +39,8 @@ details)
First of all, you need to pull the container. We suggest to use the last First of all, you need to pull the container. We suggest to use the last
tagged version: tagged version:
# pull the 1.7.0 image (the latest release at the point of writing the note) # pull the 2.0.0 image (the latest release at the point of writing the note)
$ docker pull xrally/xrally:1.7.0 $ docker pull xrally/xrally:2.0.0
**WARNING: never attach folders and volumes to `/rally` inside the container. It can break everything.** **WARNING: never attach folders and volumes to `/rally` inside the container. It can break everything.**
@ -56,7 +56,7 @@ docker volumes or mount the directory.
* use docker volumes. It is the easiest way. You just need to do something like: * use docker volumes. It is the easiest way. You just need to do something like:
$ docker volume create --name rally_volume $ docker volume create --name rally_volume
$ docker run -v rally_volume:/home/rally/.rally xrally/xrally:1.7.0 env create --name "foo" $ docker run -v rally_volume:/home/rally/.rally xrally/xrally:2.0.0 env create --name "foo"
* mount outer directory inside the container * mount outer directory inside the container

View File

@ -24,7 +24,8 @@ for each enum. (e.g. TaskStatus)
from rally.common import utils from rally.common import utils
JSON_SCHEMA = "http://json-schema.org/draft-07/schema" JSON_SCHEMA = "http://json-schema.org/draft-04/schema"
JSON_SCHEMA7 = "http://json-schema.org/draft-07/schema"
class _TaskStatus(utils.ImmutableMixin, utils.EnumMixin): class _TaskStatus(utils.ImmutableMixin, utils.EnumMixin):

View File

@ -148,7 +148,7 @@ class RPSScenarioRunner(runner.ScenarioRunner):
CONFIG_SCHEMA = { CONFIG_SCHEMA = {
"type": "object", "type": "object",
"$schema": consts.JSON_SCHEMA, "$schema": consts.JSON_SCHEMA7,
"properties": { "properties": {
"times": { "times": {
"type": "integer", "type": "integer",

View File

@ -19,14 +19,18 @@ SLA (Service-level agreement) is set of details for determining compliance
with contracted values such as maximum error rate or minimum response time. with contracted values such as maximum error rate or minimum response time.
""" """
from rally import consts
from rally.task import sla from rally.task import sla
@sla.configure(name="max_seconds_per_iteration") @sla.configure(name="max_seconds_per_iteration")
class IterationTime(sla.SLA): class IterationTime(sla.SLA):
"""Maximum time for one iteration in seconds.""" """Maximum time for one iteration in seconds."""
CONFIG_SCHEMA = {"type": "number", "minimum": 0.0, CONFIG_SCHEMA = {
"exclusiveMinimum": 0.0} "type": "number",
"$schema": consts.JSON_SCHEMA7,
"minimum": 0.0,
"exclusiveMinimum": 0.0}
def __init__(self, criterion_value): def __init__(self, criterion_value):
super(IterationTime, self).__init__(criterion_value) super(IterationTime, self).__init__(criterion_value)

View File

@ -20,14 +20,18 @@ with contracted values such as maximum error rate or minimum response time.
""" """
from rally.common import streaming_algorithms from rally.common import streaming_algorithms
from rally import consts
from rally.task import sla from rally.task import sla
@sla.configure(name="max_avg_duration") @sla.configure(name="max_avg_duration")
class MaxAverageDuration(sla.SLA): class MaxAverageDuration(sla.SLA):
"""Maximum average duration of one iteration in seconds.""" """Maximum average duration of one iteration in seconds."""
CONFIG_SCHEMA = {"type": "number", "minimum": 0.0, CONFIG_SCHEMA = {
"exclusiveMinimum": 0.0} "type": "number",
"$schema": consts.JSON_SCHEMA7,
"exclusiveMinimum": 0.0
}
def __init__(self, criterion_value): def __init__(self, criterion_value):
super(MaxAverageDuration, self).__init__(criterion_value) super(MaxAverageDuration, self).__init__(criterion_value)

View File

@ -33,7 +33,7 @@ class Outliers(sla.SLA):
""" """
CONFIG_SCHEMA = { CONFIG_SCHEMA = {
"type": "object", "type": "object",
"$schema": consts.JSON_SCHEMA, "$schema": consts.JSON_SCHEMA7,
"properties": { "properties": {
"max": {"type": "integer", "minimum": 0}, "max": {"type": "integer", "minimum": 0},
"min_iterations": {"type": "integer", "minimum": 3}, "min_iterations": {"type": "integer", "minimum": 3},

View File

@ -38,7 +38,7 @@ class PerformanceDegradation(sla.SLA):
""" """
CONFIG_SCHEMA = { CONFIG_SCHEMA = {
"type": "object", "type": "object",
"$schema": consts.JSON_SCHEMA, "$schema": consts.JSON_SCHEMA7,
"properties": { "properties": {
"max_degradation": { "max_degradation": {
"type": "number", "type": "number",

View File

@ -314,7 +314,7 @@ class ActionBuilder(object):
SCHEMA_TEMPLATE = { SCHEMA_TEMPLATE = {
"type": "array", "type": "array",
"$schema": consts.JSON_SCHEMA, "$schema": consts.JSON_SCHEMA7,
"items": { "items": {
"type": "object", "type": "object",
"properties": {}, "properties": {},