diff options
| -rw-r--r-- | engine/pom.xml | 2 | ||||
| -rw-r--r-- | engine/src/docker/Dockerfile | 2 | ||||
| -rw-r--r-- | engine/src/tools/pretty_tox.sh | 35 | ||||
| -rw-r--r-- | engine/src/valet/engine/resource_manager/naming.py | 4 | ||||
| -rw-r--r-- | engine/src/valet/engine/search/filters/aggregate_instance_filter.py | 2 | ||||
| -rw-r--r-- | engine/src/valet/engine/search/filters/az_filter.py | 2 | ||||
| -rw-r--r-- | engine/tox.ini | 6 | ||||
| -rwxr-xr-x | pom.xml | 2 |
8 files changed, 46 insertions, 9 deletions
diff --git a/engine/pom.xml b/engine/pom.xml index 0d69e9a..e5207f5 100644 --- a/engine/pom.xml +++ b/engine/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.onap.oparent</groupId> <artifactId>oparent-python</artifactId> - <version>2.0.0</version> + <version>2.1.0</version> </parent> <properties> diff --git a/engine/src/docker/Dockerfile b/engine/src/docker/Dockerfile index 8eccb13..42d5ad9 100644 --- a/engine/src/docker/Dockerfile +++ b/engine/src/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM python:2.7.15-alpine +FROM python:3.8.0-alpine COPY src/ /opt/engine WORKDIR /opt/engine diff --git a/engine/src/tools/pretty_tox.sh b/engine/src/tools/pretty_tox.sh new file mode 100644 index 0000000..387e4d8 --- /dev/null +++ b/engine/src/tools/pretty_tox.sh @@ -0,0 +1,35 @@ +#!/usr/bin/env bash +# +# ------------------------------------------------------------------------- +# Copyright (c) 2015-2017 AT&T Intellectual Property +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------- +# + + +set -o pipefail + +TESTRARGS=$1 + +# --until-failure is not compatible with --subunit see: +# +# https://bugs.launchpad.net/testrepository/+bug/1411804 +# +# this work around exists until that is addressed +if [[ "$TESTARGS" =~ "until-failure" ]]; then + python setup.py testr --slowest --testr-args="$TESTRARGS" | subunit2junitxml --output-to=xunit-results.xml +else + python setup.py testr --slowest --testr-args="--subunit $TESTRARGS" | subunit-1to2 | subunit2junitxml --no-passthrough --forward --output-to=xunit-results.xml | subunit-trace -f +fi diff --git a/engine/src/valet/engine/resource_manager/naming.py b/engine/src/valet/engine/resource_manager/naming.py index bdf5211..69a404d 100644 --- a/engine/src/valet/engine/resource_manager/naming.py +++ b/engine/src/valet/engine/resource_manager/naming.py @@ -22,7 +22,6 @@ import copy import re -from sre_parse import isdigit from valet.engine.resource_manager.resources.host_group import HostGroup @@ -35,6 +34,9 @@ class Naming(object): self.rack_code_list = _config.get("rack_codes") self.host_code_list = _config.get("host_codes") + def isdigit(char): + return "0" <= char <= "9" + def get_topology(self, _datacenter, _host_groups, _hosts, _rhosts): """Set datacenter resource structure (racks, hosts).""" diff --git a/engine/src/valet/engine/search/filters/aggregate_instance_filter.py b/engine/src/valet/engine/search/filters/aggregate_instance_filter.py index 316388e..753d16f 100644 --- a/engine/src/valet/engine/search/filters/aggregate_instance_filter.py +++ b/engine/src/valet/engine/search/filters/aggregate_instance_filter.py @@ -16,7 +16,7 @@ # # ------------------------------------------------------------------------- # -import filter_utils +from . import filter_utils import six diff --git a/engine/src/valet/engine/search/filters/az_filter.py b/engine/src/valet/engine/search/filters/az_filter.py index 8902893..81a04e8 100644 --- a/engine/src/valet/engine/search/filters/az_filter.py +++ b/engine/src/valet/engine/search/filters/az_filter.py @@ -16,7 +16,7 @@ # # ------------------------------------------------------------------------- # -import filter_utils +from . import filter_utils from valet.engine.app_manager.group import Group from valet.engine.app_manager.server import Server diff --git a/engine/tox.ini b/engine/tox.ini index dd69290..f36eff6 100644 --- a/engine/tox.ini +++ b/engine/tox.ini @@ -2,7 +2,7 @@ minversion = 1.6 skipsdist = True #envlist = py35,py27,functional,pep8 -envlist = py27,pep8 +envlist = py27,py36,pep8 [testenv] deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt @@ -34,11 +34,11 @@ commands = coverage erase find . -type f -name "*.pyc" -delete find . -type f -name ".coverage.*" -delete - {toxinidir}/tools/pretty_tox.sh "{posargs}" + {toxinidir}/src/tools/pretty_tox.sh "{posargs}" coverage combine coverage html -d cover coverage xml -o cover/coverage.xml - coverage report --omit=".tox/py27/*","engine/tests/*" + coverage report --omit=".tox/py36/*","engine/tests/*" [testenv:pep8] deps = hacking<0.12,>=0.11.0 @@ -29,7 +29,7 @@ <parent> <groupId>org.onap.oparent</groupId> <artifactId>oparent</artifactId> - <version>2.0.0</version> + <version>2.1.0</version> </parent> <properties> |