From 6a5afea40a3fecc7d405ac6bd296c5d3aba33a8b Mon Sep 17 00:00:00 2001 From: ZhongShengping Date: Mon, 22 Apr 2019 14:40:30 +0800 Subject: [PATCH] Move to opendev 1.Use opendev.org instead of git.openstack.org. 2.Use review.opendev.org instead of review.openstack.org. Change-Id: I8e9da8fbb04bdec42a0b2f012f6a38b8ee413b27 --- CONTRIBUTING.rst | 2 +- README.rst | 10 +++++----- api-ref/source/conf.py | 5 +++-- devstack/README.rst | 6 +++--- doc/source/index.rst | 4 ++-- doc/source/install/conf.py | 4 ++-- doc/source/install/manual_install.rst | 4 ++-- doc/votes/channel_logging | 2 +- integration/scripts/files/trove-guest.upstart.conf | 2 +- integration/scripts/trovestack | 2 +- tox.ini | 6 +++--- 11 files changed, 24 insertions(+), 23 deletions(-) diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 50364324fd..b70fa172a7 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -89,7 +89,7 @@ Other references: - https://wiki.openstack.org/wiki/ReviewChecklist - https://wiki.openstack.org/wiki/GitCommitMessages - https://docs.openstack.org/hacking/latest/ - - https://review.openstack.org/#/c/116176/ + - https://review.opendev.org/#/c/116176/ - trove-pylint readme file in tools/trove-pylint.README Code Review Priority diff --git a/README.rst b/README.rst index 679a754534..57a9e7afa9 100644 --- a/README.rst +++ b/README.rst @@ -12,13 +12,13 @@ Getting Started If you'd like to run from the master branch, you can clone the git repo: - git clone https://git.openstack.org/cgit/openstack/trove + git clone https://opendev.org/openstack/trove For information on how to contribute to trove, please see CONTRIBUTING.rst_ and HACKING.rst_ -.. _CONTRIBUTING.rst: https://git.openstack.org/cgit/openstack/trove/plain/CONTRIBUTING.rst -.. _HACKING.rst: https://git.openstack.org/cgit/openstack/trove/plain/HACKING.rst +.. _CONTRIBUTING.rst: https://opendev.org/openstack/trove/plain/CONTRIBUTING.rst +.. _HACKING.rst: https://opendev.org/openstack/trove/plain/HACKING.rst * `Wiki `_ * `Developer Docs `_ @@ -36,13 +36,13 @@ Python client ------------- Python-troveclient_ is a client for Trove. -.. _Python-troveclient: https://git.openstack.org/cgit/openstack/python-troveclient +.. _Python-troveclient: https://opendev.org/openstack/python-troveclient Dashboard plugin ---------------- Trove-dashboard_ is OpenStack dashbaord plugin for Trove. -.. _Trove-dashboard: https://git.openstack.org/cgit/openstack/trove-dashboard +.. _Trove-dashboard: https://opendev.org/openstack/trove-dashboard References ---------- diff --git a/api-ref/source/conf.py b/api-ref/source/conf.py index 52e655ca42..8c109bb960 100755 --- a/api-ref/source/conf.py +++ b/api-ref/source/conf.py @@ -78,7 +78,8 @@ release = version_info.release_string() version = version_info.version_string() # Config logABug feature -giturl = u'http://git.openstack.org/cgit/openstack/trove/tree/api-ref/source' +giturl = ( + u'https://opendev.org/openstack/trove/src/branch/master/api-ref/source') # source tree # html_context allows us to pass arbitrary values into the html template html_context = {"bug_tag": "api-ref", @@ -117,7 +118,7 @@ pygments_style = 'sphinx' # Config logABug feature # source tree giturl = ( - u'http://git.openstack.org/cgit/openstack/trove/tree/api-ref/source') + u'https://opendev.org/openstack/trove/src/branch/master/api-ref/source') # html_context allows us to pass arbitrary values into the html template html_context = {'bug_tag': 'api-ref', 'giturl': giturl, diff --git a/devstack/README.rst b/devstack/README.rst index c044227d1d..34b16672fc 100644 --- a/devstack/README.rst +++ b/devstack/README.rst @@ -17,7 +17,7 @@ Download DevStack .. sourcecode:: bash export DEVSTACK_DIR=~/devstack - git clone https://git.openstack.org/openstack-dev/devstack.git $DEVSTACK_DIR + git clone https://opendev.org/openstack/devstack.git $DEVSTACK_DIR Enable the Trove plugin ======================= @@ -28,14 +28,14 @@ Enable the plugin by adding the following section to .. sourcecode:: bash [[local|localrc]] - enable_plugin trove https://git.openstack.org/openstack/trove + enable_plugin trove https://opendev.org/openstack/trove Optionally, a git refspec (branch or tag or commit) may be provided as follows: .. sourcecode:: bash [[local|localrc]] - enable_plugin trove https://git.openstack.org/openstack/trove + enable_plugin trove https://opendev.org/openstack/trove Run the DevStack utility ======================== diff --git a/doc/source/index.rst b/doc/source/index.rst index 22bca29f62..b053333b60 100644 --- a/doc/source/index.rst +++ b/doc/source/index.rst @@ -57,8 +57,8 @@ Search Trove Documentation .. _Trove Wiki: https://wiki.openstack.org/wiki/Trove -.. _Trove: https://git.openstack.org/cgit/openstack/trove -.. _Trove Client: https://git.openstack.org/cgit/openstack/python-troveclient +.. _Trove: https://opendev.org/openstack/trove +.. _Trove Client: https://opendev.org/openstack/python-troveclient .. _Trove API Documentation: https://developer.openstack.org/api-ref/database/ .. _Trove Blueprints: https://blueprints.launchpad.net/trove .. _Trove Bugs: https://bugs.launchpad.net/trove diff --git a/doc/source/install/conf.py b/doc/source/install/conf.py index 52ebe792a0..eaa2f43c17 100644 --- a/doc/source/install/conf.py +++ b/doc/source/install/conf.py @@ -72,8 +72,8 @@ release = trove_version.version_string_with_vcs() # extracted from git log. # bug_tag: Tag for categorizing the bug. Must be set manually. # These variables are passed to the logabug code via html_context. -giturl = (u'http://git.openstack.org/cgit/openstack/trove/tree/' - 'install-guide/source') +giturl = (u'https://opendev.org/openstack/trove/src/branch/master/doc/source/' + 'install') git_cmd = "/usr/bin/git log | head -n1 | cut -f2 -d' '" gitsha = os.popen(git_cmd).read().strip('\n') html_context = {"gitsha": gitsha, "bug_tag": bug_tag, diff --git a/doc/source/install/manual_install.rst b/doc/source/install/manual_install.rst index 1f6cf01d21..a43f14aa11 100644 --- a/doc/source/install/manual_install.rst +++ b/doc/source/install/manual_install.rst @@ -130,8 +130,8 @@ Obtain the Trove source components from OpenStack repositories: .. code-block:: bash $ cd ~ - $ git clone https://git.openstack.org/openstack/trove.git - $ git clone https://git.openstack.org/openstack/python-troveclient.git + $ git clone https://opendev.org/openstack/trove.git + $ git clone https://opendev.org/openstack/python-troveclient.git Install Trove diff --git a/doc/votes/channel_logging b/doc/votes/channel_logging index eba8c4e2e6..3eaff3b4a9 100644 --- a/doc/votes/channel_logging +++ b/doc/votes/channel_logging @@ -7,6 +7,6 @@ to travel 4 wednesdays in a row for work... ####################### -https://review.openstack.org/#/c/47900/ +https://review.opendev.org/#/c/47900/ Vote results: 13 votes. 13 for, 0 against. \ No newline at end of file diff --git a/integration/scripts/files/trove-guest.upstart.conf b/integration/scripts/files/trove-guest.upstart.conf index f6a3dba24a..b00ad5e2c9 100644 --- a/integration/scripts/files/trove-guest.upstart.conf +++ b/integration/scripts/files/trove-guest.upstart.conf @@ -25,7 +25,7 @@ pre-start script end script script - # For backwards compatibility until https://review.openstack.org/#/c/100381 merges + # For backwards compatibility until https://review.opendev.org/#/c/100381 merges TROVE_CONFIG="--config-dir=/etc/trove/conf.d" if [ ! -f /etc/trove/conf.d/guest_info ] && [ ! -f /etc/trove/conf.d/trove-guestagent.conf ]; then diff --git a/integration/scripts/trovestack b/integration/scripts/trovestack index 795d505bdd..09c0f175dc 100755 --- a/integration/scripts/trovestack +++ b/integration/scripts/trovestack @@ -323,7 +323,7 @@ function run_review_for() { do # This should be the ref spec for what we pull pushd $PATH_ARG - git_timed pull https://review.openstack.org/p/openstack/$GIT_NAME refs/changes/$review + git_timed pull https://review.opendev.org/p/openstack/$GIT_NAME refs/changes/$review popd done } diff --git a/tox.ini b/tox.ini index 1ced348d8f..71ed31f0fc 100644 --- a/tox.ini +++ b/tox.ini @@ -13,7 +13,7 @@ setenv = VIRTUAL_ENV={envdir} usedevelop = True install_command = pip install \ -c{env:TEST_UPPER_CONSTRAINTS_FILE:{toxinidir}/test-upper-constraints.txt} \ - -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} \ + -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt} \ -U {opts} {packages} deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt @@ -132,5 +132,5 @@ passenv = * commands = pip install --no-binary :all: {toxinidir} \ -c/opt/stack/trove/test-upper-constraints.txt \ - -chttps://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt - ./trovestack {posargs} \ No newline at end of file + -chttps://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt + ./trovestack {posargs}