Split upgrade test into its own play
To avoid requiring all the os_previous_cinder tasks to be evaluated, we should split the 2 tests up. This will help make the gate more efficient and avoids unnecessary issues. Change-Id: I861764c498618cf644c06b212cf789fe8aa6b3d4
This commit is contained in:
parent
81acf277e0
commit
27221f75a7
35
tests/test-upgrade.yml
Normal file
35
tests/test-upgrade.yml
Normal file
@ -0,0 +1,35 @@
|
||||
---
|
||||
# Copyright 2015, Rackspace US, Inc.
|
||||
#
|
||||
# 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.
|
||||
|
||||
# Setup the host
|
||||
- include: common/test-setup-host.yml
|
||||
|
||||
# Prepare the cinder-volumes VG
|
||||
- include: common/test-setup-cinder-localhost.yml
|
||||
|
||||
# Install RabbitMQ/MariaDB
|
||||
- include: common/test-install-infra.yml
|
||||
|
||||
# Install Keystone
|
||||
- include: common/test-install-keystone.yml
|
||||
|
||||
# Install previous Cinder
|
||||
- include: test-install-previous-cinder.yml
|
||||
|
||||
# Install Cinder
|
||||
- include: common/test-install-cinder.yml
|
||||
|
||||
# Install and execute Tempest
|
||||
- include: common/test-install-tempest.yml
|
@ -25,12 +25,6 @@
|
||||
# Install Keystone
|
||||
- include: common/test-install-keystone.yml
|
||||
|
||||
# Install previous Cinder
|
||||
- include: test-install-previous-cinder.yml
|
||||
when:
|
||||
- cinder_upgrade is defined
|
||||
- cinder_upgrade | bool
|
||||
|
||||
# Install Cinder
|
||||
- include: common/test-install-cinder.yml
|
||||
|
||||
|
6
tox.ini
6
tox.ini
@ -119,9 +119,13 @@ deps =
|
||||
{[testenv:ansible]deps}
|
||||
setenv =
|
||||
{[testenv]setenv}
|
||||
ANSIBLE_PARAMETERS=-vvv -e cinder_upgrade=True
|
||||
TEST_PLAYBOOK={toxinidir}/tests/test-upgrade.yml
|
||||
commands =
|
||||
{[testenv:tests_clone]commands}
|
||||
bash -c "if [ ! -d "{toxinidir}/tests/common/previous" ]; then \
|
||||
git clone https://git.openstack.org/openstack/openstack-ansible-tests -b stable/newton \
|
||||
{toxinidir}/tests/common/previous; \
|
||||
fi"
|
||||
bash -c "{toxinidir}/tests/common/test-ansible-functional.sh"
|
||||
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user