Split out cinder upgrade into it's own script.
This will separate out the runs so that variables and modules are not re-used across runs - ensuring the latest modules and versions are used, and ensuring multiple versions of the tests playbook aren't required on non-upgrade runs. Change-Id: Ie1885ae20a87f27805d3e0c92adba16510c71b1c
This commit is contained in:
Andy McCrae
parent
b865149ec8
commit
beba04141b
|
|
@ -0,0 +1,99 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
# Copyright 2016, 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.
|
||||
|
||||
# WARNING:
|
||||
# This file is use by all OpenStack-Ansible roles for testing purposes.
|
||||
# Any changes here will affect all OpenStack-Ansible role repositories
|
||||
# with immediate effect.
|
||||
|
||||
# PURPOSE:
|
||||
# This script executes test Ansible playbooks required for performing
|
||||
# an upgrade test of the os_neutron role.
|
||||
# Due to the way Ansible caches and handles modules, we need to run
|
||||
# separate Ansible runs to ensure the "upgrade" uses the new
|
||||
# "neutron_migrations_facts" module, instead of the cached version
|
||||
# used when deploying the previous Neutron version.
|
||||
|
||||
## Shell Opts ----------------------------------------------------------------
|
||||
|
||||
set -e
|
||||
|
||||
## Vars ----------------------------------------------------------------------
|
||||
|
||||
export WORKING_DIR=${WORKING_DIR:-$(pwd)}
|
||||
export ROLE_NAME=${ROLE_NAME:-''}
|
||||
|
||||
export ANSIBLE_PARAMETERS=${ANSIBLE_PARAMETERS:-"-vvv"}
|
||||
export TEST_PLAYBOOK=${TEST_PLAYBOOK:-$WORKING_DIR/tests/test-upgrade.yml}
|
||||
export TEST_CHECK_MODE=${TEST_CHECK_MODE:-false}
|
||||
export TEST_IDEMPOTENCE=${TEST_IDEMPOTENCE:-false}
|
||||
|
||||
export COMMON_TESTS_PATH="${WORKING_DIR}/tests/common"
|
||||
|
||||
echo "ANSIBLE_OVERRIDES: ${ANSIBLE_OVERRIDES}"
|
||||
echo "ANSIBLE_PARAMETERS: ${ANSIBLE_PARAMETERS}"
|
||||
echo "TEST_PLAYBOOK: ${TEST_PLAYBOOK}"
|
||||
echo "TEST_CHECK_MODE: ${TEST_CHECK_MODE}"
|
||||
echo "TEST_IDEMPOTENCE: ${TEST_IDEMPOTENCE}"
|
||||
|
||||
## Functions -----------------------------------------------------------------
|
||||
|
||||
function execute_ansible_playbook {
|
||||
|
||||
export ANSIBLE_CLI_PARAMETERS="${ANSIBLE_PARAMETERS}"
|
||||
CMD_TO_EXECUTE="ansible-playbook ${TEST_PLAYBOOK} $@ ${ANSIBLE_CLI_PARAMETERS}"
|
||||
|
||||
echo "Executing: ${CMD_TO_EXECUTE}"
|
||||
echo "With:"
|
||||
echo " ANSIBLE_INVENTORY: ${ANSIBLE_INVENTORY}"
|
||||
echo " ANSIBLE_LOG_PATH: ${ANSIBLE_LOG_PATH}"
|
||||
|
||||
${CMD_TO_EXECUTE}
|
||||
|
||||
}
|
||||
|
||||
function gate_job_exit_tasks {
|
||||
source "${COMMON_TESTS_PATH}/test-log-collect.sh"
|
||||
}
|
||||
|
||||
## Main ----------------------------------------------------------------------
|
||||
|
||||
# Ensure that the Ansible environment is properly prepared
|
||||
source "${COMMON_TESTS_PATH}/test-ansible-env-prep.sh"
|
||||
|
||||
# Set gate job exit traps, this is run regardless of exit state when the job finishes.
|
||||
trap gate_job_exit_tasks EXIT
|
||||
|
||||
# Prepare environment for the initial deploy of previous Cinder
|
||||
# No upgrading or testing is done yet.
|
||||
export ANSIBLE_LOG_PATH="${ANSIBLE_LOG_DIR}/ansible-execute-cinder-install.log"
|
||||
|
||||
# Execute the setup of previous Cinder
|
||||
execute_ansible_playbook
|
||||
|
||||
# Prepare environment for the upgrade of Cinder
|
||||
export TEST_PLAYBOOK="${COMMON_TESTS_PATH}/test-install-cinder.yml"
|
||||
export ANSIBLE_LOG_PATH="${ANSIBLE_LOG_DIR}/ansible-execute-cinder-upgrade.log"
|
||||
|
||||
# Excute the upgrade of Cinder
|
||||
execute_ansible_playbook
|
||||
|
||||
# Prepare the environment for the testing of upgraded Cinder
|
||||
export TEST_PLAYBOOK="${COMMON_TESTS_PATH}/test-install-tempest.yml"
|
||||
export ANSIBLE_LOG_PATH="${ANSIBLE_LOG_DIR}/ansible-execute-cinder-upgrade-test.log"
|
||||
|
||||
# Execute testing of upgraded Cinder
|
||||
execute_ansible_playbook
|
||||
|
|
@ -27,9 +27,3 @@
|
|||
|
||||
# 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
|
||||
|
|
|
|||
8
tox.ini
8
tox.ini
|
|
@ -58,10 +58,6 @@ commands =
|
|||
bash -c "if [ ! -d "{toxinidir}/tests/common" ]; then \
|
||||
git clone https://git.openstack.org/openstack/openstack-ansible-tests {toxinidir}/tests/common; \
|
||||
fi"
|
||||
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"
|
||||
|
||||
|
||||
[testenv:pep8]
|
||||
|
|
@ -123,10 +119,10 @@ setenv =
|
|||
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 \
|
||||
git clone https://git.openstack.org/openstack/openstack-ansible-tests -b stable/ocata \
|
||||
{toxinidir}/tests/common/previous; \
|
||||
fi"
|
||||
bash -c "{toxinidir}/tests/common/test-ansible-functional.sh"
|
||||
bash -c "{toxinidir}/tests/test-cinder-upgrades.sh"
|
||||
|
||||
|
||||
[testenv:linters]
|
||||
|
|
|
|||
Loading…
Reference in New Issue