airship
/
armada
Code Issues Proposed changes

Change various URLs for the OpenDev migration 

Change-Id: I3d345cfe1b3cf6134f5aad69ce639ddd21dc101f
This commit is contained in:
Roman Gorshunov 2019-07-25 03:49:13 +02:00
parent caa75e403e
commit d404e3c034
16 changed files with 38 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.rst
View File

@ -112,8 +112,8 @@ Further Reading
.. _Armada Quickstart: https://airship-armada.readthedocs.io/en/latest/operations/guide-use-armada.html .. _Armada Quickstart: https://airship-armada.readthedocs.io/en/latest/operations/guide-use-armada.html
.. _kubectl: https://kubernetes.io/docs/user-guide/kubectl/kubectl_config/ .. _kubectl: https://kubernetes.io/docs/user-guide/kubectl/kubectl_config/
.. _Tiller: https://docs.helm.sh/using_helm/#easy-in-cluster-installation .. _Tiller: https://docs.helm.sh/using_helm/#easy-in-cluster-installation
.. _Deckhand: https://github.com/openstack/airship-deckhand .. _Deckhand: https://opendev.org/airship/deckhand
.. _Keystone: https://github.com/openstack/keystone .. _Keystone: https://opendev.org/openstack/keystone
.. |Docker Repository on Quay| image:: https://quay.io/repository/airshipit/armada/status .. |Docker Repository on Quay| image:: https://quay.io/repository/airshipit/armada/status
:target: https://quay.io/repository/airshipit/armada :target: https://quay.io/repository/airshipit/armada

2
armada/tests/unit/base.py
View File

@ -33,7 +33,7 @@ def is_connected():
:returns: True if connected else False. :returns: True if connected else False.
""" """
try: try:
host = socket.gethostbyname("www.github.com") host = socket.gethostbyname("opendev.org")
socket.create_connection((host, 80), 2) socket.create_connection((host, 80), 2)
return True return True
except (socket.error, socket.herror, socket.timeout): except (socket.error, socket.herror, socket.timeout):

8
armada/tests/unit/handlers/test_armada.py
View File

