From 75cfe5b1fd880d989859c3414298fc9453377819 Mon Sep 17 00:00:00 2001 From: caoyuan Date: Tue, 23 Apr 2019 19:40:17 +0800 Subject: [PATCH] Replace git.openstack.org URLs with opendev.org URLs Change-Id: I714eed8117c3d8fbc90046eae79ab2bf3a1a2706 --- README.rst | 2 +- devstack/settings | 2 +- doc/source/devspecs/cross-neutron-l2-networking.rst | 4 ++-- doc/source/devspecs/legacy_tables_clean.rst | 2 +- doc/source/devspecs/resource_deleting.rst | 2 +- tox.ini | 6 +++--- tricircle/cmd/api.py | 2 +- tricircle/cmd/xjob.py | 2 +- tricircle/tempestplugin/gate_hook.sh | 4 ++-- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/README.rst b/README.rst index 5c248ac3..eb596ea4 100644 --- a/README.rst +++ b/README.rst @@ -50,7 +50,7 @@ detailed in the LICENSE file. * Admin guide: https://docs.openstack.org/tricircle/latest/admin/index.html * Configuration guide: https://docs.openstack.org/tricircle/latest/configuration/index.html * Networking guide: https://docs.openstack.org/tricircle/latest/networking/index.html -* Source: https://git.openstack.org/cgit/openstack/tricircle +* Source: https://opendev.org/openstack/tricircle * Bugs: https://bugs.launchpad.net/tricircle * Blueprints: https://blueprints.launchpad.net/tricircle * Release notes: https://docs.openstack.org/releasenotes/tricircle diff --git a/devstack/settings b/devstack/settings index 07ab974e..3f6a5339 100644 --- a/devstack/settings +++ b/devstack/settings @@ -1,5 +1,5 @@ # Git information -TRICIRCLE_REPO=${TRICIRCLE_REPO:-https://git.openstack.org/cgit/openstack/tricircle/} +TRICIRCLE_REPO=${TRICIRCLE_REPO:-https://opendev.org/openstack/tricircle/} TRICIRCLE_DIR=$DEST/tricircle TRICIRCLE_BRANCH=${TRICIRCLE_BRANCH:-master} diff --git a/doc/source/devspecs/cross-neutron-l2-networking.rst b/doc/source/devspecs/cross-neutron-l2-networking.rst index c9889d58..acd9501b 100644 --- a/doc/source/devspecs/cross-neutron-l2-networking.rst +++ b/doc/source/devspecs/cross-neutron-l2-networking.rst @@ -547,7 +547,7 @@ References ---------------- [1] https://docs.google.com/document/d/18kZZ1snMOCD9IQvUKI5NVDzSASpw-QKj7l2zNqMEd3g/ -[2] https://review.openstack.org/#/c/270786/ +[2] https://review.opendev.org/#/c/270786/ [3] https://github.com/openstack/networking-l2gw/blob/master/specs/kilo/l2-gateway-api.rst @@ -555,4 +555,4 @@ References [5] https://docs.openstack.org/mitaka/networking-guide/config-az.html -[6] https://review.openstack.org/#/c/306224/ +[6] https://review.opendev.org/#/c/306224/ diff --git a/doc/source/devspecs/legacy_tables_clean.rst b/doc/source/devspecs/legacy_tables_clean.rst index 8448830b..715dd39e 100644 --- a/doc/source/devspecs/legacy_tables_clean.rst +++ b/doc/source/devspecs/legacy_tables_clean.rst @@ -108,4 +108,4 @@ References ========== [1] https://github.com/openstack/trio2o -[2] https://review.openstack.org/#/c/412325/ +[2] https://review.opendev.org/#/c/412325/ diff --git a/doc/source/devspecs/resource_deleting.rst b/doc/source/devspecs/resource_deleting.rst index 58770e7d..695aa9a6 100644 --- a/doc/source/devspecs/resource_deleting.rst +++ b/doc/source/devspecs/resource_deleting.rst @@ -63,4 +63,4 @@ In addition, there is a timestamp in table that cloud administrator is able to delete a resource which is in deleting status over long time (too long to delete, or in abnormal status). -[1] https://review.openstack.org/#/c/518421/ +[1] https://review.opendev.org/#/c/518421/ diff --git a/tox.ini b/tox.ini index f6da1530..65beef08 100644 --- a/tox.ini +++ b/tox.ini @@ -8,7 +8,7 @@ setenv = VIRTUAL_ENV={envdir} PYTHONWARNINGS=default::DeprecationWarning passenv = TRACE_FAILONLY GENERATE_HASHES http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY usedevelop = True -deps = -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/stein} +deps = -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/stable/stein/upper-constraints.txt} -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt whitelist_externals = @@ -84,8 +84,8 @@ import_exceptions = tricircle.common.i18n # https://pip.pypa.io/en/stable/reference/pip_install/#editable-installs # note that order is important to ensure dependencies don't override commands = - pip install -q -e "git+https://git.openstack.org/openstack/networking-sfc#egg=networking_sfc" - pip install -q -e "git+https://git.openstack.org/openstack/neutron#egg=neutron" + pip install -q -e "git+https://opendev.org/openstack/networking-sfc#egg=networking_sfc" + pip install -q -e "git+https://opendev.org/openstack/neutron#egg=neutron" [testenv:py27-dev] basepython = python2.7 diff --git a/tricircle/cmd/api.py b/tricircle/cmd/api.py index 65c4b9c9..b625764a 100644 --- a/tricircle/cmd/api.py +++ b/tricircle/cmd/api.py @@ -14,7 +14,7 @@ # under the License. # Much of this module is based on the work of the Ironic team -# see http://git.openstack.org/cgit/openstack/ironic/tree/ironic/cmd/api.py +# see https://opendev.org/openstack/ironic/src/branch/master/ironic/cmd/api.py import sys diff --git a/tricircle/cmd/xjob.py b/tricircle/cmd/xjob.py index 851b781c..216a796e 100644 --- a/tricircle/cmd/xjob.py +++ b/tricircle/cmd/xjob.py @@ -14,7 +14,7 @@ # under the License. # Much of this module is based on the work of the Ironic team -# see http://git.openstack.org/cgit/openstack/ironic/tree/ironic/cmd/api.py +# see https://opendev.org/openstack/ironic/src/branch/master/ironic/cmd/api.py import eventlet diff --git a/tricircle/tempestplugin/gate_hook.sh b/tricircle/tempestplugin/gate_hook.sh index 198b0ed2..c4688968 100755 --- a/tricircle/tempestplugin/gate_hook.sh +++ b/tricircle/tempestplugin/gate_hook.sh @@ -39,8 +39,8 @@ function _setup_tricircle_multinode { export OVERRIDE_ENABLED_SERVICES+="q-metering,q-svc," export OVERRIDE_ENABLED_SERVICES+="dstat,peakmem_tracker,rabbit,mysql" - ENABLE_TRICIRCLE="enable_plugin tricircle https://git.openstack.org/openstack/tricircle/" - ENABLE_SFC="enable_plugin networking-sfc https://git.openstack.org/openstack/networking-sfc/" + ENABLE_TRICIRCLE="enable_plugin tricircle https://opendev.org/openstack/tricircle/" + ENABLE_SFC="enable_plugin networking-sfc https://opendev.org/openstack/networking-sfc/" # Configure primary node export DEVSTACK_LOCAL_CONFIG="$ENABLE_TRICIRCLE"