diff options
| -rw-r--r-- | UPSTREAM | 13 | ||||
| -rw-r--r-- | promise/test/functest/run_promise_tests.py (renamed from promise/test/functest/run_tests.py) | 6 | ||||
| -rw-r--r-- | requirements.txt | 1 | ||||
| -rw-r--r-- | setup.cfg | 8 | ||||
| -rw-r--r-- | setup.py | 22 |
5 files changed, 46 insertions, 4 deletions
diff --git a/UPSTREAM b/UPSTREAM new file mode 100644 index 0000000..fcd3e0c --- /dev/null +++ b/UPSTREAM @@ -0,0 +1,13 @@ +# Upstream contributions in OpenStack +# system is one of Gerrit, Launchpad +--- +- + url: https://blueprints.launchpad.net/blazar/+spec/new-instance-reservation + system: Launchpad +- + url: https://blueprints.launchpad.net/blazar/+spec/climate-dashboard + system: Launchpad +- + url: https://blueprints.launchpad.net/blazar/+spec/update-reserved-capacity + system: Launchpad + # WIP diff --git a/promise/test/functest/run_tests.py b/promise/test/functest/run_promise_tests.py index f7e9148..e189d61 100644 --- a/promise/test/functest/run_tests.py +++ b/promise/test/functest/run_promise_tests.py @@ -10,7 +10,6 @@ import argparse import json import logging -import logging.config import os import re import subprocess @@ -29,7 +28,7 @@ parser.add_argument("-r", "--report", args = parser.parse_args() -PROMISE_REPO_DIR = CONST.dir_repo_promise +PROMISE_REPO_DIR = '/src/promise' RESULTS_DIR = CONST.dir_results PROMISE_TENANT_NAME = CONST.promise_tenant_name @@ -249,6 +248,5 @@ def main(): if __name__ == '__main__': - logging.config.fileConfig( - CONST.__getattribute__('dir_functest_logging_cfg')) + logging.basicConfig(level=logging.INFO) sys.exit(main()) diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..d39c387 --- /dev/null +++ b/requirements.txt @@ -0,0 +1 @@ +functest diff --git a/setup.cfg b/setup.cfg new file mode 100644 index 0000000..dcdaa25 --- /dev/null +++ b/setup.cfg @@ -0,0 +1,8 @@ +[metadata] +name = promise +version = 2017.9.0 +home-page = https://wiki.opnfv.org/display/promise/Promise + +[files] +packages = promise/test/functest +scripts = promise/test/functest/run_promise_tests.py diff --git a/setup.py b/setup.py new file mode 100644 index 0000000..a1e9b3b --- /dev/null +++ b/setup.py @@ -0,0 +1,22 @@ +#!/usr/bin/env python + +# Copyright (c) 2017 Orange and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 + +import setuptools + +# In python < 2.7.4, a lazy loading of package `pbr` will break +# setuptools if some other modules registered functions in `atexit`. +# solution from: http://bugs.python.org/issue15881#msg170215 +try: + import multiprocessing # noqa +except ImportError: + pass + +setuptools.setup( + setup_requires=['pbr>=1.8'], + pbr=True) |