From 349ba7541070376614421c33fc8394cce3103452 Mon Sep 17 00:00:00 2001 From: caoyuan Date: Tue, 23 Apr 2019 19:40:06 +0800 Subject: [PATCH] Replace git.openstack.org URLs with opendev.org URLs Thorough replacement of git.openstack.org and review.openstack.org URLs with their opendev.org counterparts. Change-Id: I88e894db7b854d32593c770f5aa9b8a91fad7866 --- HACKING.rst | 2 +- README.rst | 2 +- REVIEWING.rst | 2 +- doc/source/plugin.rst | 2 +- ...rofile-config-option-d67f5cb31f1bc34c.yaml | 2 +- tempest/api/identity/v3/test_catalog.py | 4 +-- tools/generate-tempest-plugins-list.py | 9 +++--- tools/generate-tempest-plugins-list.sh | 8 ++--- tools/tempest-plugin-sanity.sh | 30 +++++++++---------- tox.ini | 12 ++++---- 10 files changed, 37 insertions(+), 36 deletions(-) diff --git a/HACKING.rst b/HACKING.rst index 1559fc69d2..204b3c793a 100644 --- a/HACKING.rst +++ b/HACKING.rst @@ -457,7 +457,7 @@ in which the feature isn't available. In DevStack, this can be accomplished by modifying Tempest's `lib installation script`_ for previous branches (because DevStack is branched). -.. _lib installation script: https://git.openstack.org/cgit/openstack-dev/devstack/tree/lib/tempest +.. _lib installation script: https://opendev.org/openstack/devstack/src/branch/master/lib/tempest 2. Bug fix on core project needing Tempest changes ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/README.rst b/README.rst index 73930f1745..e8206eea2f 100644 --- a/README.rst +++ b/README.rst @@ -61,7 +61,7 @@ as it is simpler, and quicker to work with. #. You first need to install Tempest. This is done with pip after you check out the Tempest repo:: - $ git clone https://git.openstack.org/openstack/tempest + $ git clone https://opendev.org/openstack/tempest $ pip install tempest/ This can be done within a venv, but the assumption for this guide is that diff --git a/REVIEWING.rst b/REVIEWING.rst index 31fedce868..498ce660cd 100644 --- a/REVIEWING.rst +++ b/REVIEWING.rst @@ -187,4 +187,4 @@ When to approve Note that such a policy should be used judiciously, as we should strive to have two +2's on each patch set, prior to approval. -.. _example: https://review.openstack.org/#/c/611032/ +.. _example: https://review.opendev.org/#/c/611032/ diff --git a/doc/source/plugin.rst b/doc/source/plugin.rst index dc0e94ca64..a9e2059280 100644 --- a/doc/source/plugin.rst +++ b/doc/source/plugin.rst @@ -43,7 +43,7 @@ Plugin Cookiecutter In order to create the basic structure with base classes and test directories you can use the tempest-plugin-cookiecutter project:: - > pip install -U cookiecutter && cookiecutter https://git.openstack.org/openstack/tempest-plugin-cookiecutter + > pip install -U cookiecutter && cookiecutter https://opendev.org/openstack/tempest-plugin-cookiecutter Cloning into 'tempest-plugin-cookiecutter'... remote: Counting objects: 17, done. diff --git a/releasenotes/notes/correct-port-profile-config-option-d67f5cb31f1bc34c.yaml b/releasenotes/notes/correct-port-profile-config-option-d67f5cb31f1bc34c.yaml index 7510d47e46..2830aa24ce 100644 --- a/releasenotes/notes/correct-port-profile-config-option-d67f5cb31f1bc34c.yaml +++ b/releasenotes/notes/correct-port-profile-config-option-d67f5cb31f1bc34c.yaml @@ -1,7 +1,7 @@ --- fixes: - | - Patch https://review.openstack.org/#/c/499575/ introduced + Patch https://review.opendev.org/#/c/499575/ introduced support creating Neutron port with certain capabilities. Currently capabilities list interpreted as string this change fix it. diff --git a/tempest/api/identity/v3/test_catalog.py b/tempest/api/identity/v3/test_catalog.py index deec2dcf16..bc95f0d7d2 100644 --- a/tempest/api/identity/v3/test_catalog.py +++ b/tempest/api/identity/v3/test_catalog.py @@ -22,8 +22,8 @@ class IdentityCatalogTest(base.BaseIdentityV3Test): @decorators.idempotent_id('56b57ced-22b8-4127-9b8a-565dfb0207e2') def test_catalog_standardization(self): - # http://git.openstack.org/cgit/openstack/service-types-authority - # /tree/service-types.yaml + # https://opendev.org/openstack/service-types-authority + # /src/branch/master/service-types.yaml standard_service_values = [{'name': 'keystone', 'type': 'identity'}, {'name': 'nova', 'type': 'compute'}, {'name': 'glance', 'type': 'image'}, diff --git a/tools/generate-tempest-plugins-list.py b/tools/generate-tempest-plugins-list.py index 3772774e82..746cb34e9e 100644 --- a/tools/generate-tempest-plugins-list.py +++ b/tools/generate-tempest-plugins-list.py @@ -19,9 +19,9 @@ # # In order to function correctly, the environment in which the # script runs must have -# * network access to the review.openstack.org Gerrit API +# * network access to the review.opendev.org Gerrit API # working directory -# * network access to https://git.openstack.org/cgit +# * network access to https://opendev.org/openstack import json import re @@ -36,7 +36,7 @@ except ImportError: from urllib2 import HTTPError -url = 'https://review.openstack.org/projects/' +url = 'https://review.opendev.org/projects/' # This is what a project looks like ''' @@ -59,7 +59,8 @@ def is_in_openstack_namespace(proj): def has_tempest_plugin(proj): try: r = urllib.urlopen( - "https://git.openstack.org/cgit/%s/plain/setup.cfg" % proj) + "https://opendev.org/%s/raw/branch/" + "master/setup.cfg" % proj) except HTTPError as err: if err.code == 404: return False diff --git a/tools/generate-tempest-plugins-list.sh b/tools/generate-tempest-plugins-list.sh index 17a4059e2a..b4e5430e05 100755 --- a/tools/generate-tempest-plugins-list.sh +++ b/tools/generate-tempest-plugins-list.sh @@ -28,9 +28,9 @@ # * the environment variable git_dir pointing to the location # * of said git repositories # ) OR ( -# * network access to the review.openstack.org Gerrit API +# * network access to the review.opendev.org Gerrit API # working directory -# * network access to https://git.openstack.org/cgit +# * network access to https://opendev.org/openstack # )) # # If a file named doc/source/data/tempest-plugins-registry.header or @@ -69,8 +69,8 @@ title_underline ${name_col_len} i=0 for plugin in ${sorted_plugins}; do i=$((i+1)) - giturl="https://git.openstack.org/openstack/${plugin}" - gitlink="https://git.openstack.org/cgit/openstack/${plugin}" + giturl="https://opendev.org/openstack/${plugin}" + gitlink="https://opendev.org/openstack/${plugin}" printf "%-3s %-${name_col_len}s %s\n" "$i" "${plugin}" "\`${giturl} <${gitlink}>\`__" done diff --git a/tools/tempest-plugin-sanity.sh b/tools/tempest-plugin-sanity.sh index 6bb87c51f1..015b2b7e51 100644 --- a/tools/tempest-plugin-sanity.sh +++ b/tools/tempest-plugin-sanity.sh @@ -46,20 +46,20 @@ PROJECT_LIST="$(python tools/generate-tempest-plugins-list.py)" # List of projects having tempest plugin stale or unmaintained for a long time # (6 months or more) # TODO(masayukig): Some of these can be removed from BLACKLIST in the future. -# barbican-tempest-plugin: https://review.openstack.org/#/c/634631/ +# barbican-tempest-plugin: https://review.opendev.org/#/c/634631/ # cyborg-tempest-plugin: https://review.opendev.org/659687 -# intel-nfv-ci-tests: https://review.openstack.org/#/c/634640/ -# networking-ansible: https://review.openstack.org/#/c/634647/ -# networking-generic-switch: https://review.openstack.org/#/c/634846/ -# networking-l2gw-tempest-plugin: https://review.openstack.org/#/c/635093/ -# networking-midonet: https://review.openstack.org/#/c/635096/ -# networking-plumgrid: https://review.openstack.org/#/c/635096/ -# networking-spp: https://review.openstack.org/#/c/635098/ -# neutron-dynamic-routing: https://review.openstack.org/#/c/637718/ -# neutron-vpnaas: https://review.openstack.org/#/c/637719/ -# nova-lxd: https://review.openstack.org/#/c/638334/ -# valet: https://review.openstack.org/#/c/638339/ -# vitrage-tempest-plugin: https://review.openstack.org/#/c/639003/ +# intel-nfv-ci-tests: https://review.opendev.org/#/c/634640/ +# networking-ansible: https://review.opendev.org/#/c/634647/ +# networking-generic-switch: https://review.opendev.org/#/c/634846/ +# networking-l2gw-tempest-plugin: https://review.opendev.org/#/c/635093/ +# networking-midonet: https://review.opendev.org/#/c/635096/ +# networking-plumgrid: https://review.opendev.org/#/c/635096/ +# networking-spp: https://review.opendev.org/#/c/635098/ +# neutron-dynamic-routing: https://review.opendev.org/#/c/637718/ +# neutron-vpnaas: https://review.opendev.org/#/c/637719/ +# nova-lxd: https://review.opendev.org/#/c/638334/ +# valet: https://review.opendev.org/#/c/638339/ +# vitrage-tempest-plugin: https://review.opendev.org/#/c/639003/ BLACKLIST=" barbican-tempest-plugin cyborg-tempest-plugin @@ -81,11 +81,11 @@ vitrage-tempest-plugin function clone_project() { if [ -e /usr/zuul-env/bin/zuul-cloner ]; then /usr/zuul-env/bin/zuul-cloner --cache-dir /opt/git \ - https://git.openstack.org \ + https://opendev.org \ openstack/"$1" elif [ -e /usr/bin/git ]; then - /usr/bin/git clone https://git.openstack.org/openstack/"$1" \ + /usr/bin/git clone https://opendev.org/openstack/"$1" \ openstack/"$1" fi diff --git a/tox.ini b/tox.ini index 9bee3dd5d3..48a2baad36 100644 --- a/tox.ini +++ b/tox.ini @@ -9,7 +9,7 @@ setenv = VIRTUAL_ENV={envdir} OS_TEST_PATH=./tempest/test_discover deps = - -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} + -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} -r{toxinidir}/requirements.txt [testenv] @@ -25,7 +25,7 @@ usedevelop = True install_command = pip install {opts} {packages} whitelist_externals = * deps = - -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} + -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt commands = @@ -173,7 +173,7 @@ commands = [testenv:venv] deps = - -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} + -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} -r{toxinidir}/requirements.txt -r{toxinidir}/doc/requirements.txt commands = {posargs} @@ -188,7 +188,7 @@ commands = {posargs} [testenv:docs] basepython = python3 deps = - -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} + -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} -r{toxinidir}/requirements.txt -r{toxinidir}/doc/requirements.txt commands = @@ -221,7 +221,7 @@ local-check-factory = tempest.hacking.checks.factory import_exceptions = tempest.services [flake8] -# E125 is a won't fix until https://github.com/jcrocholl/pep8/issues/126 is resolved. For further detail see https://review.openstack.org/#/c/36788/ +# E125 is a won't fix until https://github.com/jcrocholl/pep8/issues/126 is resolved. For further detail see https://review.opendev.org/#/c/36788/ # E123 skipped because it is ignored by default in the default pep8 # E129 skipped because it is too limiting when combined with other rules # W504 skipped because it is overeager and unnecessary @@ -234,7 +234,7 @@ import-order-style = pep8 [testenv:releasenotes] basepython = python3 deps = - -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} + -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} -r{toxinidir}/requirements.txt -r{toxinidir}/doc/requirements.txt commands =