Move swift upgrades into its own shell script

The upgrade path becomes complicated as previous variables are stored
and we have to start a clean run.

The best way to achieve this is to separate the run steps out in a shell
script for upgrades only.

Change-Id: Ib2d2c8bad5241779d52cdc9428d7057c770d2d7c
This commit is contained in:
Andy McCrae 2017-02-13 17:03:23 +00:00
parent 7406ce4e82
commit 44cdfed99d
4 changed files with 102 additions and 6 deletions

View File

@ -49,4 +49,4 @@
- name: os_previous_swift
src: https://git.openstack.org/openstack/openstack-ansible-os_swift
scm: git
version: stable/newton
version: stable/ocata

100
tests/test-swift-upgrades.sh Executable file
View File

@ -0,0 +1,100 @@
#!/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=$WORKING_DIR/tests/test-upgrade.yml
export TEST_CHECK_MODE=${TEST_CHECK_MODE:-false}
export TEST_IDEMPOTENCE=${TEST_IDEMPOTENCE:-false}
export ANSIBLE_OVERRIDES=$WORKING_DIR/tests/os_swift-overrides.yml
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} -e @${ANSIBLE_OVERRIDES}"
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 Swift
# No upgrading or testing is done yet.
export ANSIBLE_LOG_PATH="${ANSIBLE_LOG_DIR}/ansible-execute-swift-install.log"
# Execute the setup of Stable/Newton Neutron
execute_ansible_playbook
# Prepare environment for the upgrade of Swift
export TEST_PLAYBOOK="${COMMON_TESTS_PATH}/test-install-swift.yml"
export ANSIBLE_LOG_PATH="${ANSIBLE_LOG_DIR}/ansible-execute-swift-upgrade.log"
# Excute the upgrade of Neutron
execute_ansible_playbook
# Prepare the environment for the testing of upgraded Swift
export TEST_PLAYBOOK="${WORKING_DIR}/tests/test-swift-functional.yml"
export ANSIBLE_LOG_PATH="${ANSIBLE_LOG_DIR}/ansible-execute-swift-upgrade-test.log"
# Execute testing of upgraded Neutron
execute_ansible_playbook

View File

@ -27,6 +27,3 @@
# Install previous swift
- include: test-install-previous-swift.yml
# Install Swift
- include: common/test-install-swift.yml

View File

@ -115,14 +115,13 @@ deps =
{[testenv:ansible]deps}
setenv =
{[testenv]setenv}
TEST_PLAYBOOK={toxinidir}/tests/test-upgrade.yml
commands =
{[testenv:tests_clone]commands}
bash -c "if [ ! -d "{toxinidir}/tests/common/previous" ]; then \
git clone -b stable/ocata https://git.openstack.org/openstack/openstack-ansible-tests \
{toxinidir}/tests/common/previous; \
fi"
bash -c "{toxinidir}/tests/common/test-ansible-functional.sh"
bash -c "{toxinidir}/tests/test-swift-upgrades.sh"
[testenv:func_pypy]