diff --git a/.zuul.yaml b/.zuul.yaml index 817327b451..dc53257f09 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -9,40 +9,32 @@ check: jobs: - openstack-tox-linters - - sysinv-tox-py27 - sysinv-tox-py39 - sysinv-tox-flake8 - sysinv-tox-pylint - sysinv-tox-bandit - - controllerconfig-tox-py27 - controllerconfig-tox-py39 - controllerconfig-tox-flake8 - controllerconfig-tox-pylint - tsconfig__tox-pylint - - tsconfig__tox-py27 - tsconfig__tox-py39 - tsconfig__tox-flake8 - - cgtsclient-tox-py27 - cgtsclient-tox-py39 - cgtsclient-tox-pep8 - cgtsclient-tox-pylint gate: jobs: - openstack-tox-linters - - sysinv-tox-py27 - sysinv-tox-py39 - sysinv-tox-flake8 - sysinv-tox-pylint - sysinv-tox-bandit - - controllerconfig-tox-py27 - controllerconfig-tox-py39 - controllerconfig-tox-flake8 - controllerconfig-tox-pylint - tsconfig__tox-pylint - - tsconfig__tox-py27 - tsconfig__tox-py39 - tsconfig__tox-flake8 - - cgtsclient-tox-py27 - cgtsclient-tox-py39 - cgtsclient-tox-pep8 - cgtsclient-tox-pylint @@ -50,22 +42,6 @@ jobs: - stx-config-upload-git-mirror -- job: - name: sysinv-tox-py27 - parent: tox - description: | - Run py27 test for sysinv - nodeset: ubuntu-xenial - required-projects: - - starlingx/fault - - starlingx/utilities - - starlingx/update - files: - - sysinv/sysinv/* - vars: - tox_envlist: py27 - tox_extra_args: -c sysinv/sysinv/sysinv/tox.ini - - job: name: sysinv-tox-py39 parent: tox-py39 @@ -123,19 +99,6 @@ tox_envlist: bandit tox_extra_args: -c sysinv/sysinv/sysinv/tox.ini -- job: - name: controllerconfig-tox-py27 - parent: tox - description: Run py27 tests for controllerconfig - nodeset: ubuntu-xenial - required-projects: - - starlingx/fault - files: - - controllerconfig/* - vars: - tox_envlist: py27 - tox_extra_args: -c controllerconfig/controllerconfig/tox.ini - - job: name: controllerconfig-tox-py39 parent: tox-py39 @@ -184,17 +147,6 @@ tox_envlist: pylint tox_extra_args: -c tsconfig/tsconfig/tox.ini -- job: - name: tsconfig__tox-py27 - parent: tox - nodeset: ubuntu-xenial - description: Run py27 tests for tsconfig - files: - - tsconfig/* - vars: - tox_envlist: py27 - tox_extra_args: -c tsconfig/tsconfig/tox.ini - - job: name: tsconfig__tox-py39 parent: tox-py39 @@ -210,25 +162,13 @@ name: tsconfig__tox-flake8 parent: tox description: Run flake8 tests for tsconfig - nodeset: ubuntu-bionic + nodeset: debian-bullseye files: - tsconfig/* vars: tox_envlist: flake8 tox_extra_args: -c tsconfig/tsconfig/tox.ini -- job: - name: cgtsclient-tox-py27 - parent: tox - description: | - Run py27 test for cgts-client - nodeset: ubuntu-xenial - files: - - sysinv/cgts-client/* - vars: - tox_envlist: py27 - tox_extra_args: -c sysinv/cgts-client/cgts-client/tox.ini - - job: name: cgtsclient-tox-py39 parent: tox-py39 diff --git a/controllerconfig/controllerconfig/controllerconfig/utils.py b/controllerconfig/controllerconfig/controllerconfig/utils.py index 374c8a3499..f5fece9ad7 100644 --- a/controllerconfig/controllerconfig/controllerconfig/utils.py +++ b/controllerconfig/controllerconfig/controllerconfig/utils.py @@ -1,5 +1,5 @@ # -# Copyright (c) 2014-2022 Wind River Systems, Inc. +# Copyright (c) 2014-2023 Wind River Systems, Inc. # # SPDX-License-Identifier: Apache-2.0 # diff --git a/sysinv/cgts-client/cgts-client/cgtsclient/shell.py b/sysinv/cgts-client/cgts-client/cgtsclient/shell.py index e29e6ec2e9..61583b5ff5 100644 --- a/sysinv/cgts-client/cgts-client/cgtsclient/shell.py +++ b/sysinv/cgts-client/cgts-client/cgtsclient/shell.py @@ -10,7 +10,7 @@ # License for the specific language governing permissions and limitations # under the License. # -# Copyright (c) 2013-2021 Wind River Systems, Inc. +# Copyright (c) 2013-2023 Wind River Systems, Inc. # diff --git a/sysinv/sysinv/sysinv/sysinv/version.py b/sysinv/sysinv/sysinv/sysinv/version.py index eeea7d34f3..140e4398f9 100644 --- a/sysinv/sysinv/sysinv/sysinv/version.py +++ b/sysinv/sysinv/sysinv/sysinv/version.py @@ -15,7 +15,7 @@ # License for the specific language governing permissions and limitations # under the License. # -# Copyright (c) 2013-2022 Wind River Systems, Inc. +# Copyright (c) 2013-2023 Wind River Systems, Inc. # try: diff --git a/tsconfig/tsconfig/tox.ini b/tsconfig/tsconfig/tox.ini index d6cafafd50..1605e6cf97 100644 --- a/tsconfig/tsconfig/tox.ini +++ b/tsconfig/tsconfig/tox.ini @@ -9,6 +9,7 @@ envlist = flake8,py27,py36,py39,pylint,cover minversion = 2.3.2 [testenv] +basepython = python3 setenv = VIRTUAL_ENV={envdir} PYTHONWARNINGS=default::DeprecationWarning OS_STDOUT_CAPTURE=1 @@ -18,6 +19,7 @@ setenv = VIRTUAL_ENV={envdir} usedevelop = True install_command = pip install {opts} {packages} + deps = -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/stable/stein/upper-constraints.txt} -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt @@ -65,7 +67,10 @@ max-line-length = 120 [testenv:flake8] -basepython = python2.7 +basepython = python3.9 +deps = -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/starlingx/root/raw/branch/master/build-tools/requirements/debian/upper-constraints.txt} + -r{toxinidir}/requirements.txt + -r{toxinidir}/test-requirements.txt passenv = CURL_CA_BUNDLE usedevelop = False skip_install = True diff --git a/tsconfig/tsconfig/tsconfig/tsconfig.py b/tsconfig/tsconfig/tsconfig/tsconfig.py index e5cceb78bd..db3c926690 100644 --- a/tsconfig/tsconfig/tsconfig/tsconfig.py +++ b/tsconfig/tsconfig/tsconfig/tsconfig.py @@ -1,5 +1,5 @@ """ -Copyright (c) 2014-2022 Wind River Systems, Inc. +Copyright (c) 2014-2023 Wind River Systems, Inc. SPDX-License-Identifier: Apache-2.0