diff options
Diffstat (limited to 'functest/ci')
| -rw-r--r-- | functest/ci/check_deployment.py | 1 | ||||
| -rw-r--r-- | functest/ci/download_images.sh | 1 | ||||
| -rw-r--r-- | functest/ci/prepare_env.py | 9 | ||||
| -rw-r--r-- | functest/ci/run_tests.py | 1 | ||||
| -rw-r--r-- | functest/ci/testcases.yaml | 2 |
5 files changed, 8 insertions, 6 deletions
diff --git a/functest/ci/check_deployment.py b/functest/ci/check_deployment.py index fe20dc8f..13bb4c8b 100644 --- a/functest/ci/check_deployment.py +++ b/functest/ci/check_deployment.py @@ -159,5 +159,6 @@ def main(): """Entry point""" logging.config.fileConfig(pkg_resources.resource_filename( 'functest', 'ci/logging.ini')) + logging.captureWarnings(True) deployment = CheckDeployment() return deployment.check_all() diff --git a/functest/ci/download_images.sh b/functest/ci/download_images.sh index 236b763c..09a32848 100644 --- a/functest/ci/download_images.sh +++ b/functest/ci/download_images.sh @@ -18,6 +18,7 @@ http://download.cirros-cloud.net/daily/20161201/cirros-d161201-aarch64-kernel https://cloud-images.ubuntu.com/releases/14.04/release/ubuntu-14.04-server-cloudimg-arm64-uefi1.img http://cloud.centos.org/altarch/7/images/aarch64/CentOS-7-aarch64-GenericCloud.qcow2.xz https://sourceforge.net/projects/ool-opnfv/files/vyos-1.1.7.img +http://marketplace.openbaton.org:8080/api/v1/images/52e2ccc0-1dce-4663-894d-28aab49323aa/img EOF xz --decompress --force --keep ${1:-/home/opnfv/functest/images}/CentOS-7-aarch64-GenericCloud.qcow2.xz diff --git a/functest/ci/prepare_env.py b/functest/ci/prepare_env.py index a354dbe8..36d04296 100644 --- a/functest/ci/prepare_env.py +++ b/functest/ci/prepare_env.py @@ -37,14 +37,14 @@ pod_arch = os.getenv("POD_ARCH", None) arch_filter = ['aarch64'] CONFIG_FUNCTEST_PATH = pkg_resources.resource_filename( - 'functest', 'ci/config_functest.yaml') + 'functest', 'ci/config_functest.yaml') CONFIG_PATCH_PATH = pkg_resources.resource_filename( - 'functest', 'ci/config_patch.yaml') + 'functest', 'ci/config_patch.yaml') CONFIG_AARCH64_PATCH_PATH = pkg_resources.resource_filename( - 'functest', 'ci/config_aarch64_patch.yaml') + 'functest', 'ci/config_aarch64_patch.yaml') RALLY_CONF_PATH = "/etc/rally/rally.conf" RALLY_AARCH64_PATCH_PATH = pkg_resources.resource_filename( - 'functest', 'ci/rally_aarch64_patch.conf') + 'functest', 'ci/rally_aarch64_patch.conf') class PrepareEnvParser(object): @@ -358,6 +358,7 @@ def prepare_env(**kwargs): def main(): logging.config.fileConfig(pkg_resources.resource_filename( 'functest', 'ci/logging.ini')) + logging.captureWarnings(True) parser = PrepareEnvParser() args = parser.parse_args(sys.argv[1:]) return prepare_env(**args) diff --git a/functest/ci/run_tests.py b/functest/ci/run_tests.py index feafa89e..a129ea73 100644 --- a/functest/ci/run_tests.py +++ b/functest/ci/run_tests.py @@ -264,6 +264,7 @@ class Runner(object): def main(): logging.config.fileConfig(pkg_resources.resource_filename( 'functest', 'ci/logging.ini')) + logging.captureWarnings(True) parser = RunTestsParser() args = parser.parse_args(sys.argv[1:]) runner = Runner() diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml index f9bf164b..7d7c3eb1 100644 --- a/functest/ci/testcases.yaml +++ b/functest/ci/testcases.yaml @@ -432,7 +432,6 @@ tiers: - case_name: orchestra_openims project_name: functest - enabled: false criteria: 100 blocking: false description: >- @@ -447,7 +446,6 @@ tiers: - case_name: orchestra_clearwaterims project_name: functest - enabled: false criteria: 100 blocking: false description: >- |