From 9a5a91439f7bd08a10fd6c4157cb0e8a11efd9f5 Mon Sep 17 00:00:00 2001 From: albailey Date: Wed, 15 Dec 2021 12:07:01 -0600 Subject: [PATCH] Update bindep to pass zuul on ubuntu workers The previous bindep fix was only for centos, so zuul workers running ubuntu (dpkg) would still not work. Updating the file to handle those nodes. Updating a python file to ensure pylint target is executed The sitepackages for the cgcs-patch pylint tox target also needs to be set to True to correspond to the bindep values. Story: 2008943 Task: 44183 Signed-off-by: albailey Change-Id: I2a9e630aa26c2823ccdc6a361c46575b58a1c39c --- bindep.txt | 1 + cgcs-patch/cgcs-patch/cgcs_patch/constants.py | 2 +- cgcs-patch/cgcs-patch/tox.ini | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/bindep.txt b/bindep.txt index ddd9c490..6a94fba9 100644 --- a/bindep.txt +++ b/bindep.txt @@ -1,4 +1,5 @@ # This is a cross-platform list tracking distribution packages needed for install and tests; # see https://docs.openstack.org/infra/bindep/ for additional information. +python3-rpm [platform:dpkg] rpm-python [platform:rpm] diff --git a/cgcs-patch/cgcs-patch/cgcs_patch/constants.py b/cgcs-patch/cgcs-patch/cgcs_patch/constants.py index d4d8a755..4f1654a5 100644 --- a/cgcs-patch/cgcs-patch/cgcs_patch/constants.py +++ b/cgcs-patch/cgcs-patch/cgcs_patch/constants.py @@ -1,5 +1,5 @@ """ -Copyright (c) 2015-2019 Wind River Systems, Inc. +Copyright (c) 2015-2021 Wind River Systems, Inc. SPDX-License-Identifier: Apache-2.0 diff --git a/cgcs-patch/cgcs-patch/tox.ini b/cgcs-patch/cgcs-patch/tox.ini index 87e408ba..b66dd396 100644 --- a/cgcs-patch/cgcs-patch/tox.ini +++ b/cgcs-patch/cgcs-patch/tox.ini @@ -129,6 +129,7 @@ commands = [testenv:pylint] basepython = python3.6 +sitepackages = True commands = pylint cgcs_patch --rcfile=./pylint.rc pylint cgcs_make_patch --rcfile=./pylint_make_patch.rc