[evil][ci] Preparing to remove all OpenStack in-tree plugins
Installing 'rally-openstack' package in our devstack plugin can simplify adoption of a new package, i.e no need to rework legacy jobs while porting custom plugins to use new package. Also, this patch removes checking for openstack samples, since it should be done in rally-openstack repo Change-Id: I3446ccd5a36cb686282e85a9ea210d1723da1fef
This commit is contained in:
Andrey Kurilin
parent
c77ce40471
commit
85d7eb3760
@ -84,6 +84,7 @@ fi
|
||||
# install_rally() - Collect source and prepare
|
||||
function install_rally() {
|
||||
setup_develop $RALLY_DIR
|
||||
sudo pip install rally_openstack>=1.1.0
|
||||
}
|
||||
|
||||
# configure_rally() - Set config files, create data dirs, etc
|
||||
|
||||
@ -1,44 +0,0 @@
|
||||
# Copyright 2014: Mirantis Inc.
|
||||
# Copyright 2014: Catalyst IT Ltd.
|
||||
# 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.
|
||||
|
||||
import os
|
||||
import traceback
|
||||
import unittest
|
||||
|
||||
import rally as rally_m
|
||||
from tests.check_samples import utils
|
||||
|
||||
|
||||
class TestPreCreatedTasks(unittest.TestCase):
|
||||
|
||||
def test_check_success(self):
|
||||
rally = utils.Rally()
|
||||
rally("deployment check")
|
||||
|
||||
def test_task_samples_is_valid(self):
|
||||
|
||||
rally = utils.Rally()
|
||||
full_path = os.path.join(
|
||||
os.path.dirname(rally_m.__file__), os.pardir, "tasks", "openstack")
|
||||
task_path = os.path.join(full_path, "task.yaml")
|
||||
args_path = os.path.join(full_path, "task_arguments.yaml")
|
||||
|
||||
try:
|
||||
rally("task validate --task %s --task-args-file %s" % (task_path,
|
||||
args_path))
|
||||
except Exception:
|
||||
print(traceback.format_exc())
|
||||
self.fail("Wrong task config %s" % full_path)
|
||||
@ -1,161 +0,0 @@
|
||||
# Copyright 2014: Mirantis Inc.
|
||||
# Copyright 2014: Catalyst IT Ltd.
|
||||
# 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.
|
||||
|
||||
import copy
|
||||
import json
|
||||
import mock
|
||||
import os
|
||||
import re
|
||||
import traceback
|
||||
import unittest
|
||||
|
||||
import six
|
||||
|
||||
import rally as rally_module
|
||||
from rally import api
|
||||
from rally.common import broker
|
||||
from rally.common import yamlutils as yaml
|
||||
from rally import plugins
|
||||
from rally.plugins.openstack.context.keystone import users
|
||||
from tests.check_samples import utils
|
||||
|
||||
|
||||
class TestTaskSamples(unittest.TestCase):
|
||||
|
||||
NUMBER_OF_THREADS = 20
|
||||
|
||||
def _skip(self, validation_output):
|
||||
"""Help to decide do we want to skip this result or not.
|
||||
|
||||
:param validation_output: string representation of the
|
||||
error that we want to check
|
||||
:return: True if we want to skip this error
|
||||
of task sample validation, otherwise False.
|
||||
"""
|
||||
|
||||
skip_lst = ["[Ss]ervice is not available",
|
||||
"is not installed. To install it run",
|
||||
"extension.* is not configured"]
|
||||
for check_str in skip_lst:
|
||||
if re.search(check_str, validation_output) is not None:
|
||||
return True
|
||||
return False
|
||||
|
||||
@plugins.ensure_plugins_are_loaded
|
||||
def test_task_samples_are_valid(self):
|
||||
rally = utils.Rally(force_new_db=True)
|
||||
|
||||
# let's use pre-created users to make TestTaskSamples quicker
|
||||
rapi = api.API(config_file=rally.config_filename)
|
||||
deployment = rapi.deployment._get("MAIN")
|
||||
admin_cred = deployment.get_credentials_for("openstack")["admin"]
|
||||
|
||||
ctx = {
|
||||
"env": {
|
||||
"platforms": {
|
||||
"openstack": {
|
||||
"admin": admin_cred.to_dict(),
|
||||
"users": []}}},
|
||||
"task": {"uuid": self.__class__.__name__,
|
||||
"deployment_uuid": deployment["uuid"]}}
|
||||
user_ctx = users.UserGenerator(ctx)
|
||||
user_ctx.setup()
|
||||
self.addCleanup(user_ctx.cleanup)
|
||||
|
||||
os_creds = deployment["config"]["openstack"]
|
||||
|
||||
user = copy.copy(os_creds["admin"])
|
||||
user["username"] = ctx["users"][0]["credential"].username
|
||||
user["password"] = ctx["users"][0]["credential"].password
|
||||
if "project_name" in os_creds["admin"]:
|
||||
# it is Keystone
|
||||
user["project_name"] = ctx["users"][0]["credential"].tenant_name
|
||||
else:
|
||||
user["tenant_name"] = ctx["users"][0]["credential"].tenant_name
|
||||
os_creds["users"] = [user]
|
||||
|
||||
rally("deployment destroy MAIN", write_report=False)
|
||||
deployment_cfg = os.path.join(rally.tmp_dir, "new_deployment.json")
|
||||
with open(deployment_cfg, "w") as f:
|
||||
f.write(json.dumps({"openstack": os_creds}))
|
||||
rally("deployment create --name MAIN --filename %s" % deployment_cfg,
|
||||
write_report=False)
|
||||
|
||||
# NOTE(andreykurilin): mock building credential to share one cache of
|
||||
# clients(it will allow to avoid hundreds of redundant
|
||||
# authentications) between validations of different samples
|
||||
deployment = rapi.deployment._get("MAIN")
|
||||
original_get_credentials_for = deployment.get_credentials_for
|
||||
creds_cache = {}
|
||||
|
||||
def get_credentials_for(platform):
|
||||
if platform not in creds_cache:
|
||||
creds_cache[platform] = original_get_credentials_for(
|
||||
platform)
|
||||
return creds_cache[platform]
|
||||
|
||||
deployment.get_credentials_for = get_credentials_for
|
||||
|
||||
deployment_patcher = mock.patch("rally.api.objects.Deployment.get")
|
||||
m_deployment = deployment_patcher.start()
|
||||
m_deployment.return_value = deployment
|
||||
self.addCleanup(deployment_patcher.stop)
|
||||
|
||||
# store all failures and print them at once
|
||||
failed_samples = {}
|
||||
|
||||
def publisher(queue):
|
||||
"""List all samples and render task configs"""
|
||||
samples_path = os.path.join(
|
||||
os.path.dirname(rally_module.__file__), os.pardir,
|
||||
"samples", "tasks")
|
||||
|
||||
for dirname, dirnames, filenames in os.walk(samples_path):
|
||||
# NOTE(rvasilets): Skip by suggest of boris-42 because in
|
||||
# future we don't what to maintain this dir
|
||||
if dirname.find("tempest-do-not-run-against-production") != -1:
|
||||
continue
|
||||
for filename in filenames:
|
||||
full_path = os.path.join(dirname, filename)
|
||||
|
||||
# NOTE(hughsaunders): Skip non config files
|
||||
# (bug https://bugs.launchpad.net/rally/+bug/1314369)
|
||||
if os.path.splitext(filename)[1] != ".json":
|
||||
continue
|
||||
with open(full_path) as task_file:
|
||||
input_task = task_file.read()
|
||||
rendered_task = rapi.task.render_template(
|
||||
task_template=input_task)
|
||||
queue.append((full_path, rendered_task))
|
||||
|
||||
def consumer(_cache, sample):
|
||||
"""Validate one sample"""
|
||||
full_path, rendered_task = sample
|
||||
task_config = yaml.safe_load(rendered_task)
|
||||
try:
|
||||
rapi.task.validate(deployment="MAIN",
|
||||
config=task_config)
|
||||
except Exception as e:
|
||||
if not self._skip(six.text_type(e)):
|
||||
failed_samples[full_path] = traceback.format_exc()
|
||||
|
||||
broker.run(publisher, consumer, self.NUMBER_OF_THREADS)
|
||||
|
||||
if failed_samples:
|
||||
self.fail("Validation failed on the one or several samples. "
|
||||
"See details below:\n%s" %
|
||||
"".join(["\n======\n%s\n\n%s\n" % (k, v)
|
||||
for k, v in failed_samples.items()]))
|
||||
@ -1,32 +0,0 @@
|
||||
# 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.
|
||||
|
||||
import os
|
||||
import subprocess
|
||||
|
||||
from tests.functional import utils
|
||||
|
||||
|
||||
DEPLOYMENT_FILE = "/tmp/rally_functests_main_deployment.json"
|
||||
|
||||
|
||||
class Rally(utils.Rally):
|
||||
|
||||
def __init__(self, force_new_db=False):
|
||||
self._DEPLOYMENT_CREATE_ARGS = " --file %s" % DEPLOYMENT_FILE
|
||||
if not os.path.exists(DEPLOYMENT_FILE):
|
||||
subprocess.call(["rally", "--log-file", "/dev/null",
|
||||
"deployment", "config"],
|
||||
stdout=open(DEPLOYMENT_FILE, "w"))
|
||||
super(Rally, self).__init__(force_new_db=force_new_db)
|
||||
10
tox.ini
10
tox.ini
@ -54,12 +54,9 @@ basepython = python3.5
|
||||
commands = oslo_debug_helper -t tests {posargs}
|
||||
|
||||
[testenv:cli]
|
||||
deps =
|
||||
PyMySQL>=0.7.6
|
||||
psycopg2>=2.5
|
||||
commands =
|
||||
find . -type f -name "*.pyc" -delete
|
||||
python {toxinidir}/tests/ci/pytest_launcher.py tests/check_samples --posargs={posargs}
|
||||
echo "do nothing"
|
||||
|
||||
[testenv:functional]
|
||||
sitepackages = True
|
||||
@ -67,11 +64,6 @@ commands =
|
||||
find . -type f -name "*.pyc" -delete
|
||||
{toxinidir}/tests/ci/rally_functional_job.sh {posargs}
|
||||
|
||||
[testenv:samples]
|
||||
commands =
|
||||
find . -type f -name "*.pyc" -delete
|
||||
python {toxinidir}/tests/ci/pytest_launcher.py tests/samples --posargs={posargs}
|
||||
|
||||
[testenv:cover]
|
||||
commands = {toxinidir}/tests/ci/cover.sh {posargs}
|
||||
|
||||
|
||||
10
zuul.yaml
10
zuul.yaml
@ -29,14 +29,6 @@
|
||||
vars:
|
||||
tox_envlist: self
|
||||
|
||||
- job:
|
||||
name: rally-tox-samples
|
||||
parent: tox
|
||||
description: |
|
||||
Validates rally/samples
|
||||
vars:
|
||||
tox_envlist: samples
|
||||
|
||||
- project:
|
||||
check:
|
||||
jobs:
|
||||
@ -44,7 +36,6 @@
|
||||
- rally-install-ubuntu-xenial
|
||||
- rally-install-centos-7
|
||||
- openstack-tox-functional
|
||||
- rally-tox-samples
|
||||
- rally-tox-self
|
||||
gate:
|
||||
jobs:
|
||||
@ -52,6 +43,5 @@
|
||||
- rally-install-ubuntu-xenial
|
||||
- rally-install-centos-7
|
||||
- openstack-tox-functional
|
||||
- rally-tox-samples
|
||||
- rally-tox-self
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user