From 0f21044af9e11aeae64094fc5e61148dee8edf28 Mon Sep 17 00:00:00 2001 From: Yasufumi Ogawa Date: Wed, 10 Mar 2021 02:36:38 +0000 Subject: [PATCH] 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 Change-Id: Ie2d994b053e909ab10a99307793c795628482e2b --- devstack/lib/download_upper_consts | 4 +++- devstack/plugin.sh | 6 +++--- lower-constraints.txt | 4 ++-- requirements-extra.txt | 4 ++-- requirements.txt | 4 ++-- tox.ini | 10 +++++----- 6 files changed, 17 insertions(+), 15 deletions(-) diff --git a/devstack/lib/download_upper_consts b/devstack/lib/download_upper_consts index 93c101d05..c34e1a73d 100644 --- a/devstack/lib/download_upper_consts +++ b/devstack/lib/download_upper_consts @@ -13,4 +13,6 @@ function download_upper_constraints_file { > upper-constraints.txt } -download_upper_constraints_file +# TODO(yasufum) Uncomment if install tosca-parser and heat-translator from git +# repo. +# download_upper_constraints_file diff --git a/devstack/plugin.sh b/devstack/plugin.sh index ebfc0506e..f0b1c95d8 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -20,9 +20,9 @@ if is_service_enabled tacker; then # for development. # If you install pip packages instead, comment out here, and activate # entries in `requirements.txt` and `lower-constraints.txt`. - install_package_local_repo tosca-parser - install_package_local_repo heat-translator - . $DEST/tacker/devstack/lib/download_upper_consts + #install_package_local_repo tosca-parser + #install_package_local_repo heat-translator + #. $DEST/tacker/devstack/lib/download_upper_consts elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then # Configure after the other layer 1 and 2 services have been configured diff --git a/lower-constraints.txt b/lower-constraints.txt index feb673f33..06f7a176f 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -160,5 +160,5 @@ wrapt==1.10.11 # but the latest revision from git repo for development. # If you install packages, comment out two lines of `install_package_gitrepo` in # `devstack/plugin.sh` in addition to activate following lines. -#heat-translator==2.0.0 # Apache-2.0 -#tosca-parser==1.6.1 # Apache-2.0 +heat-translator==2.2.0 # Apache-2.0 +tosca-parser==2.3.0 # Apache-2.0 diff --git a/requirements-extra.txt b/requirements-extra.txt index decb6e1fb..7375425d8 100644 --- a/requirements-extra.txt +++ b/requirements-extra.txt @@ -4,5 +4,5 @@ # `tox -e lower-constraints` and it's failed if it's defined in # `requirements.txt`. --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/tosca-parser.git#egg=tosca-parser # Apache-2.0 +#-e git+https://opendev.org/openstack/heat-translator.git#egg=heat-translator # Apache-2.0 diff --git a/requirements.txt b/requirements.txt index 0170a3d9d..7727198d3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -60,5 +60,5 @@ glance-store>=2.4.0 # Apache-2.0 # but the latest revision from git repo for development. # If you install packages, comment out two lines of `install_package_gitrepo` in # `devstack/plugin.sh` in addition to activate following lines. -#heat-translator>=2.0.0 # Apache-2.0 -#tosca-parser>=1.6.1 # Apache-2.0 +heat-translator>=2.2.0 # Apache-2.0 +tosca-parser>=2.3.0 # Apache-2.0 diff --git a/tox.ini b/tox.ini index 3c6c4e80a..805bedd0c 100644 --- a/tox.ini +++ b/tox.ini @@ -15,15 +15,15 @@ setenv = VIRTUAL_ENV={envdir} OS_LOG_CAPTURE={env:OS_LOG_CAPTURE:true} OS_STDOUT_CAPTURE={env:OS_STDOUT_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 usedevelop = True allowlist_externals = rm deps = -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} -r{toxinidir}/requirements.txt - -r{toxinidir}/requirements-extra.txt -r{toxinidir}/test-requirements.txt +# -r{toxinidir}/requirements-extra.txt commands = stestr run --slowest --concurrency 1 {posargs} @@ -87,7 +87,7 @@ commands = python ./tools/check_i18n.py ./tacker [testenv:docs] deps = -r{toxinidir}/doc/requirements.txt - -r{toxinidir}/requirements-extra.txt +# -r{toxinidir}/requirements-extra.txt commands = sphinx-build -W -b html doc/source doc/build/html oslopolicy-sample-generator --config-file=etc/tacker-policy-generator.conf @@ -107,7 +107,7 @@ commands = [testenv:cover] setenv = PYTHON=coverage run --source tacker --parallel-mode - TOX_CONSTRAINTS_FILE={toxinidir}/upper-constraints.txt +# TOX_CONSTRAINTS_FILE={toxinidir}/upper-constraints.txt commands = stestr run {posargs} coverage combine @@ -148,7 +148,7 @@ deps = -c{toxinidir}/lower-constraints.txt -r{toxinidir}/test-requirements.txt -r{toxinidir}/requirements.txt - -r{toxinidir}/requirements-extra.txt +# -r{toxinidir}/requirements-extra.txt [testenv:bindep] # Do not install any requirements. We want this to be fast and work even if