@ -133,7 +133,7 @@ data:
values: {} values: {}
source: source:
type: git type: git
location: git://github.com/dummy/armada location: git://opendev.org/dummy/armada.git
subpath: chart_1 subpath: chart_1
reference: master reference: master
dependencies: [] dependencies: []
@ -145,7 +145,7 @@ data:
enabled: true 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_2'),
('/tmp/dummy/armada', 'chart_3'), ('/tmp/dummy/armada', 'chart_3'),
('/tmp/dummy/armada', 'chart_4')] ('/tmp/dummy/armada', 'chart_4')]
@ -185,7 +185,7 @@ class ArmadaHandlerTestCase(base.ArmadaTestCase):
'release': 'test_chart_1', 'release': 'test_chart_1',
'source': { 'source': {
'location': 'location':
'git://github.com/dummy/armada', 'git://opendev.org/dummy/armada.git',
'reference': 'master', 'reference': 'master',
'subpath': 'chart_1', 'subpath': 'chart_1',
'type': 'git' 'type': 'git'
@ -321,7 +321,7 @@ class ArmadaHandlerTestCase(base.ArmadaTestCase):
self._test_pre_flight_ops(armada_obj) self._test_pre_flight_ops(armada_obj)
mock_source.git_clone.assert_called_once_with( mock_source.git_clone.assert_called_once_with(
'git://github.com/dummy/armada', 'git://opendev.org/dummy/armada.git',
'master', 'master',
auth_method=None, auth_method=None,
proxy_server=None) proxy_server=None)

2
armada/tests/unit/handlers/test_chartbuilder.py
View File

@ -76,7 +76,7 @@ class BaseChartBuilderTestCase(testtools.TestCase):
size: 1Gi size: 1Gi
source: source:
type: git type: git
location: git://github.com/openstack/openstack-helm location: git://opendev.org/openstack/openstack-helm
subpath: mariadb subpath: mariadb
reference: master reference: master
dependencies: [] dependencies: []

18
armada/tests/unit/utils/test_source.py
View File

@ -41,14 +41,14 @@ class GitTestCase(base.ArmadaTestCase):
@testtools.skipUnless(base.is_connected(), @testtools.skipUnless(base.is_connected(),
'git clone requires network connectivity.') 'git clone requires network connectivity.')
def test_git_clone_good_url(self): 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) git_dir = source.git_clone(url)
self._validate_git_clone(git_dir) self._validate_git_clone(git_dir)
@testtools.skipUnless(base.is_connected(), @testtools.skipUnless(base.is_connected(),
'git clone requires network connectivity.') 'git clone requires network connectivity.')
def test_git_clone_commit(self): def test_git_clone_commit(self):
url = 'https://github.com/openstack/airship-armada' url = 'https://opendev.org/airship/armada.git'
commit = 'cba78d1d03e4910f6ab1691bae633c5bddce893d' commit = 'cba78d1d03e4910f6ab1691bae633c5bddce893d'
git_dir = source.git_clone(url, commit) git_dir = source.git_clone(url, commit)
self._validate_git_clone(git_dir, commit) self._validate_git_clone(git_dir, commit)
@ -58,7 +58,7 @@ class GitTestCase(base.ArmadaTestCase):
def test_git_clone_ref(self): def test_git_clone_ref(self):
ref = 'refs/changes/54/457754/73' ref = 'refs/changes/54/457754/73'
git_dir = source.git_clone( 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) self._validate_git_clone(git_dir, ref)
@test_utils.attr(type=['negative']) @test_utils.attr(type=['negative'])
@ -75,7 +75,7 @@ class GitTestCase(base.ArmadaTestCase):
@testtools.skipUnless(base.is_connected(), @testtools.skipUnless(base.is_connected(),
'git clone requires network connectivity.') 'git clone requires network connectivity.')
def test_git_clone_bad_url(self): 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, self.assertRaises(source_exceptions.GitException, source.git_clone,
url) url)
@ -86,7 +86,7 @@ class GitTestCase(base.ArmadaTestCase):
@testtools.skipUnless(base.is_connected(), @testtools.skipUnless(base.is_connected(),
'git clone requires network connectivity.') 'git clone requires network connectivity.')
def test_git_clone_fake_proxy(self): 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( proxy_url = test_utils.rand_name(
'not.a.proxy.that.works.and.never.will', 'not.a.proxy.that.works.and.never.will',
prefix='http://') + ":8080" prefix='http://') + ":8080"
@ -150,7 +150,7 @@ class GitTestCase(base.ArmadaTestCase):
'git clone requires network connectivity.') 'git clone requires network connectivity.')
@mock.patch.object(source, 'LOG') @mock.patch.object(source, 'LOG')
def test_source_cleanup(self, mock_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) git_path = source.git_clone(url)
source.source_cleanup(git_path) source.source_cleanup(git_path)
mock_log.warning.assert_not_called() 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): def test_git_clone_ssh_auth_method_fails_auth(self, mock_os):
mock_os.path.exists.return_value = True mock_os.path.exists.return_value = True
fake_user = test_utils.rand_name('fake_user') fake_user = test_utils.rand_name('fake_user')
url = ('ssh://%s@review.openstack.org:29418/openstack/airship-armada' % url = ('ssh://%s@review.opendev.org:29418/airship/armada' % fake_user)
fake_user)
self.assertRaises( self.assertRaises(
source_exceptions.GitAuthException, source_exceptions.GitAuthException,
source.git_clone, source.git_clone,
@ -195,8 +194,7 @@ class GitTestCase(base.ArmadaTestCase):
def test_git_clone_ssh_auth_method_missing_ssh_key(self, mock_os): def test_git_clone_ssh_auth_method_missing_ssh_key(self, mock_os):
mock_os.path.exists.return_value = False mock_os.path.exists.return_value = False
fake_user = test_utils.rand_name('fake_user') fake_user = test_utils.rand_name('fake_user')
url = ('ssh://%s@review.openstack.org:29418/openstack/airship-armada' % url = ('ssh://%s@review.opendev.org:29418/airship/armada' % fake_user)
fake_user)
self.assertRaises( self.assertRaises(
source_exceptions.GitSSHException, source_exceptions.GitSSHException,
source.git_clone, source.git_clone,

4
armada/tests/unit/utils/test_validate.py
View File

@ -209,8 +209,8 @@ data:
def test_validate_manifest_url(self): def test_validate_manifest_url(self):
value = 'url' value = 'url'
self.assertFalse(validate.validate_manifest_url(value)) self.assertFalse(validate.validate_manifest_url(value))
value = 'https://raw.githubusercontent.com/openstack/' \ value = 'https://opendev.org/airship/armada/' \
'airship-armada/master/examples/simple.yaml' 'raw/branch/master/examples/simple.yaml'
self.assertTrue(validate.validate_manifest_url(value)) self.assertTrue(validate.validate_manifest_url(value))

2
charts/armada/Chart.yaml
View File

@ -20,5 +20,5 @@ keywords:
- armada - armada
home: https://airship-armada.readthedocs.io home: https://airship-armada.readthedocs.io
sources: sources:
- https://github.com/openstack/airship-armada - https://opendev.org/airship/armada.git
engine: gotpl engine: gotpl

10
doc/source/development/getting-started.rst
View File

@ -13,12 +13,12 @@ Quick Start (via Container)
To use the docker container to develop: 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. #. ``cd`` into the cloned directory.
.. code-block:: bash .. 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 #. Next, run the following commands to install ``tox``, generate sample policy
and configuration files, and build Armada charts as well as the Armada 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:: 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:: 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 $ 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/ .. _kubectl: https://kubernetes.io/docs/tasks/tools/install-kubectl/
.. _Helm: https://docs.helm.sh/using_helm/#installing-helm .. _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 .. _Tiller: https://docs.helm.sh/using_helm/#easy-in-cluster-installation

2
doc/source/operations/documents/v1/document-authoring.rst
View File

@ -588,4 +588,4 @@ References
~~~~~~~~~~ ~~~~~~~~~~
For working examples please check the examples in our repo 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>`__.

2
doc/source/operations/documents/v2/document-authoring.rst
View File

@ -574,4 +574,4 @@ References
~~~~~~~~~~ ~~~~~~~~~~
For working examples please check the examples in our repo 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>`__.

4
doc/source/operations/guide-helm-plugin.rst
View File

@ -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** **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 helm plugin install ~/.helm/plugins/armada
Usage Usage

5
doc/source/operations/guide-troubleshooting.rst
View File

@ -53,5 +53,6 @@ Issue
----- -----
If the issue that you are having does not appear here please check the Armada 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 issues on
not exist, please create an issue. `StoryBoard <https://storyboard.openstack.org/#!/project/airship/armada>`_.
If the issue does not exist, please create an issue.

4
doc/source/operations/guide-use-armada.rst
View File

@ -37,7 +37,7 @@ Usage
Build: 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 docker build . -t quay.io/airshipit/armada:latest-ubuntu_bionic
2. Running Armada 2. Running Armada
@ -53,7 +53,7 @@ Usage
To run you custom Armada.yamls you need to mount them into the container as To run you custom Armada.yamls you need to mount them into the container as
shown below. 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 .. code:: bash

2
examples/tar_example.yaml
View File

@ -10,7 +10,7 @@ data:
values: {} values: {}
source: source:
type: git type: git
location: git://github.com/openstack/openstack-helm-infra location: git://opendev.org/openstack/openstack-helm-infra.git
subpath: helm-toolkit subpath: helm-toolkit
reference: master reference: master
dependencies: [] dependencies: []

4
swagger/swaggerV2-api.yaml
View File

@ -9,8 +9,8 @@ info:
Armada provides operators a way to deploy or upgrade collection of helm Armada provides operators a way to deploy or upgrade collection of helm
charts using a single command. charts using a single command.
contact: contact:
name: Armada Github Repository name: Airship community
url: https://github.com/openstack/airship-armada url: https://www.airshipit.org/
license: license:
name: Apache 2.0 name: Apache 2.0
url: http://www.apache.org/licenses/LICENSE-2.0.html url: http://www.apache.org/licenses/LICENSE-2.0.html

4
swagger/swaggerV3-api.yaml
View File

@ -6,8 +6,8 @@ info:
Armada provides operators a way to deploy or upgrade collections of helm Armada provides operators a way to deploy or upgrade collections of helm
charts using a single command. charts using a single command.
contact: contact:
name: Armada Github Repository name: Airship community
url: https://github.com/openstack/airship-armada url: https://www.airshipit.org/
license: license:
name: Apache 2.0 name: Apache 2.0
url: http://www.apache.org/licenses/LICENSE-2.0.html url: http://www.apache.org/licenses/LICENSE-2.0.html