diff --git a/.zuul.yaml b/.zuul.yaml index cc2f6cd1c..d8a14e219 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -8,14 +8,29 @@ - build-openstack-releasenotes - openstack-tox-linters - openstack-tox-pep8 + - stx-distcloud-tox-py27 gate: jobs: - build-openstack-api-ref - build-openstack-releasenotes - openstack-tox-linters - openstack-tox-pep8 + - stx-distcloud-tox-py27 post: jobs: - publish-stx-api-ref - publish-stx-tox - publish-stx-releasenotes + +- job: + name: stx-distcloud-tox-py27 + parent: tox + description: Run py27 for distcloud + required-projects: + - openstack/stx-fault + - openstack/stx-nfv + - openstack/stx-update + - openstack/stx-config + vars: + tox_envlist: py27 + tox_extra_args: -c tox.ini diff --git a/dcmanager/tests/unit/manager/test_patch_audit_manager.py b/dcmanager/tests/unit/manager/test_patch_audit_manager.py index ba9458e52..45389b6c4 100644 --- a/dcmanager/tests/unit/manager/test_patch_audit_manager.py +++ b/dcmanager/tests/unit/manager/test_patch_audit_manager.py @@ -21,6 +21,9 @@ import mock from oslo_config import cfg +import sys +sys.modules['fm_core'] = mock.Mock() + from dcmanager.common import consts from dcmanager.manager import patch_audit_manager from dcmanager.manager import subcloud_manager diff --git a/dcmanager/tests/unit/manager/test_service.py b/dcmanager/tests/unit/manager/test_service.py index f3291cd1f..5f0d12861 100644 --- a/dcmanager/tests/unit/manager/test_service.py +++ b/dcmanager/tests/unit/manager/test_service.py @@ -19,6 +19,9 @@ import mock +import sys +sys.modules['fm_core'] = mock.Mock() + from dcmanager.manager import scheduler from dcmanager.manager import service from dcmanager.tests import base diff --git a/dcmanager/tests/unit/manager/test_subcloud_audit_manager.py b/dcmanager/tests/unit/manager/test_subcloud_audit_manager.py index 00b34639f..5b0d9b3e8 100644 --- a/dcmanager/tests/unit/manager/test_subcloud_audit_manager.py +++ b/dcmanager/tests/unit/manager/test_subcloud_audit_manager.py @@ -19,6 +19,9 @@ import mock +import sys +sys.modules['fm_core'] = mock.Mock() + from oslo_config import cfg from dcmanager.manager import subcloud_audit_manager diff --git a/dcmanager/tests/unit/manager/test_subcloud_manager.py b/dcmanager/tests/unit/manager/test_subcloud_manager.py index cc3a00aa6..8806174a3 100644 --- a/dcmanager/tests/unit/manager/test_subcloud_manager.py +++ b/dcmanager/tests/unit/manager/test_subcloud_manager.py @@ -22,6 +22,9 @@ import mock from oslo_config import cfg from oslo_utils import timeutils +import sys +sys.modules['fm_core'] = mock.Mock() + from dcorch.rpc import client as dcorch_rpc_client from dcmanager.common import consts diff --git a/tox.ini b/tox.ini index 03ac05c5e..2a0a44362 100644 --- a/tox.ini +++ b/tox.ini @@ -1,8 +1,20 @@ [tox] -envlist = linters,pep8 +envlist = linters,pep8,py27-dev minversion = 2.3 skipsdist = True +[dc] +dc_base_dir = . + +stx_fault_dir = ../stx-fault +nfv_client_src_dir = ../stx-nfv/nfv/nfv-client +fmclient_src_dir = {[dc]stx_fault_dir}/python-fmclient/fmclient +fm_api_src_dir = {[dc]stx_fault_dir}/fm-api +sysinv_src_dir = ../stx-config/sysinv/sysinv/sysinv +tsconfig_src_dir = ../stx-update/tsconfig/tsconfig +configutilities_src_dir = ../stx-config/configutilities/configutilities +cgtsclient_src_dir = ../stx-config/sysinv/cgts-client/cgts-client + [testenv] basepython = python3 install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/pike} {opts} {packages} @@ -12,34 +24,55 @@ setenv = OS_STDERR_CAPTURE=1 OS_TEST_TIMEOUT=60 CURRENT_CFG_FILE={toxinidir}/.current.cfg -# DATA_DIRECTORY={env:MY_REPO}/addons/wr-cgcs/layers/cgcs/extras.ND/ddt_data/distributed_cloud deps = -r{toxinidir}/test-requirements.txt -#deps = keyring -# -r{toxinidir}/requirements.txt -# -r{toxinidir}/test-requirements.txt -# -e{toxinidir}/../../middleware/config/recipes-common/tsconfig/tsconfig -# -e{toxinidir}/../../middleware/config/recipes-control/configutilities/configutilities -# -e{toxinidir}/../../middleware/sysinv/recipes-common/sysinv/sysinv -# -e{toxinidir}/../../middleware/fault/recipes-common/fm-api -# -e{toxinidir}/../../middleware/patching/recipes-common/cgcs-patch/cgcs-patch -# -e{toxinidir}/../../middleware/sysinv/recipes-common/cgts-client/cgts-client -# -e{toxinidir}/../../recipes-nfv/nfv/nfv-client + -r{toxinidir}/requirements.txt + keyring whitelist_externals = rm find reno -[testenv:py27] -basepython = python2.7 - -[testenv:py27-single] +[testenv:py27-dev] basepython = python2.7 +deps = -r{toxinidir}/test-requirements.txt + -r{toxinidir}/requirements.txt + keyring + -e../{[dc]nfv_client_src_dir} + -e../{[dc]sysinv_src_dir} + -e../{[dc]tsconfig_src_dir} + -e../{[dc]fmclient_src_dir} + -e../{[dc]fm_api_src_dir} + -e../{[dc]configutilities_src_dir} + -e../{[dc]cgtsclient_src_dir} setenv = CURRENT_CFG_FILE={toxinidir}/.current.cfg - DATA_DIRECTORY={env:MY_REPO}/addons/wr-cgcs/layers/cgcs/extras.ND/ddt_data/distributed_cloud + DATA_DIRECTORY={toxinidir}/dcmanager/tests/data SINGLE_REPO=True +commands = + find {toxinidir} -not -path '{toxinidir}/.tox/*' -name '*.py[c|o]' -delete + python setup_ddt_tests.py testr --slowest --testr-args='{posargs}' + +[testenv:py27] +basepython = python2.7 +deps = -r{toxinidir}/test-requirements.txt + -r{toxinidir}/requirements.txt + keyring + -e{[dc]nfv_client_src_dir} + -e{[dc]sysinv_src_dir} + -e{[dc]tsconfig_src_dir} + -e{[dc]fmclient_src_dir} + -e{[dc]fm_api_src_dir} + -e{[dc]configutilities_src_dir} + -e{[dc]cgtsclient_src_dir} +setenv = + CURRENT_CFG_FILE={toxinidir}/.current.cfg + DATA_DIRECTORY={toxinidir}/dcmanager/tests/data + SINGLE_REPO=True +commands = + find {toxinidir} -not -path '{toxinidir}/.tox/*' -name '*.py[c|o]' -delete + python setup_ddt_tests.py testr --slowest --testr-args='{posargs}' [testenv:debug-py27] basepython = python2.7