Merge "Remove python2 jobs from zuul for this repo"

.zuul.yaml

@@ -13,15 +13,12 @@
         - 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
@@ -32,15 +29,12 @@
         - 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
@@ -105,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
@@ -166,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
@@ -192,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

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
 #

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.
 #
 
 

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:

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

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