openstack/openstack-ansible-os_keystone
Code Issues Proposed changes

Use the tests ansible-previous venv

Browse Source 
When doing the role upgrade, we run every playbook with current's
branch ansible. This is normal for the infrastructure bits (which
are running on current branch), but not for the installation of
the previous branch's role, which should use previous branch's
environment.

The tests repo now has this venv, so we should make use of it.

Depends-On: I7ebb045885dd645b820de2b7f75b46c755c015f6
Change-Id: I579a3f7b641e02f40ed1b21f523aecbb9f16835a
Related-Bug: #1741471
This commit is contained in:
Jean-Philippe Evrard 2018-02-01 10:10:36 +00:00
parent 16dafa4718
commit f00d412e62
2 changed files with 4 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
tests/create-previous-venv.sh
View File

@ -1,33 +0,0 @@
#!/bin/bash
# Copyright 2018, 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.
## Shell Opts ----------------------------------------------------------------
set -e
## Vars ----------------------------------------------------------------------
export WORKING_DIR=${WORKING_DIR:-$(pwd)}
export PREVIOUS_VENV=${PREVIOUS_VENV:-"ansible-previous"}
pushd ${WORKING_DIR}/.tox
virtualenv ${PREVIOUS_VENV}
${PREVIOUS_VENV}/bin/pip install -c https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/pike \
-rhttps://git.openstack.org/cgit/openstack/openstack-ansible/plain/global-requirement-pins.txt?h=stable/pike \
-r${WORKING_DIR}/tests/common/previous/test-ansible-deps.txt ara
# Display venv contents
${PREVIOUS_VENV}/bin/pip freeze
popd

8
tests/test-keystone-upgrades.sh
View File

@ -78,17 +78,17 @@ export ANSIBLE_LOG_PATH="${ANSIBLE_LOG_DIR}/ansible-execute-keystone-infrainstal
# Execute the setup of the Keystone environment
execute_ansible_playbook
# Create an ansible venv matching previous branch
source ${WORKING_DIR}/tests/create-previous-venv.sh
# Prepare environment for the deploy of previous Keystone:
# No upgrading or testing is done yet.
export TEST_PLAYBOOK="${WORKING_DIR}/tests/test-install-previous-keystone.yml"
export ANSIBLE_LOG_PATH="${ANSIBLE_LOG_DIR}/ansible-execute-keystone-install.log"
export ANSIBLE_LOG_PATH="${ANSIBLE_LOG_DIR}/ansible-execute-previous_keystone-install.log"
export PREVIOUS_VENV="ansible-previous"
export ANSIBLE_BIN="${WORKING_DIR}/.tox/${PREVIOUS_VENV}/bin/ansible-playbook"
source ${COMMON_TESTS_PATH}/test-create-previous-venv.sh
# Execute the setup of previous Keystone
execute_ansible_playbook
# Unset previous branch overrides
unset PREVIOUS_VENV
unset ANSIBLE_BIN