openstack
/
tempest
Code Issues Proposed changes

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
This commit is contained in:
caoyuan 2019-04-23 19:40:06 +08:00 committed by jacky06
parent 7b1b398dbc
commit 349ba75410
10 changed files with 37 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HACKING.rst
View File

@ -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 by modifying Tempest's `lib installation script`_ for previous branches
(because DevStack is branched). (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 2. Bug fix on core project needing Tempest changes
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

2
README.rst
View File

@ -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 #. You first need to install Tempest. This is done with pip after you check out
the Tempest repo:: the Tempest repo::
$ git clone https://git.openstack.org/openstack/tempest $ git clone https://opendev.org/openstack/tempest
$ pip install tempest/ $ pip install tempest/
This can be done within a venv, but the assumption for this guide is that This can be done within a venv, but the assumption for this guide is that

2
REVIEWING.rst
View File

@ -187,4 +187,4 @@ When to approve
Note that such a policy should be used judiciously, as we should strive to 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. 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/

2
doc/source/plugin.rst
View File

@ -43,7 +43,7 @@ Plugin Cookiecutter
In order to create the basic structure with base classes and test directories In order to create the basic structure with base classes and test directories
you can use the tempest-plugin-cookiecutter project:: 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'... Cloning into 'tempest-plugin-cookiecutter'...
remote: Counting objects: 17, done. remote: Counting objects: 17, done.

2
releasenotes/notes/correct-port-profile-config-option-d67f5cb31f1bc34c.yaml
View File

@ -1,7 +1,7 @@
--- ---
fixes: fixes:
- | - |
Patch https://review.openstack.org/#/c/499575/ introduced Patch https://review.opendev.org/#/c/499575/ introduced
support creating Neutron port with certain capabilities. support creating Neutron port with certain capabilities.
Currently capabilities list interpreted as string this change Currently capabilities list interpreted as string this change
fix it. fix it.

4
tempest/api/identity/v3/test_catalog.py
View File

@ -22,8 +22,8 @@ class IdentityCatalogTest(base.BaseIdentityV3Test):
@decorators.idempotent_id('56b57ced-22b8-4127-9b8a-565dfb0207e2') @decorators.idempotent_id('56b57ced-22b8-4127-9b8a-565dfb0207e2')
def test_catalog_standardization(self): def test_catalog_standardization(self):
# http://git.openstack.org/cgit/openstack/service-types-authority # https://opendev.org/openstack/service-types-authority
# /tree/service-types.yaml # /src/branch/master/service-types.yaml
standard_service_values = [{'name': 'keystone', 'type': 'identity'}, standard_service_values = [{'name': 'keystone', 'type': 'identity'},
{'name': 'nova', 'type': 'compute'}, {'name': 'nova', 'type': 'compute'},
{'name': 'glance', 'type': 'image'}, {'name': 'glance', 'type': 'image'},

9
tools/generate-tempest-plugins-list.py
View File

@ -19,9 +19,9 @@
# #
# In order to function correctly, the environment in which the # In order to function correctly, the environment in which the
# script runs must have # script runs must have
# * network access to the review.openstack.org Gerrit API # * network access to the review.opendev.org Gerrit API
# working directory # working directory
# * network access to https://git.openstack.org/cgit # * network access to https://opendev.org/openstack
import json import json
import re import re
@ -36,7 +36,7 @@ except ImportError:
from urllib2 import HTTPError from urllib2 import HTTPError
url = 'https://review.openstack.org/projects/' url = 'https://review.opendev.org/projects/'
# This is what a project looks like # This is what a project looks like
''' '''
@ -59,7 +59,8 @@ def is_in_openstack_namespace(proj):
def has_tempest_plugin(proj): def has_tempest_plugin(proj):
try: try:
r = urllib.urlopen( 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: except HTTPError as err:
if err.code == 404: if err.code == 404:
return False return False

8
tools/generate-tempest-plugins-list.sh
View File

@ -28,9 +28,9 @@
# * the environment variable git_dir pointing to the location # * the environment variable git_dir pointing to the location
# * of said git repositories # * of said git repositories
# ) OR ( # ) OR (
# * network access to the review.openstack.org Gerrit API # * network access to the review.opendev.org Gerrit API
# working directory # 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 # If a file named doc/source/data/tempest-plugins-registry.header or
@ -69,8 +69,8 @@ title_underline ${name_col_len}
i=0 i=0
for plugin in ${sorted_plugins}; do for plugin in ${sorted_plugins}; do
i=$((i+1)) i=$((i+1))
giturl="https://git.openstack.org/openstack/${plugin}" giturl="https://opendev.org/openstack/${plugin}"
gitlink="https://git.openstack.org/cgit/openstack/${plugin}" gitlink="https://opendev.org/openstack/${plugin}"
printf "%-3s %-${name_col_len}s %s\n" "$i" "${plugin}" "\`${giturl} <${gitlink}>\`__" printf "%-3s %-${name_col_len}s %s\n" "$i" "${plugin}" "\`${giturl} <${gitlink}>\`__"
done done

30
tools/tempest-plugin-sanity.sh
View File

@ -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 # List of projects having tempest plugin stale or unmaintained for a long time
# (6 months or more) # (6 months or more)
# TODO(masayukig): Some of these can be removed from BLACKLIST in the future. # 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 # cyborg-tempest-plugin: https://review.opendev.org/659687
# intel-nfv-ci-tests: https://review.openstack.org/#/c/634640/ # intel-nfv-ci-tests: https://review.opendev.org/#/c/634640/
# networking-ansible: https://review.openstack.org/#/c/634647/ # networking-ansible: https://review.opendev.org/#/c/634647/
# networking-generic-switch: https://review.openstack.org/#/c/634846/ # networking-generic-switch: https://review.opendev.org/#/c/634846/
# networking-l2gw-tempest-plugin: https://review.openstack.org/#/c/635093/ # networking-l2gw-tempest-plugin: https://review.opendev.org/#/c/635093/
# networking-midonet: https://review.openstack.org/#/c/635096/ # networking-midonet: https://review.opendev.org/#/c/635096/
# networking-plumgrid: https://review.openstack.org/#/c/635096/ # networking-plumgrid: https://review.opendev.org/#/c/635096/
# networking-spp: https://review.openstack.org/#/c/635098/ # networking-spp: https://review.opendev.org/#/c/635098/
# neutron-dynamic-routing: https://review.openstack.org/#/c/637718/ # neutron-dynamic-routing: https://review.opendev.org/#/c/637718/
# neutron-vpnaas: https://review.openstack.org/#/c/637719/ # neutron-vpnaas: https://review.opendev.org/#/c/637719/
# nova-lxd: https://review.openstack.org/#/c/638334/ # nova-lxd: https://review.opendev.org/#/c/638334/
# valet: https://review.openstack.org/#/c/638339/ # valet: https://review.opendev.org/#/c/638339/
# vitrage-tempest-plugin: https://review.openstack.org/#/c/639003/ # vitrage-tempest-plugin: https://review.opendev.org/#/c/639003/
BLACKLIST=" BLACKLIST="
barbican-tempest-plugin barbican-tempest-plugin
cyborg-tempest-plugin cyborg-tempest-plugin
@ -81,11 +81,11 @@ vitrage-tempest-plugin
function clone_project() { function clone_project() {
if [ -e /usr/zuul-env/bin/zuul-cloner ]; then if [ -e /usr/zuul-env/bin/zuul-cloner ]; then
/usr/zuul-env/bin/zuul-cloner --cache-dir /opt/git \ /usr/zuul-env/bin/zuul-cloner --cache-dir /opt/git \
https://git.openstack.org \ https://opendev.org \
openstack/"$1" openstack/"$1"
elif [ -e /usr/bin/git ]; then 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" openstack/"$1"
fi fi

12
tox.ini
View File

@ -9,7 +9,7 @@ setenv =
VIRTUAL_ENV={envdir} VIRTUAL_ENV={envdir}
OS_TEST_PATH=./tempest/test_discover OS_TEST_PATH=./tempest/test_discover
deps = 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}/requirements.txt
[testenv] [testenv]
@ -25,7 +25,7 @@ usedevelop = True
install_command = pip install {opts} {packages} install_command = pip install {opts} {packages}
whitelist_externals = * whitelist_externals = *
deps = 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}/requirements.txt
-r{toxinidir}/test-requirements.txt -r{toxinidir}/test-requirements.txt
commands = commands =
@ -173,7 +173,7 @@ commands =
[testenv:venv] [testenv:venv]
deps = 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}/requirements.txt
-r{toxinidir}/doc/requirements.txt -r{toxinidir}/doc/requirements.txt
commands = {posargs} commands = {posargs}
@ -188,7 +188,7 @@ commands = {posargs}
[testenv:docs] [testenv:docs]
basepython = python3 basepython = python3
deps = 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}/requirements.txt
-r{toxinidir}/doc/requirements.txt -r{toxinidir}/doc/requirements.txt
commands = commands =
@ -221,7 +221,7 @@ local-check-factory = tempest.hacking.checks.factory
import_exceptions = tempest.services import_exceptions = tempest.services
[flake8] [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 # E123 skipped because it is ignored by default in the default pep8
# E129 skipped because it is too limiting when combined with other rules # E129 skipped because it is too limiting when combined with other rules
# W504 skipped because it is overeager and unnecessary # W504 skipped because it is overeager and unnecessary
@ -234,7 +234,7 @@ import-order-style = pep8
[testenv:releasenotes] [testenv:releasenotes]
basepython = python3 basepython = python3
deps = 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}/requirements.txt
-r{toxinidir}/doc/requirements.txt -r{toxinidir}/doc/requirements.txt
commands = commands =