From 27e3ba045eaff84786bdbe722c8bd724fb255cb2 Mon Sep 17 00:00:00 2001
From: Al Bailey <Al.Bailey@windriver.com>
Date: Fri, 6 Sep 2019 13:22:52 -0500
Subject: [PATCH] Update tox.ini for relocated dependencies

This change updates the dependency paths referenced
by tox.ini so that zuul jobs in sysinv can pass.

The STX prefix is no longer needed by tox and zuul
now that the manifest and repo names are the same,
which was fixed as part of the package re-org.

integ is no longer a required project for zuul.
The packages from integ are in utilities instead.

Change-Id: I0ff834e51667e21cbd75262a2c4178fb837f93ad
Story: 2006166
Task: 36488
Signed-off-by: Al Bailey <Al.Bailey@windriver.com>
---
 .zuul.yaml                   | 22 +++++++---------------
 sysinv/sysinv/sysinv/tox.ini | 17 +++++++----------
 2 files changed, 14 insertions(+), 25 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 4085ba0751..a11624be76 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -38,14 +38,12 @@
       Run py27 test for sysinv
     nodeset: ubuntu-xenial
     required-projects:
-      - starlingx/update
       - starlingx/fault
-      - starlingx/integ
+      - starlingx/update
+      - starlingx/utilities
     files:
       - sysinv/sysinv/*
     vars:
-      tox_environment:
-        STX_PREFIX: ''
       tox_envlist: py27
       tox_extra_args: -c sysinv/sysinv/sysinv/tox.ini
 
@@ -56,14 +54,12 @@
       Run py35 test for sysinv
     nodeset: ubuntu-xenial
     required-projects:
-      - starlingx/update
       - starlingx/fault
-      - starlingx/integ
+      - starlingx/update
+      - starlingx/utilities
     files:
       - sysinv/sysinv/*
     vars:
-      tox_environment:
-        STX_PREFIX: ''
       tox_envlist: py35
       tox_extra_args: -c sysinv/sysinv/sysinv/tox.ini
 
@@ -75,8 +71,6 @@
     files:
       - sysinv/sysinv/*
     vars:
-      tox_environment:
-        STX_PREFIX: ''
       tox_envlist: flake8
       tox_extra_args: -c sysinv/sysinv/sysinv/tox.ini
 
@@ -86,14 +80,12 @@
     description: |
       Run pylint test for sysinv
     required-projects:
-      - starlingx/update
       - starlingx/fault
-      - starlingx/integ
+      - starlingx/update
+      - starlingx/utilities
     files:
       - sysinv/sysinv/*
     vars:
-      tox_environment:
-        STX_PREFIX: ''
       tox_envlist: pylint
       tox_extra_args: -c sysinv/sysinv/sysinv/tox.ini
 
@@ -144,8 +136,8 @@
     parent: flock-devstack-base
     required-projects:
       - starlingx/fault
-      - starlingx/integ
       - starlingx/update
+      - starlingx/utilities
     vars:
       tox_envlist: functional
       devstack_services:
diff --git a/sysinv/sysinv/sysinv/tox.ini b/sysinv/sysinv/sysinv/tox.ini
index 9a40be2749..5a1a5185ac 100644
--- a/sysinv/sysinv/sysinv/tox.ini
+++ b/sysinv/sysinv/sysinv/tox.ini
@@ -29,8 +29,6 @@ install_command = pip install \
 
 # Note the hash seed is set to 0 until can be tested with a
 # random hash seed successfully.
-# Note: Developers can leave STX_PREFIX unset in their env, and it will default to "stx-".
-# Zuul sets STX_PREFIX to an empty string.
 setenv = VIRTUAL_ENV={envdir}
          PYTHONHASHSEED=0
          PYTHONDONTWRITEBYTECODE=1
@@ -42,17 +40,16 @@ setenv = VIRTUAL_ENV={envdir}
          SYSINV_TEST_ENV=True
          TOX_WORK_DIR={toxworkdir}
          PYLINTHOME={toxworkdir}
-         STX_PREFIX = {env:STX_PREFIX:stx-}
 
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
-       -e{[tox]stxdir}/{env:STX_PREFIX}config/tsconfig/tsconfig
-       -e{[tox]stxdir}/{env:STX_PREFIX}fault/fm-api
-       -e{[tox]stxdir}/{env:STX_PREFIX}fault/python-fmclient/fmclient
-       -e{[tox]stxdir}/{env:STX_PREFIX}config/controllerconfig/controllerconfig
-       -e{[tox]stxdir}/{env:STX_PREFIX}update/cgcs-patch/cgcs-patch
-       -e{[tox]stxdir}/{env:STX_PREFIX}integ/utilities/platform-util/platform-util
-       -e{[tox]stxdir}/{env:STX_PREFIX}integ/ceph/python-cephclient/python-cephclient
+       -e{[tox]stxdir}/config/tsconfig/tsconfig
+       -e{[tox]stxdir}/fault/fm-api
+       -e{[tox]stxdir}/fault/python-fmclient/fmclient
+       -e{[tox]stxdir}/config/controllerconfig/controllerconfig
+       -e{[tox]stxdir}/update/cgcs-patch/cgcs-patch
+       -e{[tox]stxdir}/utilities/utilities/platform-util/platform-util
+       -e{[tox]stxdir}/utilities/ceph/python-cephclient/python-cephclient
 
 commands =
   find . -type f -name "*.pyc" -delete