From 67e9223673355a6242259c8bf38e7d7736153431 Mon Sep 17 00:00:00 2001 From: Don Penney Date: Tue, 1 Oct 2019 13:29:59 -0400 Subject: [PATCH] Fix cgcs-patch tox failure A recent update to sysinv added a new import: https://review.opendev.org/#/c/679457/7/sysinv/sysinv/sysinv/sysinv/common/utils.py This file is imported in cgcs-patch and caused a tox failure because it could not be found. This commit updates the tox.ini and .zuul.yaml files to allow for installation of fm-api. Change-Id: I12d605d2782f7f32add4428507645cc31caadea2 Closes-Bug: 1846244 Signed-off-by: Don Penney --- .zuul.yaml | 4 ++++ cgcs-patch/cgcs-patch/tox.ini | 1 + 2 files changed, 5 insertions(+) diff --git a/.zuul.yaml b/.zuul.yaml index 9e338591..834413b6 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -34,6 +34,7 @@ parent: tox required-projects: - starlingx/config + - starlingx/fault files: - cgcs-patch/cgcs-patch/* vars: @@ -45,6 +46,7 @@ parent: tox required-projects: - starlingx/config + - starlingx/fault files: - cgcs-patch/cgcs-patch/* vars: @@ -56,6 +58,7 @@ parent: tox required-projects: - starlingx/config + - starlingx/fault files: - cgcs-patch/cgcs-patch/* vars: @@ -67,6 +70,7 @@ parent: tox required-projects: - starlingx/config + - starlingx/fault files: - cgcs-patch/cgcs-patch/* vars: diff --git a/cgcs-patch/cgcs-patch/tox.ini b/cgcs-patch/cgcs-patch/tox.ini index 5452685e..ba9c568b 100644 --- a/cgcs-patch/cgcs-patch/tox.ini +++ b/cgcs-patch/cgcs-patch/tox.ini @@ -32,6 +32,7 @@ install_command = pip install \ deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt + -e{[tox]stxdir}/fault/fm-api -e{[tox]stxdir}/config/sysinv/sysinv/sysinv -e{[tox]stxdir}/config/tsconfig/tsconfig