From b18c4c009354843c6e338138c675111101495d87 Mon Sep 17 00:00:00 2001 From: Alexander Hughes Date: Mon, 3 Jun 2019 15:39:38 +0000 Subject: [PATCH] Update AIAB repo names The Airship-In-A-Bottle repo was previously airship/in-a-bottle but has been updated to airship/airship-in-a-bottle. Updating these references to use the new name. This resolves both a consistency issue and failing unit tests. Change-Id: Ifa36e352a2718fb9998bf26f9f743ca2a7e8f8d4 --- doc/source/artifacts.rst | 2 +- tests/unit/engine/util/test_git.py | 6 +++--- tests/unit/test_cli.py | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/source/artifacts.rst b/doc/source/artifacts.rst index 029c7fa8..2d004419 100644 --- a/doc/source/artifacts.rst +++ b/doc/source/artifacts.rst @@ -185,4 +185,4 @@ site definition contains a set of documents.:: in whatever way makes sense. The best practice here to define them by racks is only a suggestion. -.. _Airship in a Bottle: https://opendev.org/airship/in-a-bottle +.. _Airship in a Bottle: https://opendev.org/airship/airship-in-a-bottle diff --git a/tests/unit/engine/util/test_git.py b/tests/unit/engine/util/test_git.py index cd4961c3..ce47c482 100644 --- a/tests/unit/engine/util/test_git.py +++ b/tests/unit/engine/util/test_git.py @@ -498,14 +498,14 @@ def test_is_repository(): # airship-in-a-bottle do_test( - url='https://review.opendev.org/airship/in-a-bottle', + url='https://review.opendev.org/airship/airship-in-a-bottle', ref='refs/changes/39/596439/1') do_test( - url='https://review.opendev.org/airship/in-a-bottle', + url='https://review.opendev.org/airship/airship-in-a-bottle', ref='refs/changes/39/596439/1', subpath='deployment_files') do_test( - url='https://review.opendev.org/airship/in-a-bottle', + url='https://review.opendev.org/airship/airship-in-a-bottle', ref='refs/changes/39/596439/1', subpath='deployment_files/site') diff --git a/tests/unit/test_cli.py b/tests/unit/test_cli.py index f2401209..e6a42e27 100644 --- a/tests/unit/test_cli.py +++ b/tests/unit/test_cli.py @@ -694,11 +694,11 @@ class TestSiteCliActionsWithSubdirectory(BaseCLIActionTest): """Validates list action with subpath in remote URL.""" # Scenario: # - # 1) List sites for https://opendev.org/airship/in-a-bottle + # 1) List sites for https://opendev.org/airship/airship-in-a-bottle # deployment_files (subpath in remote URL) # Perform site action using remote URL. - repo_name = 'in-a-bottle' + repo_name = 'airship-in-a-bottle' repo_rev = '7a0717adc68261c7adb3a3db74a9326d6103519f' repo_url = 'https://opendev.org/airship/%s/deployment_files@%s' % ( repo_name, repo_rev) @@ -709,11 +709,11 @@ class TestSiteCliActionsWithSubdirectory(BaseCLIActionTest): """Validates list action with subpath in local repo path.""" # Scenario: # - # 1) List sites for local repo at /tmp/.../in-a-bottle/ + # 1) List sites for local repo at /tmp/.../airship-in-a-bottle/ # deployment_files # Perform site action using local repo path. - repo_name = 'in-a-bottle' + repo_name = 'airship-in-a-bottle' repo_rev = '7a0717adc68261c7adb3a3db74a9326d6103519f' repo_url = 'https://opendev.org/airship/%s' % repo_name _repo_path = git.git_handler(repo_url, ref=repo_rev)