From ee9ed5cb048ec55a087db6907c4ddb3b6b294fd4 Mon Sep 17 00:00:00 2001 From: Marios Andreou Date: Thu, 25 Feb 2021 11:42:34 +0200 Subject: [PATCH] Remove tripleo-multinode-container-minimal from zuul layout The tripleo-multinode-container-minimal is being deprecated [1] as part of wider tripleo CI optimization at [2]. Also fixes up .gitreview otherwise this cannot get posted against victoria. Adds some noqa for failing pep8 tests and fixes test-requirements for issue seen at [3]. Removes the openstack-tox-lower-constraints which failed at [4]. Instaed of fixing remove in line with all other tripleo repos which have removed these jobs. [1] Ie6473759383bd4b903cbe56fba9fee75a24154c4 [2] https://review.opendev.org/q/topic:tripleo-ci-reduce [3] https://zuul.opendev.org/t/openstack/build/8e22af10ddfd4225b7c164a81b07b323 [4] https://zuul.opendev.org/t/openstack/build/4bad7e066c7b4f508ea794401bab85a2 Change-Id: I7696fbb53cfee9dad29273e17a036c5f6963f788 --- .gitreview | 1 + os_apply_config/apply_config.py | 2 ++ os_apply_config/renderers.py | 2 +- os_apply_config/value_types.py | 2 +- test-requirements.txt | 4 +--- zuul.d/layout.yaml | 2 -- 6 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.gitreview b/.gitreview index 3fbf809..31d2f1a 100644 --- a/.gitreview +++ b/.gitreview @@ -2,3 +2,4 @@ host=review.opendev.org port=29418 project=openstack/os-apply-config.git +defaultbranch=stable/victoria diff --git a/os_apply_config/apply_config.py b/os_apply_config/apply_config.py index 58e778b..affc5a4 100755 --- a/os_apply_config/apply_config.py +++ b/os_apply_config/apply_config.py @@ -375,6 +375,8 @@ DATE_FORMAT = '%Y/%m/%d %I:%M:%S %p' def add_handler(logger, handler): handler.setFormatter(logging.Formatter(LOG_FORMAT, datefmt=DATE_FORMAT)) logger.addHandler(handler) + + logger = logging.getLogger('os-apply-config') logger.setLevel(logging.INFO) add_handler(logger, logging.StreamHandler()) diff --git a/os_apply_config/renderers.py b/os_apply_config/renderers.py index bea6d05..394e571 100644 --- a/os_apply_config/renderers.py +++ b/os_apply_config/renderers.py @@ -30,7 +30,7 @@ class JsonRenderer(pystache.Renderer): missing_tags=None): # json would be html escaped otherwise if escape is None: - escape = lambda u: u + escape = lambda u: u # noqa E731 return super(JsonRenderer, self).__init__(file_encoding, string_encoding, decode_errors, search_dirs, diff --git a/os_apply_config/value_types.py b/os_apply_config/value_types.py index aa804c3..a5e8fa3 100644 --- a/os_apply_config/value_types.py +++ b/os_apply_config/value_types.py @@ -27,7 +27,7 @@ TYPES = { "(?#@host or file)(@?[a-zA-Z0-9/_.-]+)?" "(?#/dbname)(/[a-zA-Z0-9_-]+)?" "(?#?variable=value)(\?[a-zA-Z0-9=_-]+)?$", - "swiftdevices": "^(r\d+z\d+-[A-Za-z0-9.-_]+:%PORT%/[^,]+,?)+$", + "swiftdevices": "^(r\d+z\d+-[A-Za-z0-9.-_]+:%PORT%/[^,]+,?)+$", # noqa W605 "username": "^[A-Za-z0-9_-]+$", "raw": "" } diff --git a/test-requirements.txt b/test-requirements.txt index de9adfe..8b130d7 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,8 +1,7 @@ # The order of packages is significant, because pip processes them in the order # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0 - +hacking>=3.0.1,<3.1.0 # Apache-2.0 coverage!=4.4,>=4.0 # Apache-2.0 fixtures>=3.0.0 # Apache-2.0/BSD python-subunit>=1.0.0 # Apache-2.0/BSD @@ -10,4 +9,3 @@ sphinx>=1.6.5,!=1.6.6,!=1.6.7,!=2.1.0,!=3.0.0 # BSD stestr>=2.0.0 # Apache-2.0 testscenarios>=0.4 # Apache-2.0/BSD testtools>=2.2.0 # MIT -pyflakes>=2.2.0 diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml index a4bf884..e241b0c 100644 --- a/zuul.d/layout.yaml +++ b/zuul.d/layout.yaml @@ -2,6 +2,4 @@ templates: - check-requirements - openstack-cover-jobs - - openstack-lower-constraints-jobs - openstack-python3-victoria-jobs - - tripleo-multinode-container-minimal