Added OpenJDK 7 ppa for xenial

Added py35 environment configuration to tox.ini

Change-Id: Iffd38a325204a3ec7380a7a56061866477d3d06e
This commit is contained in:
Saad Zaher 2016-10-18 11:40:18 +00:00 committed by Saad Zaher
parent 61f1b3704f
commit 084199a514
3 changed files with 23 additions and 0 deletions

View File

@ -18,5 +18,7 @@ set -ex
# Install freezer devstack integration
export DEVSTACK_LOCAL_CONFIG="enable_plugin freezer-api https://git.openstack.org/openstack/freezer-api"
export DEVSTACK_GATE_TEMPEST_REGEX="freezer_api_tempest_plugin"
# Invoke default behavior.
$BASE/new/devstack-gate/devstack-vm-gate.sh

View File

@ -63,9 +63,19 @@ function cleanup_freezer_api {
${TOP_DIR}/pkg/elasticsearch.sh uninstall
}
# add openjdk-7 repo support for xenial
function add_jdk7_rep {
sudo add-apt-repository -y ppa:openjdk-r/ppa
apt_get_update
}
# executed during: stack install
function install_freezer_api {
if [[ is_ubuntu ]]; then
add_jdk7_rep
fi
git_clone $FREEZER_API_REPO $FREEZER_API_DIR $FREEZER_API_BRANCH
${TOP_DIR}/pkg/elasticsearch.sh download

11
tox.ini
View File

@ -56,6 +56,17 @@ commands =
rm -f .coverage
rm -rf .testrepository
[testenv:py35]
basepython = python3.5
setenv = OS_PATH_TEST = ./freezer_api/tests/unit
commands =
find . -type f -name "*.pyc" -delete
rm -rf .testrepository
python setup.py test --coverage --coverage-package-name freezer_api --testr-args="{posargs}"
coverage report -m
rm -f .coverage
rm -rf .testrepository
[testenv:venv]
commands = {posargs}