Change various URLs for the OpenDev migration

Change-Id: I3d345cfe1b3cf6134f5aad69ce639ddd21dc101f
2019-07-25 03:49:13 +02:00 · 2019-07-25 03:49:13 +02:00 · d404e3c034
commit d404e3c034
parent caa75e403e
16 changed files with 38 additions and 39 deletions
--- a/README.rst
+++ b/README.rst
@ -112,8 +112,8 @@ Further Reading
 .. _Armada Quickstart: https://airship-armada.readthedocs.io/en/latest/operations/guide-use-armada.html
 .. _kubectl: https://kubernetes.io/docs/user-guide/kubectl/kubectl_config/
 .. _Tiller: https://docs.helm.sh/using_helm/#easy-in-cluster-installation
-.. _Deckhand: https://github.com/openstack/airship-deckhand
-.. _Keystone: https://github.com/openstack/keystone
+.. _Deckhand: https://opendev.org/airship/deckhand
+.. _Keystone: https://opendev.org/openstack/keystone

 .. |Docker Repository on Quay| image:: https://quay.io/repository/airshipit/armada/status
   :target: https://quay.io/repository/airshipit/armada
--- a/armada/tests/unit/base.py
+++ b/armada/tests/unit/base.py
@ -33,7 +33,7 @@ def is_connected():
    :returns: True if connected else False.
    """
    try:
-        host = socket.gethostbyname("www.github.com")
+        host = socket.gethostbyname("opendev.org")
        socket.create_connection((host, 80), 2)
        return True
    except (socket.error, socket.herror, socket.timeout):
--- a/armada/tests/unit/handlers/test_armada.py
+++ b/armada/tests/unit/handlers/test_armada.py
@ -133,7 +133,7 @@ data:
    values: {}
    source:
      type: git
-      location: git://github.com/dummy/armada
+      location: git://opendev.org/dummy/armada.git
      subpath: chart_1
      reference: master
    dependencies: []
@ -145,7 +145,7 @@ data:
      enabled: true
 """

-CHART_SOURCES = [('git://github.com/dummy/armada', 'chart_1'),
+CHART_SOURCES = [('git://opendev.org/dummy/armada.git', 'chart_1'),
                 ('/tmp/dummy/armada', 'chart_2'),
                 ('/tmp/dummy/armada', 'chart_3'),
                 ('/tmp/dummy/armada', 'chart_4')]
@ -185,7 +185,7 @@ class ArmadaHandlerTestCase(base.ArmadaTestCase):
                                'release': 'test_chart_1',
                                'source': {
                                    'location':
-                                        'git://github.com/dummy/armada',
+                                        'git://opendev.org/dummy/armada.git',
                                    'reference': 'master',
                                    'subpath': 'chart_1',
                                    'type': 'git'
@ -321,7 +321,7 @@ class ArmadaHandlerTestCase(base.ArmadaTestCase):
        self._test_pre_flight_ops(armada_obj)

        mock_source.git_clone.assert_called_once_with(
-            'git://github.com/dummy/armada',
+            'git://opendev.org/dummy/armada.git',
            'master',
            auth_method=None,
            proxy_server=None)
--- a/armada/tests/unit/handlers/test_chartbuilder.py
+++ b/armada/tests/unit/handlers/test_chartbuilder.py
@ -76,7 +76,7 @@ class BaseChartBuilderTestCase(testtools.TestCase):
                    size: 1Gi
            source:
                type: git
-                location: git://github.com/openstack/openstack-helm
+                location: git://opendev.org/openstack/openstack-helm
                subpath: mariadb
                reference: master
            dependencies: []
--- a/armada/tests/unit/utils/test_source.py
+++ b/armada/tests/unit/utils/test_source.py
@ -41,14 +41,14 @@ class GitTestCase(base.ArmadaTestCase):
    @testtools.skipUnless(base.is_connected(),
                          'git clone requires network connectivity.')
    def test_git_clone_good_url(self):
-        url = 'https://github.com/openstack/airship-armada'
+        url = 'https://opendev.org/airship/armada.git'
        git_dir = source.git_clone(url)
        self._validate_git_clone(git_dir)

    @testtools.skipUnless(base.is_connected(),
                          'git clone requires network connectivity.')
    def test_git_clone_commit(self):
-        url = 'https://github.com/openstack/airship-armada'
+        url = 'https://opendev.org/airship/armada.git'
        commit = 'cba78d1d03e4910f6ab1691bae633c5bddce893d'
        git_dir = source.git_clone(url, commit)
        self._validate_git_clone(git_dir, commit)
@ -58,7 +58,7 @@ class GitTestCase(base.ArmadaTestCase):
    def test_git_clone_ref(self):
        ref = 'refs/changes/54/457754/73'
        git_dir = source.git_clone(
-            'https://github.com/openstack/openstack-helm', ref)
+            'https://opendev.org/openstack/openstack-helm.git', ref)
        self._validate_git_clone(git_dir, ref)

    @test_utils.attr(type=['negative'])
@ -75,7 +75,7 @@ class GitTestCase(base.ArmadaTestCase):
    @testtools.skipUnless(base.is_connected(),
                          'git clone requires network connectivity.')
    def test_git_clone_bad_url(self):
-        url = 'https://github.com/dummy/armada'
+        url = 'https://opendev.org/dummy/armada'

        self.assertRaises(source_exceptions.GitException, source.git_clone,
                          url)
@ -86,7 +86,7 @@ class GitTestCase(base.ArmadaTestCase):
    @testtools.skipUnless(base.is_connected(),
                          'git clone requires network connectivity.')
    def test_git_clone_fake_proxy(self):
-        url = 'https://github.com/openstack/airship-armada'
+        url = 'https://opendev.org/airship/armada.git'
        proxy_url = test_utils.rand_name(
            'not.a.proxy.that.works.and.never.will',
            prefix='http://') + ":8080"
@ -150,7 +150,7 @@ class GitTestCase(base.ArmadaTestCase):
                          'git clone requires network connectivity.')
    @mock.patch.object(source, 'LOG')
    def test_source_cleanup(self, mock_log):
