From 5a251fab1aaabe0c37b1c966b3b7224c264bc3e1 Mon Sep 17 00:00:00 2001
From: Al Bailey <al.bailey@windriver.com>
Date: Fri, 25 Mar 2022 20:20:21 +0000
Subject: [PATCH] Cleanup tox for python3.9 jobs

sysinv tox could not be run in a developer environment
due to a relative path that only existed in a zuul env.

the py39 zuul jobs do not need root repo cloned since
the upper constraints are accessed by URL.

The py files are only being updated in their header
so that the tox jobs will be triggered to be executed
due to zuul filtering.

Story: 2006796
Task: 44861
Signed-off-by: Al Bailey <al.bailey@windriver.com>
Change-Id: I184dc910717239fd343a70c343361a4c6b8fb9e3
---
 .zuul.yaml                                                  | 2 --
 controllerconfig/controllerconfig/controllerconfig/utils.py | 2 +-
 sysinv/sysinv/sysinv/sysinv/version.py                      | 2 +-
 sysinv/sysinv/sysinv/tox.ini                                | 2 +-
 tsconfig/tsconfig/tsconfig/tsconfig.py                      | 2 +-
 5 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 8043c90e81..82a8018e7c 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -73,7 +73,6 @@
     required-projects:
       - starlingx/fault
       - starlingx/utilities
-      - starlingx/root
       - starlingx/update
     files:
       - sysinv/sysinv/*
@@ -142,7 +141,6 @@
     nodeset: debian-bullseye
     required-projects:
       - starlingx/fault
-      - starlingx/root
     files:
       - controllerconfig/*
     vars:
diff --git a/controllerconfig/controllerconfig/controllerconfig/utils.py b/controllerconfig/controllerconfig/controllerconfig/utils.py
index d85eb4407a..374c8a3499 100644
--- a/controllerconfig/controllerconfig/controllerconfig/utils.py
+++ b/controllerconfig/controllerconfig/controllerconfig/utils.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014-2021 Wind River Systems, Inc.
+# Copyright (c) 2014-2022 Wind River Systems, Inc.
 #
 # SPDX-License-Identifier: Apache-2.0
 #
diff --git a/sysinv/sysinv/sysinv/sysinv/version.py b/sysinv/sysinv/sysinv/sysinv/version.py
index 02ee0f8bc8..eeea7d34f3 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-2021 Wind River Systems, Inc.
+# Copyright (c) 2013-2022 Wind River Systems, Inc.
 #
 
 try:
diff --git a/sysinv/sysinv/sysinv/tox.ini b/sysinv/sysinv/sysinv/tox.ini
index 2f7d97ea3e..3ade0f0e67 100644
--- a/sysinv/sysinv/sysinv/tox.ini
+++ b/sysinv/sysinv/sysinv/tox.ini
@@ -120,7 +120,7 @@ commands =
 [testenv:py39]
 basepython = python3.9
 install_command = pip install -v -v -v \
-    -c{[tox]stxdir}/root/build-tools/requirements/debian/upper-constraints.txt \
+    -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/starlingx/root/raw/branch/master/build-tools/requirements/debian/upper-constraints.txt} \
     {opts} {packages}
 commands =
   stestr run {posargs}
diff --git a/tsconfig/tsconfig/tsconfig/tsconfig.py b/tsconfig/tsconfig/tsconfig/tsconfig.py
index 5fb0eba487..b843cd21f5 100644
--- a/tsconfig/tsconfig/tsconfig/tsconfig.py
+++ b/tsconfig/tsconfig/tsconfig/tsconfig.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) 2014-2021 Wind River Systems, Inc.
+Copyright (c) 2014-2022 Wind River Systems, Inc.
 
 SPDX-License-Identifier: Apache-2.0