openstack
/
tacker
Code Issues Proposed changes

Temporary revert to install ht and tp with pip 

This update is to revert a change for tosca-parser and heat-translator
installation [1]. It works fine for devstack for Tacker, but doesn't
for some CI tests in kolla. It fails for a "package cannot be found"
error.

The reason of [1] is introduced is because we need to make a change and
it can be used from Tacker quickly. We cannot wait pip packages updated.
However, the latest versions are released recently in which all updates
required from Tacker are included. So, it's OK to revert [1] for a
while.

If this reverting does not affect to kolla CI after merged, we should
cancel the change and make install from git repo again.

[1] commit 500d2eb7 "Change tosca-parser and heat-translator install"

Signed-off-by: Yasufumi Ogawa <yasufum.o@gmail.com>
Change-Id: Ie2d994b053e909ab10a99307793c795628482e2b
This commit is contained in:
Yasufumi Ogawa 2021-03-10 02:36:38 +00:00
parent 08b4633514
commit 0f21044af9
6 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devstack/lib/download_upper_consts
View File

@ -13,4 +13,6 @@ function download_upper_constraints_file {
> upper-constraints.txt > upper-constraints.txt
} }
download_upper_constraints_file # TODO(yasufum) Uncomment if install tosca-parser and heat-translator from git
# repo.
# download_upper_constraints_file

6
devstack/plugin.sh
View File

@ -20,9 +20,9 @@ if is_service_enabled tacker; then
# for development. # for development.
# If you install pip packages instead, comment out here, and activate # If you install pip packages instead, comment out here, and activate
# entries in `requirements.txt` and `lower-constraints.txt`. # entries in `requirements.txt` and `lower-constraints.txt`.
install_package_local_repo tosca-parser #install_package_local_repo tosca-parser
install_package_local_repo heat-translator #install_package_local_repo heat-translator
. $DEST/tacker/devstack/lib/download_upper_consts #. $DEST/tacker/devstack/lib/download_upper_consts
elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then
# Configure after the other layer 1 and 2 services have been configured # Configure after the other layer 1 and 2 services have been configured

4
lower-constraints.txt
View File

@ -160,5 +160,5 @@ wrapt==1.10.11
# but the latest revision from git repo for development. # but the latest revision from git repo for development.
# If you install packages, comment out two lines of `install_package_gitrepo` in # If you install packages, comment out two lines of `install_package_gitrepo` in
# `devstack/plugin.sh` in addition to activate following lines. # `devstack/plugin.sh` in addition to activate following lines.
#heat-translator==2.0.0 # Apache-2.0 heat-translator==2.2.0 # Apache-2.0
#tosca-parser==1.6.1 # Apache-2.0 tosca-parser==2.3.0 # Apache-2.0

4
requirements-extra.txt
View File

@ -4,5 +4,5 @@
# `tox -e lower-constraints` and it's failed if it's defined in # `tox -e lower-constraints` and it's failed if it's defined in
# `requirements.txt`. # `requirements.txt`.
-e git+https://opendev.org/openstack/tosca-parser.git#egg=tosca-parser # Apache-2.0 #-e git+https://opendev.org/openstack/tosca-parser.git#egg=tosca-parser # Apache-2.0
-e git+https://opendev.org/openstack/heat-translator.git#egg=heat-translator # Apache-2.0 #-e git+https://opendev.org/openstack/heat-translator.git#egg=heat-translator # Apache-2.0

4
requirements.txt
View File

@ -60,5 +60,5 @@ glance-store>=2.4.0 # Apache-2.0
# but the latest revision from git repo for development. # but the latest revision from git repo for development.
# If you install packages, comment out two lines of `install_package_gitrepo` in # If you install packages, comment out two lines of `install_package_gitrepo` in
# `devstack/plugin.sh` in addition to activate following lines. # `devstack/plugin.sh` in addition to activate following lines.
#heat-translator>=2.0.0 # Apache-2.0 heat-translator>=2.2.0 # Apache-2.0
#tosca-parser>=1.6.1 # Apache-2.0 tosca-parser>=2.3.0 # Apache-2.0

10
tox.ini
View File

@ -15,15 +15,15 @@ setenv = VIRTUAL_ENV={envdir}
OS_LOG_CAPTURE={env:OS_LOG_CAPTURE:true} OS_LOG_CAPTURE={env:OS_LOG_CAPTURE:true}
OS_STDOUT_CAPTURE={env:OS_STDOUT_CAPTURE:true} OS_STDOUT_CAPTURE={env:OS_STDOUT_CAPTURE:true}
OS_STDERR_CAPTURE={env:OS_STDERR_CAPTURE:true} OS_STDERR_CAPTURE={env:OS_STDERR_CAPTURE:true}
TOX_CONSTRAINTS_FILE={toxinidir}/upper-constraints.txt # TOX_CONSTRAINTS_FILE={toxinidir}/upper-constraints.txt
passenv = TOX_CONSTRAINTS_FILE passenv = TOX_CONSTRAINTS_FILE
usedevelop = True usedevelop = True
allowlist_externals = rm allowlist_externals = rm
deps = deps =
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-r{toxinidir}/requirements.txt -r{toxinidir}/requirements.txt
-r{toxinidir}/requirements-extra.txt
-r{toxinidir}/test-requirements.txt -r{toxinidir}/test-requirements.txt
# -r{toxinidir}/requirements-extra.txt
commands = commands =
stestr run --slowest --concurrency 1 {posargs} stestr run --slowest --concurrency 1 {posargs}
@ -87,7 +87,7 @@ commands = python ./tools/check_i18n.py ./tacker
[testenv:docs] [testenv:docs]
deps = -r{toxinidir}/doc/requirements.txt deps = -r{toxinidir}/doc/requirements.txt
-r{toxinidir}/requirements-extra.txt # -r{toxinidir}/requirements-extra.txt
commands = commands =
sphinx-build -W -b html doc/source doc/build/html sphinx-build -W -b html doc/source doc/build/html
oslopolicy-sample-generator --config-file=etc/tacker-policy-generator.conf oslopolicy-sample-generator --config-file=etc/tacker-policy-generator.conf
@ -107,7 +107,7 @@ commands =
[testenv:cover] [testenv:cover]
setenv = setenv =
PYTHON=coverage run --source tacker --parallel-mode PYTHON=coverage run --source tacker --parallel-mode
TOX_CONSTRAINTS_FILE={toxinidir}/upper-constraints.txt # TOX_CONSTRAINTS_FILE={toxinidir}/upper-constraints.txt
commands = commands =
stestr run {posargs} stestr run {posargs}
coverage combine coverage combine
@ -148,7 +148,7 @@ deps =
-c{toxinidir}/lower-constraints.txt -c{toxinidir}/lower-constraints.txt
-r{toxinidir}/test-requirements.txt -r{toxinidir}/test-requirements.txt
-r{toxinidir}/requirements.txt -r{toxinidir}/requirements.txt
-r{toxinidir}/requirements-extra.txt # -r{toxinidir}/requirements-extra.txt
[testenv:bindep] [testenv:bindep]
# Do not install any requirements. We want this to be fast and work even if # Do not install any requirements. We want this to be fast and work even if