-        url = 'https://github.com/openstack/airship-armada'
+        url = 'https://opendev.org/airship/armada.git'
        git_path = source.git_clone(url)
        source.source_cleanup(git_path)
        mock_log.warning.assert_not_called()
@ -179,8 +179,7 @@ class GitTestCase(base.ArmadaTestCase):
    def test_git_clone_ssh_auth_method_fails_auth(self, mock_os):
        mock_os.path.exists.return_value = True
        fake_user = test_utils.rand_name('fake_user')
-        url = ('ssh://%s@review.openstack.org:29418/openstack/airship-armada' %
-               fake_user)
+        url = ('ssh://%s@review.opendev.org:29418/airship/armada' % fake_user)
        self.assertRaises(
            source_exceptions.GitAuthException,
            source.git_clone,
@ -195,8 +194,7 @@ class GitTestCase(base.ArmadaTestCase):
    def test_git_clone_ssh_auth_method_missing_ssh_key(self, mock_os):
        mock_os.path.exists.return_value = False
        fake_user = test_utils.rand_name('fake_user')
-        url = ('ssh://%s@review.openstack.org:29418/openstack/airship-armada' %
-               fake_user)
+        url = ('ssh://%s@review.opendev.org:29418/airship/armada' % fake_user)
        self.assertRaises(
            source_exceptions.GitSSHException,
            source.git_clone,
--- a/armada/tests/unit/utils/test_validate.py
+++ b/armada/tests/unit/utils/test_validate.py
@ -209,8 +209,8 @@ data:
    def test_validate_manifest_url(self):
        value = 'url'
        self.assertFalse(validate.validate_manifest_url(value))
-        value = 'https://raw.githubusercontent.com/openstack/' \
-                'airship-armada/master/examples/simple.yaml'
+        value = 'https://opendev.org/airship/armada/' \
+                'raw/branch/master/examples/simple.yaml'
        self.assertTrue(validate.validate_manifest_url(value))


--- a/charts/armada/Chart.yaml
+++ b/charts/armada/Chart.yaml
@ -20,5 +20,5 @@ keywords:
 - armada
 home: https://airship-armada.readthedocs.io
 sources:
- https://github.com/openstack/airship-armada
+- https://opendev.org/airship/armada.git
 engine: gotpl
--- a/doc/source/development/getting-started.rst
+++ b/doc/source/development/getting-started.rst
@ -13,12 +13,12 @@ Quick Start (via Container)

 To use the docker container to develop:

-#. Clone the `Armada repository <https://github.com/openstack/airship-armada>`_.
+#. Clone the `Armada repository <https://opendev.org/airship/armada.git>`_.
 #. ``cd`` into the cloned directory.

   .. code-block:: bash

-     $ git clone https://github.com/openstack/airship-armada.git && cd airship-armada
+     $ git clone https://opendev.org/airship/armada.git && cd armada

 #. Next, run the following commands to install ``tox``, generate sample policy
   and configuration files, and build Armada charts as well as the Armada
@ -120,7 +120,7 @@ Follow the steps below to install the Armada CLI.

 Clone the Armada repository, ``cd`` into it::

-  git clone https://github.com/openstack/airship-armada.git && cd airship-armada
+  git clone https://opendev.org/airship/armada.git && cd armada

 It is recommended that Armada be run inside a virtual environment. To do so::

@ -316,8 +316,8 @@ included beneath each bullet.

    $ sudo apt-get install python3-dev -y

-.. _Bandit: https://github.com/openstack/bandit
+.. _Bandit: https://opendev.org/openstack/bandit
 .. _kubectl: https://kubernetes.io/docs/tasks/tools/install-kubectl/
 .. _Helm: https://docs.helm.sh/using_helm/#installing-helm
-.. _Keystone: https://github.com/openstack/keystone
+.. _Keystone: https://opendev.org/openstack/keystone
 .. _Tiller: https://docs.helm.sh/using_helm/#easy-in-cluster-installation
--- a/doc/source/operations/documents/v1/document-authoring.rst
+++ b/doc/source/operations/documents/v1/document-authoring.rst
@ -588,4 +588,4 @@ References
 ~~~~~~~~~~

 For working examples please check the examples in our repo
-`here <https://github.com/openstack/airship-armada/tree/master/examples>`__
+`here <https://opendev.org/airship/armada/src/branch/master/examples>`__.
--- a/doc/source/operations/documents/v2/document-authoring.rst
+++ b/doc/source/operations/documents/v2/document-authoring.rst
@ -574,4 +574,4 @@ References
 ~~~~~~~~~~

 For working examples please check the examples in our repo
-`here <https://github.com/openstack/airship-armada/tree/master/examples>`__
+`here <https://opendev.org/airship/armada/src/branch/master/examples>`__.
--- a/doc/source/operations/guide-helm-plugin.rst
+++ b/doc/source/operations/guide-helm-plugin.rst
@ -10,13 +10,13 @@ Install Plugin

 ::

-  helm plugin install https://github.com/openstack/airship-armada.git
+  helm plugin install https://opendev.org/airship/armada.git

 **Clone and install locally**

 ::

-  git clone https://github.com/openstack/airship-armada.git ~/.helm/plugins/
+  git clone https://opendev.org/airship/armada.git ~/.helm/plugins/
  helm plugin install ~/.helm/plugins/armada

 Usage
--- a/doc/source/operations/guide-troubleshooting.rst
+++ b/doc/source/operations/guide-troubleshooting.rst
@ -53,5 +53,6 @@ Issue
 -----

 If the issue that you are having does not appear here please check the Armada
-issues `section <https://github.com/openstack/airship-armada/issues>`_. If the issue does
-not exist, please create an issue.
+issues on
+`StoryBoard <https://storyboard.openstack.org/#!/project/airship/armada>`_.
+If the issue does not exist, please create an issue.
--- a/doc/source/operations/guide-use-armada.rst
+++ b/doc/source/operations/guide-use-armada.rst
@ -37,7 +37,7 @@ Usage

    Build:

-    git clone https://github.com/openstack/airship-armada && cd airship-armada/
+    git clone https://opendev.org/airship/armada.git && cd armada/
    docker build . -t quay.io/airshipit/armada:latest-ubuntu_bionic

 2. Running Armada
@ -53,7 +53,7 @@ Usage

    To run you custom Armada.yamls you need to mount them into the container as
    shown below.
-    This example is using ``examples/`` directory in armada `repo <https://github.com/openstack/airship-armada/tree/master/examples>`_
+    This example is using ``examples/`` directory in armada `repo <https://opendev.org/airship/armada/src/branch/master/examples>`_.

 .. code:: bash

--- a/examples/tar_example.yaml
+++ b/examples/tar_example.yaml
@ -10,7 +10,7 @@ data:
  values: {}
  source:
    type: git
-    location: git://github.com/openstack/openstack-helm-infra
+    location: git://opendev.org/openstack/openstack-helm-infra.git
    subpath: helm-toolkit
    reference: master
  dependencies: []
--- a/swagger/swaggerV2-api.yaml
+++ b/swagger/swaggerV2-api.yaml
@ -9,8 +9,8 @@ info:
    Armada provides operators a way to deploy or upgrade collection of helm
    charts using a single command.
  contact:
-    name: Armada Github Repository
-    url: https://github.com/openstack/airship-armada
+    name: Airship community
+    url: https://www.airshipit.org/
  license:
    name: Apache 2.0
    url: http://www.apache.org/licenses/LICENSE-2.0.html
--- a/swagger/swaggerV3-api.yaml
+++ b/swagger/swaggerV3-api.yaml
@ -6,8 +6,8 @@ info:
    Armada provides operators a way to deploy or upgrade collections of helm
    charts using a single command.
  contact:
-    name: Armada Github Repository
-    url: https://github.com/openstack/airship-armada
+    name: Airship community
+    url: https://www.airshipit.org/
  license:
    name: Apache 2.0
    url: http://www.apache.org/licenses/LICENSE-2.0.html