Enable OSCI testing of keystone-saml-mellon

Move to zaza.openstack testing

The following need to be reviewed and merged first
https://github.com/openstack-charmers/zaza-openstack-tests/pull/7
https://github.com/openstack-charmers/bot-control/pull/113

Change-Id: Ifa8fc7526f6bd2c4fe1ff7d34a38eb5c6049cbd1
This commit is contained in:
David Ames 2019-05-17 22:16:37 +00:00
parent 84cc49408f
commit e2731d14f3
4 changed files with 26 additions and 50 deletions

3
.zuul.yaml Normal file
View File

@ -0,0 +1,3 @@
- project:
templates:
- python35-charm-jobs

View File

@ -6,4 +6,5 @@ stestr>=2.2.0
python-keystoneclient>=1.7.1
python-swiftclient
lxml
git+https://github.com/openstack-charmers/zaza.git#egg=zaza;python_version>='3.0'
git+https://github.com/openstack-charmers/zaza.git@remove-namespaced-tests#egg=zaza;python_version>='3.0'
git+https://github.com/openstack-charmers/zaza-openstack-tests.git#egg=zaza.openstack

View File

@ -5,17 +5,17 @@ gate_bundles:
- bionic-queens
- bionic-queens-ha
configure:
- zaza.charm_tests.vault.setup.auto_inititialize
- zaza.charm_tests.saml_mellon.setup.attach_saml_resources
- zaza.charm_tests.keystone.setup.add_demo_user
- zaza.charm_tests.glance.setup.add_lts_image
- zaza.charm_tests.nova.setup.create_flavors
- zaza.charm_tests.nova.setup.manage_ssh_key
- zaza.charm_tests.neutron.setup.basic_overcloud_network
- zaza.charm_tests.saml_mellon.setup.keystone_federation_setup
- zaza.openstack.charm_tests.vault.setup.auto_inititialize
- zaza.openstack.charm_tests.saml_mellon.setup.attach_saml_resources
- zaza.openstack.charm_tests.keystone.setup.add_demo_user
- zaza.openstack.charm_tests.glance.setup.add_lts_image
- zaza.openstack.charm_tests.nova.setup.create_flavors
- zaza.openstack.charm_tests.nova.setup.manage_ssh_key
- zaza.openstack.charm_tests.neutron.setup.basic_overcloud_network
- zaza.openstack.charm_tests.saml_mellon.setup.keystone_federation_setup
tests:
- zaza.charm_tests.saml_mellon.tests.CharmKeystoneSAMLMellonTest
- zaza.charm_tests.keystone.tests.AuthenticationAuthorizationTest
- zaza.openstack.charm_tests.saml_mellon.tests.CharmKeystoneSAMLMellonTest
- zaza.openstack.charm_tests.keystone.tests.AuthenticationAuthorizationTest
target_deploy_status:
ntp:
workload-status: active

View File

@ -1,47 +1,25 @@
# Source charm: ./src/tox.ini
# This file is managed centrally by release-tools and should not be modified
# within individual charm repos.
[tox]
envlist = pep8,py3
envlist = pep8
skipsdist = True
[testenv]
setenv = VIRTUAL_ENV={envdir}
PYTHONHASHSEED=0
CHARM_DIR={envdir}
AMULET_SETUP_TIMEOUT=5400
whitelist_externals = juju
passenv = HOME TERM CS_API_* OS_* AMULET_*
deps = -r{toxinidir}/test-requirements.txt
install_command =
pip install {opts} {packages}
commands = ostestr {posargs}
whitelist_externals = juju
passenv = HOME TERM AMULET_* CS_API_* JUJU_MODEL OS_*
deps = -r{toxinidir}/test-requirements.txt
[testenv:py3]
basepython = python3
deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
[testenv:py35]
basepython = python3.5
deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
[testenv:py36]
basepython = python3.6
deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
[testenv:pep8]
basepython = python3
deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
commands = flake8 {posargs} hooks unit_tests tests actions lib
charm-proof
deps=charm-tools
commands = charm-proof
[testenv:venv]
[testenv:func-noop]
basepython = python3
commands = {posargs}
commands =
true
[testenv:func]
basepython = python3
@ -53,11 +31,5 @@ basepython = python3
commands =
functest-run-suite --keep-model --smoke
[testenv:func-dev]
basepython = python3
commands =
functest-run-suite --keep-model --dev
[flake8]
ignore = E402,E226
exclude = */charmhelpers
[testenv:venv]
commands = {posargs}