From a280696a03a824bc2409b9e5b393e01daf94e84d Mon Sep 17 00:00:00 2001 From: ZhongShengping Date: Mon, 22 Apr 2019 11:48:26 +0800 Subject: [PATCH] Replace git.openstack.org URLs with opendev.org URLs Thorough replacement of git.openstack.org URLs with their opendev.org counterparts. Change-Id: Ic19e45986e9f650c1deb297f463e679fd268ad97 --- README.rst | 2 +- devstack/common_settings | 2 +- devstack/upgrade/settings | 2 +- doc/source/admin/drivers.rst | 2 +- doc/source/admin/drivers/ansible.rst | 4 ++-- doc/source/admin/drivers/redfish.rst | 2 +- doc/source/admin/multitenancy.rst | 6 +++--- doc/source/admin/upgrade-guide.rst | 2 +- .../contributor/code-contribution-guide.rst | 14 ++++++------- doc/source/contributor/dev-quickstart.rst | 20 +++++++++---------- .../contributor/ironic-boot-from-volume.rst | 2 +- .../ironic-multitenant-networking.rst | 4 ++-- doc/source/contributor/osprofiler-support.rst | 6 +++--- doc/source/contributor/releasing.rst | 10 +++++----- doc/source/contributor/rolling-upgrades.rst | 8 ++++---- doc/source/install/conf.py | 2 +- doc/source/install/deploy-ramdisk.rst | 2 +- doc/source/install/enabling-drivers.rst | 2 +- .../include/configure-ironic-api-mod_wsgi.inc | 2 +- .../include/kernel-boot-parameters.inc | 2 +- .../common/glance_service/v2/image_service.py | 6 +++--- ironic/common/release_mappings.py | 2 +- ironic/conductor/manager.py | 2 +- ironic/tests/unit/api/utils.py | 2 +- ironic/tests/unit/db/utils.py | 2 +- tox.ini | 10 +++++----- 26 files changed, 60 insertions(+), 60 deletions(-) diff --git a/README.rst b/README.rst index 365a6aea5f..1caee25bf0 100644 --- a/README.rst +++ b/README.rst @@ -25,7 +25,7 @@ Project resources ~~~~~~~~~~~~~~~~~ * Documentation: https://docs.openstack.org/ironic/latest -* Source: https://git.openstack.org/cgit/openstack/ironic +* Source: https://opendev.org/openstack/ironic * Bugs: https://storyboard.openstack.org/#!/project/943 * Wiki: https://wiki.openstack.org/wiki/Ironic * APIs: https://developer.openstack.org/api-ref/baremetal/index.html diff --git a/devstack/common_settings b/devstack/common_settings index 86eaed92c3..0a5fe23877 100644 --- a/devstack/common_settings +++ b/devstack/common_settings @@ -21,7 +21,7 @@ fi IRONIC_IMAGE_NAME=${DEFAULT_IMAGE_NAME:-$IRONIC_DEFAULT_IMAGE_NAME} # Add link to download queue, ignore if already exist. -# TODO(vsaienko) Move to devstack https://review.openstack.org/420656 +# TODO(vsaienko) Move to devstack https://review.opendev.org/420656 function add_image_link { local i_link="$1" if ! [[ "$IMAGE_URLS" =~ "$i_link" ]]; then diff --git a/devstack/upgrade/settings b/devstack/upgrade/settings index b0478826bf..f08d6ca445 100644 --- a/devstack/upgrade/settings +++ b/devstack/upgrade/settings @@ -3,7 +3,7 @@ # That means that in the project openstack-infra/project-config we will need to # update the Ironic grenade job(s) in jenkins/jobs/devstack-gate.yaml with # this: -# export GRENADE_PLUGINRC="enable_grenade_plugin ironic https://git.openstack.org/openstack/ironic" +# export GRENADE_PLUGINRC="enable_grenade_plugin ironic https://opendev.org/openstack/ironic" # If openstack-infra/project-config is not updated then the Grenade tests will # never get run for Ironic diff --git a/doc/source/admin/drivers.rst b/doc/source/admin/drivers.rst index 91c92026e3..9f4563101c 100644 --- a/doc/source/admin/drivers.rst +++ b/doc/source/admin/drivers.rst @@ -123,4 +123,4 @@ achieved either with VirtualBMC_ or using libvirt drivers from ironic-staging-drivers_. .. _ironic-staging-drivers: http://ironic-staging-drivers.readthedocs.io -.. _VirtualBMC: https://git.openstack.org/cgit/openstack/virtualbmc +.. _VirtualBMC: https://opendev.org/openstack/virtualbmc diff --git a/doc/source/admin/drivers/ansible.rst b/doc/source/admin/drivers/ansible.rst index 147b009b0e..9ecca79796 100644 --- a/doc/source/admin/drivers/ansible.rst +++ b/doc/source/admin/drivers/ansible.rst @@ -461,5 +461,5 @@ You can use these modules in your playbooks as well. .. _Ansible: https://docs.ansible.com/ansible/latest/index.html .. _Ironic Python Agent: https://docs.openstack.org/ironic-python-agent/latest/ -.. _ironic-staging-drivers: https://git.openstack.org/cgit/openstack/ironic-staging-drivers/tree/imagebuild?h=stable/pike -.. _ironic-python-agent-builder: https://git.openstack.org/cgit/openstack/ironic-python-agent-builder +.. _ironic-staging-drivers: https://opendev.org/x/ironic-staging-drivers/src/branch/stable/pike/imagebuild +.. _ironic-python-agent-builder: https://opendev.org/openstack/ironic-python-agent-builder diff --git a/doc/source/admin/drivers/redfish.rst b/doc/source/admin/drivers/redfish.rst index e1d72bc2e5..832f3c5204 100644 --- a/doc/source/admin/drivers/redfish.rst +++ b/doc/source/admin/drivers/redfish.rst @@ -135,5 +135,5 @@ into the introspection ramdisk. support the required schema. In this case the property will be set to 0. .. _Redfish: http://redfish.dmtf.org/ -.. _Sushy: https://git.openstack.org/cgit/openstack/sushy +.. _Sushy: https://opendev.org/openstack/sushy .. _TLS: https://en.wikipedia.org/wiki/Transport_Layer_Security diff --git a/doc/source/admin/multitenancy.rst b/doc/source/admin/multitenancy.rst index ee6888923c..f3fa994bf5 100644 --- a/doc/source/admin/multitenancy.rst +++ b/doc/source/admin/multitenancy.rst @@ -209,7 +209,7 @@ switches you have in your environment. In order for Networking service ports to correctly operate with the Bare Metal service ``flat`` network interface the ``baremetal`` ML2 mechanism driver from `networking-baremetal -`_ needs to be +`_ needs to be loaded into the Networking service configuration. This driver understands that the switch should be already configured by the admin, and will mark the networking service ports as successfully bound as nothing else needs to be @@ -248,10 +248,10 @@ Cisco Nexus 9000 series FUJITSU CFX2000 ``networking-fujitsu`` ML2 driver supports this switch. The documentation is available `here - `_. + `_. Networking Generic Switch This is an ML2 mechanism driver built for testing against virtual bare metal environments and some switches that are not covered by hardware specific ML2 mechanism drivers. More information is available in the project's `README - `_. + `_. diff --git a/doc/source/admin/upgrade-guide.rst b/doc/source/admin/upgrade-guide.rst index 42f2b2718d..8e7e0b58ec 100644 --- a/doc/source/admin/upgrade-guide.rst +++ b/doc/source/admin/upgrade-guide.rst @@ -392,7 +392,7 @@ The discoverd to inspector upgrade procedure is as follows: * Update the **ironic-inspector** configuration file to stop using deprecated configuration options, as marked by the comments in the `example.conf - `_. + `_. It is recommended you move the configuration file to ``/etc/ironic-inspector/inspector.conf``. diff --git a/doc/source/contributor/code-contribution-guide.rst b/doc/source/contributor/code-contribution-guide.rst index afa71a15c3..51825ebd09 100644 --- a/doc/source/contributor/code-contribution-guide.rst +++ b/doc/source/contributor/code-contribution-guide.rst @@ -68,10 +68,10 @@ Wiki https://wiki.openstack.org/Ironic Code Hosting - https://git.openstack.org/cgit/openstack/ironic + https://opendev.org/openstack/ironic Code Review - https://review.openstack.org/#/q/status:open+project:openstack/ironic,n,z + https://review.opendev.org/#/q/status:open+project:openstack/ironic,n,z Adding New Features =================== @@ -80,7 +80,7 @@ Ironic tracks new features using RFEs (Requests for Feature Enhancements) instead of blueprints. These are stories with 'rfe' tag, and they should be submitted before a spec or code is proposed. -When a member of the `ironic-core team `_ +When a member of the `ironic-core team `_ decides that the proposal is worth implementing, a spec (if needed) and code should be submitted, referencing the RFE task or story ID number. Contributors are welcome to submit a spec and/or code before the RFE is approved, however @@ -263,8 +263,8 @@ Ironic Specs Process ==================== Specifications must follow the template which can be found at -`specs/template.rst `_, which is quite self-documenting. Specifications are +`specs/template.rst `_, which is quite self-documenting. Specifications are proposed by adding them to the `specs/approved` directory, adding a soft link to it from the `specs/not-implemented` directory, and posting it for review to Gerrit. For more information, please see the `README `_. The same `Gerrit process `_ as with source code, -using the repository `ironic-specs `_, is used to add new specifications. All approved specifications are available at: @@ -286,7 +286,7 @@ You are welcome to submit patches associated with an RFE, but they will have a -2 ("do not merge") until the specification has been approved. This is to ensure that the patches don't get accidentally merged beforehand. You will still be able to get reviewer feedback and push new patch sets, even with a -2. -The `list of core reviewers `_ for the specifications is small but mighty. (This is not necessarily the same list of core reviewers for code patches.) diff --git a/doc/source/contributor/dev-quickstart.rst b/doc/source/contributor/dev-quickstart.rst index d8285b7879..6f75740c71 100644 --- a/doc/source/contributor/dev-quickstart.rst +++ b/doc/source/contributor/dev-quickstart.rst @@ -90,7 +90,7 @@ If you haven't already, Ironic source code should be pulled directly from git:: # from your home or source directory cd ~ - git clone https://git.openstack.org/openstack/ironic + git clone https://opendev.org/openstack/ironic cd ironic Running Unit and Style Tests @@ -177,7 +177,7 @@ Step 1: Create a Python virtualenv #. If you haven't already downloaded the source code, do that first:: cd ~ - git clone https://git.openstack.org/openstack/ironic + git clone https://opendev.org/openstack/ironic cd ironic #. Create the Python virtualenv:: @@ -438,13 +438,13 @@ up to date and has the latest packages installed before beginning this process. Devstack will no longer create the user 'stack' with the desired permissions, but does provide a script to perform the task:: - git clone https://git.openstack.org/openstack-dev/devstack.git devstack + git clone https://opendev.org/openstack/devstack.git devstack sudo ./devstack/tools/create-stack-user.sh Switch to the stack user and clone DevStack:: sudo su - stack - git clone https://git.openstack.org/openstack-dev/devstack.git devstack + git clone https://opendev.org/openstack/devstack.git devstack Create devstack/local.conf with minimal settings required to enable Ironic. An example local.conf that enables both ``direct`` and ``iscsi`` @@ -464,7 +464,7 @@ hardware type by default:: SWIFT_TEMPURL_KEY=password # Enable Ironic plugin - enable_plugin ironic https://git.openstack.org/openstack/ironic + enable_plugin ironic https://opendev.org/openstack/ironic # Disable nova novnc service, ironic does not support it anyway. disable_service n-novnc @@ -534,12 +534,12 @@ hardware type by default:: Git protocol requires access to port 9418, which is not a standard port that corporate firewalls always allow. If you are behind a firewall or on a proxy that blocks Git protocol, modify the ``enable_plugin`` line to use ``https://`` instead - of ``git://`` and add ``GIT_BASE=https://git.openstack.org`` to the credentials:: + of ``git://`` and add ``GIT_BASE=https://opendev.org`` to the credentials:: - GIT_BASE=https://git.openstack.org + GIT_BASE=https://opendev.org # Enable Ironic plugin - enable_plugin ironic https://git.openstack.org/openstack/ironic + enable_plugin ironic https://opendev.org/openstack/ironic .. note:: When the ``ipmi`` hardware type is used and IRONIC_IS_HARDWARE variable is @@ -560,7 +560,7 @@ hardware type by default:: .. note:: To check out an in-progress patch for testing, you can add a Git ref to the ``enable_plugin`` line. For instance:: - enable_plugin ironic https://git.openstack.org/openstack/ironic refs/changes/46/295946/15 + enable_plugin ironic https://opendev.org/openstack/ironic refs/changes/46/295946/15 For a patch in review, you can find the ref to use by clicking the "Download" button in Gerrit. You can also specify a different git repo, or @@ -680,7 +680,7 @@ First, navigate to Tempest directory:: cd /opt/stack/tempest To run all tests from the `Ironic plugin -`_, +`_, execute the following command:: tox -e all -- ironic diff --git a/doc/source/contributor/ironic-boot-from-volume.rst b/doc/source/contributor/ironic-boot-from-volume.rst index 72991737d8..2a3d3da539 100644 --- a/doc/source/contributor/ironic-boot-from-volume.rst +++ b/doc/source/contributor/ironic-boot-from-volume.rst @@ -20,7 +20,7 @@ description for DevStack is at :ref:`deploy_devstack`. [[local|localrc]] - enable_plugin ironic https://git.openstack.org/openstack/ironic + enable_plugin ironic https://opendev.org/openstack/ironic IRONIC_STORAGE_INTERFACE=cinder diff --git a/doc/source/contributor/ironic-multitenant-networking.rst b/doc/source/contributor/ironic-multitenant-networking.rst index 8361c710c5..da7225bcfb 100644 --- a/doc/source/contributor/ironic-multitenant-networking.rst +++ b/doc/source/contributor/ironic-multitenant-networking.rst @@ -25,10 +25,10 @@ configured in Neutron. [[local|localrc]] # Configure ironic from ironic devstack plugin. - enable_plugin ironic https://git.openstack.org/openstack/ironic + enable_plugin ironic https://opendev.org/openstack/ironic # Install networking-generic-switch Neutron ML2 driver that interacts with OVS - enable_plugin networking-generic-switch https://git.openstack.org/openstack/networking-generic-switch + enable_plugin networking-generic-switch https://opendev.org/openstack/networking-generic-switch # Add link local info when registering Ironic node IRONIC_USE_LINK_LOCAL=True diff --git a/doc/source/contributor/osprofiler-support.rst b/doc/source/contributor/osprofiler-support.rst index 0b7511748b..eb77bae9bc 100644 --- a/doc/source/contributor/osprofiler-support.rst +++ b/doc/source/contributor/osprofiler-support.rst @@ -50,9 +50,9 @@ with OSProfiler and ceilometer. In addition to the setup described at Add the following to ``localrc`` to enable OSProfiler and ceilometer:: - enable_plugin panko https://git.openstack.org/openstack/panko - enable_plugin ceilometer https://git.openstack.org/openstack/ceilometer - enable_plugin osprofiler https://git.openstack.org/openstack/osprofiler + enable_plugin panko https://opendev.org/openstack/panko + enable_plugin ceilometer https://opendev.org/openstack/ceilometer + enable_plugin osprofiler https://opendev.org/openstack/osprofiler # Enable the following services CEILOMETER_NOTIFICATION_TOPICS=notifications,profiler diff --git a/doc/source/contributor/releasing.rst b/doc/source/contributor/releasing.rst index 187a81468a..9d73f59154 100644 --- a/doc/source/contributor/releasing.rst +++ b/doc/source/contributor/releasing.rst @@ -90,7 +90,7 @@ We need to submit patches for changes in the stable branch to: * update the ironic devstack plugin to point at the branched tarball for IPA. An example of this patch is - `here `_. + `here `_. * update links in the documentation (``ironic/doc/source/``) to point to the branched versions of any openstack projects' (that branch) documents. As of Pike release, the only outlier is @@ -98,20 +98,20 @@ We need to submit patches for changes in the stable branch to: * set appropriate defaults for ``TEMPEST_BAREMETAL_MIN_MICROVERSION`` and ``TEMPEST_BAREMETAL_MAX_MICROVERSION`` in ``devstack/lib/ironic`` to make sure that unsupported API tempest tests are skipped on stable branches. E.g. - `patch 495319 `_. + `patch 495319 `_. We need to submit patches for changes on master to: * create an empty commit with a ``Sem-Ver`` tag to bump the generated minor version. See `example - `_ + `_ and `pbr documentation `_ for details. * to support rolling upgrades, since the release was a named release, we need to make these changes. Note that we need to wait until *after* the switch in grenade is made to test the latest release (N) with master - (e.g. `for stable/queens `_). + (e.g. `for stable/queens `_). Doing these changes sooner -- after the ironic release and before the switch when grenade is testing the prior release (N-1) with master, will cause the tests to fail. (You may want to ask/remind infra/qa team, as to @@ -131,7 +131,7 @@ We need to submit patches for changes on master to: As **ironic-tempest-plugin** is branchless, we need to submit a patch adding stable jobs to its master branch. `Example for Queens -`_. +`_. For all releases ---------------- diff --git a/doc/source/contributor/rolling-upgrades.rst b/doc/source/contributor/rolling-upgrades.rst index 663b78cb05..a331fb6230 100644 --- a/doc/source/contributor/rolling-upgrades.rst +++ b/doc/source/contributor/rolling-upgrades.rst @@ -134,7 +134,7 @@ will use the latest versions of API, RPC and IronicObjects. Its possible values are releases, named (e.g. ``ocata``) or sem-versioned (e.g. ``7.0``). Internally, in `common/release_mappings.py -`_, +`_, ironic maintains a mapping that indicates the API, RPC and IronicObject versions associated with each release. This mapping is maintained manually. @@ -158,7 +158,7 @@ Handling RPC versions --------------------- `ConductorAPI.__init__() -`_ +`_ sets the ``version_cap`` variable to the desired (latest or pinned) RPC API version and passes it to the ``RPCClient`` as an initialization parameter. This variable is then used to determine the maximum requested message version that @@ -381,12 +381,12 @@ following needs to be considered: - Field types cannot be changed. Instead, create a new field and deprecate the old one. - There is a `unit test - `_ + `_ that generates the hash of an object using its fields and the signatures of its remotable methods. Objects that have a version bump need to be updated in the `expected_object_fingerprints - `_ + `_ dictionary; otherwise this test will fail. A failed test can also indicate to the developer that their change(s) to an object require a version bump. - When new version objects communicate with old version objects and when diff --git a/doc/source/install/conf.py b/doc/source/install/conf.py index 1ea0708b51..c9a1af263c 100644 --- a/doc/source/install/conf.py +++ b/doc/source/install/conf.py @@ -74,7 +74,7 @@ release = '0.1' # 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'https://git.openstack.org/cgit/openstack/ironic/tree/install-guide/source' # noqa +giturl = u'https://opendev.org/openstack/ironic/src/branch/master/doc/source/' # noqa 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/deploy-ramdisk.rst b/doc/source/install/deploy-ramdisk.rst index 405984cfb1..a640dd87a8 100644 --- a/doc/source/install/deploy-ramdisk.rst +++ b/doc/source/install/deploy-ramdisk.rst @@ -27,7 +27,7 @@ CoreOS tools #. Clone the ironic-python-agent_ project:: - git clone https://git.openstack.org/openstack/ironic-python-agent + git clone https://opendev.org/openstack/ironic-python-agent #. Install the requirements: diff --git a/doc/source/install/enabling-drivers.rst b/doc/source/install/enabling-drivers.rst index 1f5ab2d90e..cbf1b477d3 100644 --- a/doc/source/install/enabling-drivers.rst +++ b/doc/source/install/enabling-drivers.rst @@ -291,5 +291,5 @@ existing nodes. support the provided default implementation, its users will have to always provide an explicit value for this interface when creating a node. -.. _setup.cfg: https://git.openstack.org/cgit/openstack/ironic/tree/setup.cfg +.. _setup.cfg: https://opendev.org/openstack/ironic/src/branch/master/setup.cfg .. _ironic-inspector: https://docs.openstack.org/ironic-inspector/latest/ diff --git a/doc/source/install/include/configure-ironic-api-mod_wsgi.inc b/doc/source/install/include/configure-ironic-api-mod_wsgi.inc index 3848e32d61..bbfa79be73 100644 --- a/doc/source/install/include/configure-ironic-api-mod_wsgi.inc +++ b/doc/source/install/include/configure-ironic-api-mod_wsgi.inc @@ -24,7 +24,7 @@ Bare Metal service comes with an example file for configuring the #. Download the ``etc/apache2/ironic`` file from the - `Ironic project tree `_ + `Ironic project tree `_ and copy it to the apache sites: Fedora/RHEL7/CentOS7:: diff --git a/doc/source/install/include/kernel-boot-parameters.inc b/doc/source/install/include/kernel-boot-parameters.inc index 1d00b0162b..c8d684292d 100644 --- a/doc/source/install/include/kernel-boot-parameters.inc +++ b/doc/source/install/include/kernel-boot-parameters.inc @@ -21,7 +21,7 @@ booted instances by: * Copying a template from shipped templates to another place, for example:: - https://git.openstack.org/cgit/openstack/ironic/tree/ironic/drivers/modules/pxe_config.template + https://opendev.org/openstack/ironic/src/branch/master/ironic/drivers/modules/pxe_config.template Making the modifications and pointing to the custom template via the configuration options: ``[pxe]/pxe_config_template`` and ``[pxe]/uefi_pxe_config_template``. diff --git a/ironic/common/glance_service/v2/image_service.py b/ironic/common/glance_service/v2/image_service.py index db4e346657..8cd7fe99af 100644 --- a/ironic/common/glance_service/v2/image_service.py +++ b/ironic/common/glance_service/v2/image_service.py @@ -198,9 +198,9 @@ class GlanceImageService(base_image_service.BaseImageService): def _get_swift_container(self, image_id): """Get the Swift container the image is stored in. - Code based on: http://git.openstack.org/cgit/openstack/glance_store/ - tree/glance_store/_drivers/swift/ - store.py?id=3cd690b37dc9d935445aca0998e8aec34a3e3530#n725 + Code based on: https://opendev.org/openstack/glance_store/src/commit/ + 3cd690b37dc9d935445aca0998e8aec34a3e3530/glance_store/_drivers/swift/ + store.py#L725 Returns appropriate container name depending upon value of ``swift_store_multiple_containers_seed``. In single-container mode, diff --git a/ironic/common/release_mappings.py b/ironic/common/release_mappings.py index 61636574e1..d6e16a19c1 100644 --- a/ironic/common/release_mappings.py +++ b/ironic/common/release_mappings.py @@ -47,7 +47,7 @@ from ironic.common.i18n import _ # NOTE(rloo): We need a list, not just the latest version, for the DB queries # that filter for objects that are not in particular versions; for more info, # see comments after L1128 of -# https://review.openstack.org/#/c/408556/52/ironic/db/sqlalchemy/api.py. +# https://review.opendev.org/#/c/408556/52/ironic/db/sqlalchemy/api.py. # # There should always be a 'master' entry that reflects the objects in the # master branch. diff --git a/ironic/conductor/manager.py b/ironic/conductor/manager.py index ddb0a6a3ec..8dd59caece 100644 --- a/ironic/conductor/manager.py +++ b/ironic/conductor/manager.py @@ -33,7 +33,7 @@ node; these locks are represented by the :py:class:`ironic.conductor.task_manager.TaskManager` class. A `tooz.hashring.HashRing -`_ +`_ is used to distribute nodes across the set of active conductors which support each node's driver. Rebalancing this ring can trigger various actions by each conductor, such as building or tearing down the TFTP environment for a node, diff --git a/ironic/tests/unit/api/utils.py b/ironic/tests/unit/api/utils.py index 802e6c45cd..7addd2e8d0 100644 --- a/ironic/tests/unit/api/utils.py +++ b/ironic/tests/unit/api/utils.py @@ -66,7 +66,7 @@ class FakeMemcache(object): # NOTE(lucasagomes): keystonemiddleware >= 2.0.0 the token cache # keys are sha256 hashes of the token key. This was introduced in - # https://review.openstack.org/#/c/186971 + # https://review.opendev.org/#/c/186971 _cache = { 'tokens/%s' % ADMIN_TOKEN: ADMIN_BODY, 'tokens/%s' % ADMIN_TOKEN_HASH: ADMIN_BODY, diff --git a/ironic/tests/unit/db/utils.py b/ironic/tests/unit/db/utils.py index 4c7354ef28..ae21b69bc5 100644 --- a/ironic/tests/unit/db/utils.py +++ b/ironic/tests/unit/db/utils.py @@ -481,7 +481,7 @@ def create_test_portgroup(**kw): def get_test_node_tag(**kw): return { # TODO(rloo): Replace None below with the object NodeTag VERSION, - # after this lands: https://review.openstack.org/#/c/233357 + # after this lands: https://review.opendev.org/#/c/233357 'version': kw.get('version', None), "tag": kw.get("tag", "tag1"), "node_id": kw.get("node_id", "123"), diff --git a/tox.ini b/tox.ini index 1286e5bde0..7b0ae57609 100644 --- a/tox.ini +++ b/tox.ini @@ -13,7 +13,7 @@ setenv = VIRTUAL_ENV={envdir} PYTHONWARNINGS=default::DeprecationWarning TESTS_DIR=./ironic/tests/unit/ deps = - -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} -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt commands = @@ -82,7 +82,7 @@ commands = oslo_debug_helper -t ironic/tests/unit {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://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt} -r{toxinidir}/requirements.txt -r{toxinidir}/doc/requirements.txt commands = sphinx-build -b html -W doc/source doc/build/html @@ -90,7 +90,7 @@ commands = sphinx-build -b html -W doc/source doc/build/html [testenv:api-ref] 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://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt} -r{toxinidir}/requirements.txt -r{toxinidir}/doc/requirements.txt whitelist_externals = bash @@ -101,7 +101,7 @@ commands = [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://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt} -r{toxinidir}/requirements.txt -r{toxinidir}/doc/requirements.txt commands = @@ -111,7 +111,7 @@ commands = basepython = python3 setenv = PYTHONHASHSEED=0 deps = - -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} -r{toxinidir}/test-requirements.txt -r{toxinidir}/doc/requirements.txt commands = {posargs}