From 217484d4f1aab074956ef0e4f8df01e6786a8526 Mon Sep 17 00:00:00 2001 From: Scott Little Date: Wed, 4 Sep 2019 10:13:46 -0400 Subject: [PATCH] Config file changes to add 'tsconfig' after relocation from 'update' Story: 2006166 Task: 35687 Depends-On: Ie6fc7b2a185168424cb6158e817b6e240af89d5e Depends-On: I665dc7fabbfffc798ad57843eb74dca16e7647a3 Change-Id: I6c62895f8dda5b8dc4ff56680c73c49f3f3d7935 Signed-off-by: Scott Little Depends-On: Ib9f912a6c776512983ce187fdf594b6274d13ce0 --- centos_dev_wheels.inc | 1 + centos_iso_image.inc | 3 +++ centos_pkg_dirs | 1 + centos_stable_wheels.inc | 1 + controllerconfig/controllerconfig/tox.ini | 2 +- sysinv/cgts-client/cgts-client/tox.ini | 2 +- sysinv/sysinv/sysinv/tox.ini | 2 +- 7 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 centos_dev_wheels.inc diff --git a/centos_dev_wheels.inc b/centos_dev_wheels.inc new file mode 100644 index 0000000000..d424d5c06f --- /dev/null +++ b/centos_dev_wheels.inc @@ -0,0 +1 @@ +tsconfig-wheels diff --git a/centos_iso_image.inc b/centos_iso_image.inc index 21d54d2c95..ce996a7704 100644 --- a/centos_iso_image.inc +++ b/centos_iso_image.inc @@ -34,3 +34,6 @@ puppet-manifests stx-platform-helm # PM QoS cpu latency manager + +# tsconfig +tsconfig diff --git a/centos_pkg_dirs b/centos_pkg_dirs index 2b8c1e0cef..9a59791284 100644 --- a/centos_pkg_dirs +++ b/centos_pkg_dirs @@ -17,3 +17,4 @@ puppet-modules-wrs/puppet-dcmanager puppet-modules-wrs/puppet-smapi puppet-modules-wrs/puppet-fm puppet-modules-wrs/puppet-dcdbsync +tsconfig diff --git a/centos_stable_wheels.inc b/centos_stable_wheels.inc index e5bc269940..19901c41d9 100644 --- a/centos_stable_wheels.inc +++ b/centos_stable_wheels.inc @@ -1,3 +1,4 @@ cgts-client-wheels controllerconfig-wheels sysinv-wheels +tsconfig-wheels diff --git a/controllerconfig/controllerconfig/tox.ini b/controllerconfig/controllerconfig/tox.ini index 23578e04c1..7bd407cc76 100644 --- a/controllerconfig/controllerconfig/tox.ini +++ b/controllerconfig/controllerconfig/tox.ini @@ -23,7 +23,7 @@ setenv = STX_PREFIX = {env:STX_PREFIX:stx-} deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt -e{[tox]stxdir}/{env:STX_PREFIX}fault/fm-api - -e{[tox]stxdir}/{env:STX_PREFIX}update/tsconfig/tsconfig + -e{[tox]stxdir}/{env:STX_PREFIX}config/tsconfig/tsconfig -e{[tox]stxdir}/{env:STX_PREFIX}config/sysinv/sysinv/sysinv -e{[tox]stxdir}/{env:STX_PREFIX}config/sysinv/cgts-client/cgts-client diff --git a/sysinv/cgts-client/cgts-client/tox.ini b/sysinv/cgts-client/cgts-client/tox.ini index f376efca3b..d9f066dde1 100644 --- a/sysinv/cgts-client/cgts-client/tox.ini +++ b/sysinv/cgts-client/cgts-client/tox.ini @@ -24,7 +24,7 @@ install_command = pip install \ {opts} {packages} deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt - -e{[tox]stxdir}/{env:STX_PREFIX}update/tsconfig/tsconfig + -e{[tox]stxdir}/{env:STX_PREFIX}config/tsconfig/tsconfig commands = find {toxinidir} -not -path '{toxinidir}/.tox/*' -name '*.py[c|o]' -delete diff --git a/sysinv/sysinv/sysinv/tox.ini b/sysinv/sysinv/sysinv/tox.ini index 6a9bd53b8a..9a40be2749 100644 --- a/sysinv/sysinv/sysinv/tox.ini +++ b/sysinv/sysinv/sysinv/tox.ini @@ -46,7 +46,7 @@ setenv = VIRTUAL_ENV={envdir} deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt - -e{[tox]stxdir}/{env:STX_PREFIX}update/tsconfig/tsconfig + -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