openstack
/
openstack-ansible-os_keystone
Code Issues Proposed changes

Merge "Use the tests ansible-previous venv"

This commit is contained in:
Zuul 2018-02-01 19:33:52 +00:00 committed by Gerrit Code Review
parent ab66ca247e f00d412e62
commit 8d08bea782
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