diff --git a/doc/source/artifacts.rst b/doc/source/artifacts.rst index 0a9c4be3..029c7fa8 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://github.com/openstack/airship-in-a-bottle +.. _Airship in a Bottle: https://opendev.org/airship/in-a-bottle diff --git a/doc/source/cli/cli.rst b/doc/source/cli/cli.rst index 9e753930..a02aa935 100644 --- a/doc/source/cli/cli.rst +++ b/doc/source/cli/cli.rst @@ -972,7 +972,7 @@ P003 - All repos contain expected directories. .. _Deckhand: https://airship-deckhand.readthedocs.io/en/latest/users/rendering.html .. _Deckhand Validations: https://airship-deckhand.readthedocs.io/en/latest/overview.html#validation .. _Pegleg Managed Documents: https://airship-specs.readthedocs.io/en/latest/specs/approved/pegleg-secrets.html#peglegmanageddocument -.. _Shipyard: https://github.com/openstack/airship-shipyard +.. _Shipyard: https://opendev.org/airship/shipyard .. _CLI documentation: https://airship-shipyard.readthedocs.io/en/latest/CLI.html#openstack-keystone-authorization-environment-variables .. _Pegleg Passphrase Catalog: https://airship-specs.readthedocs.io/en/latest/specs/approved/pegleg-secrets.html#document-generation diff --git a/images/pegleg/Dockerfile b/images/pegleg/Dockerfile index a7ede75b..b0a70977 100644 --- a/images/pegleg/Dockerfile +++ b/images/pegleg/Dockerfile @@ -5,7 +5,7 @@ ARG CFSSLURL=https://pkg.cfssl.org/R1.2/cfssl_linux-amd64 LABEL org.opencontainers.image.authors='airship-discuss@lists.airshipit.org, irc://#airshipit@freenode' LABEL org.opencontainers.image.url='https://airshipit.org' LABEL org.opencontainers.image.documentation='https://airship-pegleg.readthedocs.org' -LABEL org.opencontainers.image.source='https://git.openstack.org/openstack/airship-pegleg' +LABEL org.opencontainers.image.source='https://opendev.org/airship/pegleg' LABEL org.opencontainers.image.vendor='The Airship Authors' LABEL org.opencontainers.image.licenses='Apache-2.0' diff --git a/pegleg/cli.py b/pegleg/cli.py index 4fdd7661..96f714d4 100644 --- a/pegleg/cli.py +++ b/pegleg/cli.py @@ -92,9 +92,9 @@ REPOSITORY_CLONE_PATH_OPTION = click.option( 'exists, then the repo will not be cloned again and the ' 'user must specify a new clone path or pass in the local copy ' 'of the repository as the site repository. Suppose the repo ' - 'name is airship-treasuremap and the clone path is ' + 'name is airship/treasuremap and the clone path is ' '/tmp/mypath then the following directory is ' - 'created /tmp/mypath/airship-treasuremap ' + 'created /tmp/mypath/airship/treasuremap ' 'which will contain the contents of the repo') ALLOW_MISSING_SUBSTITUTIONS_OPTION = click.option( diff --git a/requirements.txt b/requirements.txt index c369c097..20cbd39f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,6 +6,6 @@ cryptography==2.3.1 python-dateutil==2.7.3 # External dependencies -git+https://github.com/openstack/airship-deckhand.git@49ad9f38842f7f1ecb86d907d86d332f8186eb8c -git+https://github.com/openstack/airship-shipyard.git@44f7022df6438de541501c2fdd5c46df198b82bf#egg=shipyard_client&subdirectory=src/bin/shipyard_client -git+https://github.com/openstack/airship-promenade.git@a6e8fdbe22bd153c78a008b92cd5d1c245bc63e3 +git+https://opendev.org/airship/deckhand.git@49ad9f38842f7f1ecb86d907d86d332f8186eb8c +git+https://opendev.org/airship/shipyard.git@44f7022df6438de541501c2fdd5c46df198b82bf#egg=shipyard_client&subdirectory=src/bin/shipyard_client +git+https://opendev.org/airship/promenade.git@a6e8fdbe22bd153c78a008b92cd5d1c245bc63e3 diff --git a/setup.py b/setup.py index d6595422..462e5207 100644 --- a/setup.py +++ b/setup.py @@ -22,7 +22,7 @@ setup( description=('Pegleg is a document aggregator that provides early ' 'linting and validations via Deckhand, a document ' 'management micro-service within Airship.'), - url='https://github.com/openstack/airship-pegleg', + url='https://opendev.org/airship/pegleg', author='The Airship Authors', license='Apache 2.0', packages=find_packages(), diff --git a/tests/unit/engine/test_site_repository.py b/tests/unit/engine/test_site_repository.py index 2dd8bdcd..148df8e1 100644 --- a/tests/unit/engine/test_site_repository.py +++ b/tests/unit/engine/test_site_repository.py @@ -498,20 +498,20 @@ def test_process_site_repository(_): # Ensure that the reference is always pruned. _do_test( - 'http://github.com/openstack/treasuremap@master', - expected='http://github.com/openstack/treasuremap') + 'https://opendev.org/airship/treasuremap@master', + expected='https://opendev.org/airship/treasuremap') _do_test( - 'http://github.com/openstack/treasuremap', - expected='http://github.com/openstack/treasuremap') + 'https://opendev.org/airship/treasuremap', + expected='https://opendev.org/airship/treasuremap') _do_test( - 'https://github.com/openstack/treasuremap@master', - expected='https://github.com/openstack/treasuremap') + 'https://opendev.org/airship/treasuremap@master', + expected='https://opendev.org/airship/treasuremap') _do_test( - 'https://github.com/openstack/treasuremap', - expected='https://github.com/openstack/treasuremap') + 'https://opendev.org/airship/treasuremap', + expected='https://opendev.org/airship/treasuremap') _do_test( - 'ssh://foo@github.com/openstack/treasuremap:12345@master', - expected='ssh://foo@github.com/openstack/treasuremap:12345') + 'ssh://foo@opendev.org/airship/treasuremap:12345@master', + expected='ssh://foo@opendev.org/airship/treasuremap:12345') _do_test( - 'ssh://foo@github.com/openstack/treasuremap:12345', - expected='ssh://foo@github.com/openstack/treasuremap:12345') + 'ssh://foo@opendev.org/airship/treasuremap:12345', + expected='ssh://foo@opendev.org/airship/treasuremap:12345') diff --git a/tests/unit/engine/util/test_git.py b/tests/unit/engine/util/test_git.py index 07e2243f..cd4961c3 100644 --- a/tests/unit/engine/util/test_git.py +++ b/tests/unit/engine/util/test_git.py @@ -64,7 +64,7 @@ def _assert_check_out_from_local_repo(mock_log, git_dir): not test_utils.is_connected(), reason='git clone requires network connectivity.') def test_git_clone_valid_url_http_protocol(): - url = 'http://github.com/openstack/airship-armada' + url = 'https://opendev.org/airship/armada' git_dir = git.git_handler(url, ref='master') _validate_git_clone(git_dir) @@ -73,7 +73,7 @@ def test_git_clone_valid_url_http_protocol(): not test_utils.is_connected(), reason='git clone requires network connectivity.') def test_git_clone_valid_url_https_protocol(): - url = 'https://github.com/openstack/airship-armada' + url = 'https://opendev.org/airship/armada' git_dir = git.git_handler(url, ref='master') _validate_git_clone(git_dir) @@ -82,7 +82,7 @@ def test_git_clone_valid_url_https_protocol(): not test_utils.is_connected(), reason='git clone requires network connectivity.') def test_git_clone_with_commit_reference(): - url = 'https://github.com/openstack/airship-armada' + url = 'https://review.opendev.org/airship/armada' commit = 'cba78d1d03e4910f6ab1691bae633c5bddce893d' git_dir = git.git_handler(url, commit) _validate_git_clone(git_dir, commit) @@ -93,7 +93,7 @@ def test_git_clone_with_commit_reference(): reason='git clone requires network connectivity.') def test_git_clone_with_patch_ref(): ref = 'refs/changes/54/457754/73' - git_dir = git.git_handler('https://github.com/openstack/openstack-helm', + git_dir = git.git_handler('https://review.opendev.org/openstack/openstack-helm', ref) _validate_git_clone(git_dir, ref) @@ -103,7 +103,7 @@ def test_git_clone_with_patch_ref(): reason='git clone requires proxy connectivity.') @mock.patch.object(git, 'LOG', autospec=True) def test_git_clone_behind_proxy(mock_log): - url = 'https://github.com/openstack/airship-armada' + url = 'https://review.opendev.org/airship/armada' commit = 'cba78d1d03e4910f6ab1691bae633c5bddce893d' for proxy_server in test_utils._PROXY_SERVERS.values(): @@ -127,7 +127,7 @@ def test_git_clone_existing_directory_checks_out_earlier_ref_from_local( """ # Clone the openstack-helm repo and automatically checkout patch 34. ref = 'refs/changes/15/536215/35' - repo_url = 'https://github.com/openstack/openstack-helm' + repo_url = 'https://review.opendev.org/openstack/openstack-helm' git_dir = git.git_handler(repo_url, ref) _validate_git_clone(git_dir, fetched_ref=ref) @@ -148,7 +148,7 @@ def test_git_clone_existing_directory_checks_out_master_from_local(mock_log): """ # Clone the openstack-helm repo and automatically checkout patch 34. ref = 'refs/changes/15/536215/34' - repo_url = 'https://github.com/openstack/openstack-helm' + repo_url = 'https://review.opendev.org/openstack/openstack-helm' git_dir = git.git_handler(repo_url, ref) _validate_git_clone(git_dir, fetched_ref=ref) @@ -169,7 +169,7 @@ def test_git_clone_checkout_refpath_saves_references_locally(mock_log): """ # Clone the openstack-helm repo and automatically checkout patch 34. ref = 'refs/changes/15/536215/34' - repo_url = 'https://github.com/openstack/openstack-helm' + repo_url = 'https://review.opendev.org/openstack/openstack-helm' git_dir = git.git_handler(repo_url, ref) _validate_git_clone(git_dir, fetched_ref=ref) @@ -201,7 +201,7 @@ def test_git_clone_checkout_hexsha_saves_references_locally(mock_log): # to the last patch as that is what gets pushed to github. In this case, # this corresponds to patch 'refs/changes/15/536215/35'. ref = 'bf126f46b1c175a8038949a87dafb0a716e3b9b6' - repo_url = 'https://github.com/openstack/openstack-helm' + repo_url = 'https://review.opendev.org/openstack/openstack-helm' git_dir = git.git_handler(repo_url, ref) _validate_git_clone(git_dir, fetched_ref=ref) @@ -228,7 +228,7 @@ def test_git_clone_existing_directory_checks_out_next_local_ref(mock_log): """ # Clone the openstack-helm repo and automatically checkout patch 73. ref = 'refs/changes/54/457754/73' - repo_url = 'https://github.com/openstack/openstack-helm' + repo_url = 'https://review.opendev.org/openstack/openstack-helm' git_dir = git.git_handler(repo_url, ref) _validate_git_clone(git_dir, ref) @@ -248,7 +248,7 @@ def test_git_checkout_without_reference_defaults_to_current(mock_log): """Validate that the currently checked out ref is defaulted to when ref=None is passed to ``git.git_handler``. """ - url = 'https://github.com/openstack/airship-armada' + url = 'https://review.opendev.org/airship/armada' commit = 'cba78d1d03e4910f6ab1691bae633c5bddce893d' git_dir = git.git_handler(url, commit) _validate_git_clone(git_dir, commit) @@ -267,7 +267,7 @@ def test_git_clone_delete_repo_and_reclone(mock_log): """ # Clone the openstack-helm repo and automatically checkout patch 73. ref = 'refs/changes/54/457754/73' - repo_url = 'https://github.com/openstack/openstack-helm' + repo_url = 'https://review.opendev.org/openstack/openstack-helm' first_git_dir = git.git_handler(repo_url, ref) _validate_git_clone(first_git_dir, ref) @@ -295,7 +295,7 @@ def test_git_clone_delete_repo_and_reclone(mock_log): @mock.patch.object(git, 'LOG', autospec=True) def test_git_checkout_none_ref_checks_out_master(mock_log): """Validate that ref=None checks out master.""" - url = 'https://github.com/openstack/airship-armada' + url = 'https://opendev.org/airship/armada' git_dir = git.git_handler(url, ref=None) _validate_git_clone(git_dir, 'master') @@ -308,7 +308,7 @@ def test_git_checkout_dirty_repo_tracked_file_committed(mock_log): """Validate a dirty tracked file is committed.""" # Clone the openstack-helm repo and automatically checkout patch 73. ref = 'refs/changes/54/457754/73' - repo_url = 'https://github.com/openstack/openstack-helm' + repo_url = 'https://review.opendev.org/openstack/openstack-helm' git_dir = git.git_handler(repo_url, ref) _validate_git_clone(git_dir, ref) @@ -337,7 +337,7 @@ def test_git_checkout_dirty_repo_untracked_file_committed(mock_log): """Validate a dirty untracked file is committed.""" # Clone the openstack-helm repo and automatically checkout patch 73. ref = 'refs/changes/54/457754/73' - repo_url = 'https://github.com/openstack/openstack-helm' + repo_url = 'https://review.opendev.org/openstack/openstack-helm' git_dir = git.git_handler(repo_url, ref) _validate_git_clone(git_dir, ref) @@ -367,7 +367,7 @@ def test_git_clone_existing_directory_raises_exc_for_invalid_ref(mock_log): """ # Clone the openstack-helm repo and automatically checkout patch 73. ref = 'refs/changes/54/457754/73' - repo_url = 'https://github.com/openstack/openstack-helm' + repo_url = 'https://review.opendev.org/openstack/openstack-helm' git_dir = git.git_handler(repo_url, ref) _validate_git_clone(git_dir, ref) @@ -429,7 +429,7 @@ def test_git_clone_invalid_remote_url_protocol(): not test_utils.is_connected(), reason='git clone requires network connectivity.') def test_git_clone_fake_proxy(): - url = 'https://github.com/openstack/airship-armada' + url = 'https://opendev.org/airship/armada' proxy_url = test_utils.rand_name( 'not.a.proxy.that.works.and.never.will', prefix='http://') + ":8080" @@ -443,7 +443,7 @@ def test_git_clone_fake_proxy(): @mock.patch('os.path.exists', return_value=True, autospec=True) def test_git_clone_ssh_auth_method_fails_auth(_): 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) with pytest.raises(exceptions.GitAuthException): git._try_git_clone( @@ -456,7 +456,7 @@ def test_git_clone_ssh_auth_method_fails_auth(_): @mock.patch('os.path.exists', return_value=False, autospec=True) def test_git_clone_ssh_auth_method_missing_ssh_key(_): 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) with pytest.raises(exceptions.GitSSHException): git.git_handler( @@ -489,23 +489,23 @@ def test_is_repository(): # airship-treasuremap do_test( - url='http://github.com/openstack/airship-treasuremap', + url='https://review.opendev.org/airship/treasuremap', ref='refs/changes/17/597217/1') do_test( - url='http://github.com/openstack/airship-treasuremap', + url='https://review.opendev.org/airship/treasuremap', ref='refs/changes/17/597217/1', subpath='site') # airship-in-a-bottle do_test( - url='http://github.com/openstack/airship-in-a-bottle', + url='https://review.opendev.org/airship/in-a-bottle', ref='refs/changes/39/596439/1') do_test( - url='http://github.com/openstack/airship-in-a-bottle', + url='https://review.opendev.org/airship/in-a-bottle', ref='refs/changes/39/596439/1', subpath='deployment_files') do_test( - url='http://github.com/openstack/airship-in-a-bottle', + url='https://review.opendev.org/airship/in-a-bottle', ref='refs/changes/39/596439/1', subpath='deployment_files/site') @@ -518,12 +518,12 @@ def test_is_repository_negative(temp_path): not test_utils.is_connected(), reason='git clone requires network connectivity.') def test_repo_name_ending_in_git(): - url = "http://github.com/openstack/airship-pegleg.git" + url = "https://opendev.org/airship/pegleg.git" git_dir = git.git_handler(url, ref="master") _validate_git_clone(git_dir) name = git.repo_name(git_dir) - expected = "airship-pegleg" + expected = "pegleg" assert name == expected @@ -531,12 +531,12 @@ def test_repo_name_ending_in_git(): not test_utils.is_connected(), reason='git clone requires network connectivity.') def test_repo_name_not_ending_in_git_and_no_fwd_slash_at_end(): - url = "http://github.com/openstack/airship-pegleg" + url = "https://opendev.org/airship/pegleg" git_dir = git.git_handler(url, ref="master") _validate_git_clone(git_dir) name = git.repo_name(git_dir) - expected = "airship-pegleg" + expected = "pegleg" assert name == expected @@ -544,12 +544,12 @@ def test_repo_name_not_ending_in_git_and_no_fwd_slash_at_end(): not test_utils.is_connected(), reason='git clone requires network connectivity.') def test_repo_name_not_ending_in_git_with_fwd_slash_at_end(): - url = "http://github.com/openstack/airship-pegleg/" + url = "https://opendev.org/airship/pegleg/" git_dir = git.git_handler(url, ref="master") _validate_git_clone(git_dir) name = git.repo_name(git_dir) - expected = "airship-pegleg" + expected = "pegleg" assert name == expected @@ -559,12 +559,12 @@ def test_repo_name_not_ending_in_git_with_fwd_slash_at_end(): def test_is_equal(): """Tests whether 2 repositories are equal => reference same remote repo.""" - url = "http://github.com/openstack/airship-pegleg" + url = "https://review.opendev.org/airship/pegleg" git_dir1 = git.git_handler(url, ref="master") _validate_git_clone(git_dir1) # Re-clone the same repo using a different ref. - url = "http://github.com/openstack/airship-pegleg" + url = "https://review.opendev.org/airship/pegleg" git_dir2 = git.git_handler(url, ref="refs/changes/40/604640/4") _validate_git_clone(git_dir2) diff --git a/tests/unit/test_cli.py b/tests/unit/test_cli.py index 2f68faef..3874fba6 100644 --- a/tests/unit/test_cli.py +++ b/tests/unit/test_cli.py @@ -32,8 +32,8 @@ TEST_PARAMS = { "site_name": "airship-seaworthy", "site_type": "foundry", "repo_rev": '6b183e148b9bb7ba6f75c98dd13451088255c60b', - "repo_name": "airship-treasuremap", - "repo_url": "https://github.com/openstack/airship-treasuremap.git", + "repo_name": "treasuremap", + "repo_url": "https://opendev.org/airship/treasuremap.git", } test_cert = """ @@ -95,7 +95,7 @@ class TestSiteCLIOptions(BaseCLIActionTest): # 1) List sites (should clone repo automatically to `clone_path` # location if `clone_path` is set) - repo_url = 'https://github.com/openstack/%s@%s' % (self.repo_name, + repo_url = 'https://opendev.org/airship/%s@%s' % (self.repo_name, self.repo_rev) # Note that the -p option is used to specify the clone_folder @@ -145,7 +145,7 @@ class TestSiteCLIOptionsNegative(BaseCLIActionTest): # 1) List sites (should clone repo automatically to `clone_path` # location if `clone_path` is set) - repo_url = 'https://github.com/openstack/%s@%s' % (self.repo_name, + repo_url = 'https://opendev.org/airship/%s@%s' % (self.repo_name, self.repo_rev) # Note that the -p option is used to specify the clone_folder @@ -193,7 +193,7 @@ class TestSiteCliActions(BaseCLIActionTest): # 2) Collect into save location (should clone repo automatically) # 3) Check that expected file name is there - repo_url = 'https://github.com/openstack/%s@%s' % (self.repo_name, + repo_url = 'https://opendev.org/airship/%s@%s' % (self.repo_name, self.repo_rev) self._validate_collect_site_action(repo_url, temp_path) @@ -206,7 +206,7 @@ class TestSiteCliActions(BaseCLIActionTest): # 2) Collect into save location (should clone repo automatically) # 3) Check that expected file name is there - repo_url = 'https://github.com/openstack/%s@%s.git' % (self.repo_name, + repo_url = 'https://opendev.org/airship/%s@%s.git' % (self.repo_name, self.repo_rev) self._validate_collect_site_action(repo_url, temp_path) @@ -253,7 +253,7 @@ class TestSiteCliActions(BaseCLIActionTest): # 1) Mock out Deckhand render (so we can ignore P005 issues) # 2) Lint site with exclude flags (should clone repo automatically) - repo_url = 'https://github.com/openstack/%s@%s' % (self.repo_name, + repo_url = 'https://opendev.org/airship/%s@%s' % (self.repo_name, self.repo_rev) self._test_lint_site_action(repo_url, exclude=True) @@ -295,7 +295,7 @@ class TestSiteCliActions(BaseCLIActionTest): # # 1) List sites (should clone repo automatically) - repo_url = 'https://github.com/openstack/%s@%s' % (self.repo_name, + repo_url = 'https://opendev.org/airship/%s@%s' % (self.repo_name, self.repo_rev) self._validate_list_site_action(repo_url) @@ -327,7 +327,7 @@ class TestSiteCliActions(BaseCLIActionTest): # # 1) Show site (should clone repo automatically) - repo_url = 'https://github.com/openstack/%s@%s' % (self.repo_name, + repo_url = 'https://opendev.org/airship/%s@%s' % (self.repo_name, self.repo_rev) self._validate_site_show_action(repo_url) @@ -361,7 +361,7 @@ class TestSiteCliActions(BaseCLIActionTest): # 1) Mock out Deckhand render (so we can ignore P005 issues) # 2) Render site (should clone repo automatically) - repo_url = 'https://github.com/openstack/%s@%s' % (self.repo_name, + repo_url = 'https://opendev.org/airship/%s@%s' % (self.repo_name, self.repo_rev) self._validate_render_site_action(repo_url) @@ -417,7 +417,7 @@ class TestRepoCliActions(BaseCLIActionTest): # 1) Mock out Deckhand render (so we can ignore P005 issues) # 2) Lint repo with exclude flags (should clone repo automatically) - repo_url = 'https://github.com/openstack/%s@%s' % (self.repo_name, + repo_url = 'https://opendev.org/airship/%s@%s' % (self.repo_name, self.repo_rev) lint_command = ['-r', repo_url, 'lint'] @@ -496,7 +496,7 @@ class TestSiteSecretsActions(BaseCLIActionTest): # # 1) Generate PKI using remote repo URL - repo_url = 'https://github.com/openstack/%s@%s' % (self.repo_name, + repo_url = 'https://opendev.org/airship/%s@%s' % (self.repo_name, self.repo_rev) secrets_opts = ['secrets', 'generate-pki', self.site_name] @@ -642,7 +642,7 @@ class TestTypeCliActions(BaseCLIActionTest): # # 1) List types (should clone repo automatically) - repo_url = 'https://github.com/openstack/%s@%s' % (self.repo_name, + repo_url = 'https://opendev.org/airship/%s@%s' % (self.repo_name, self.repo_rev) self._validate_type_list_action(repo_url) @@ -679,13 +679,13 @@ class TestSiteCliActionsWithSubdirectory(BaseCLIActionTest): """Validates list action with subpath in remote URL.""" # Scenario: # - # 1) List sites for https://github.com/airship-in-a-bottle/ + # 1) List sites for https://opendev.org/airship/in-a-bottle # deployment_files (subpath in remote URL) # Perform site action using remote URL. - repo_name = 'airship-in-a-bottle' + repo_name = 'in-a-bottle' repo_rev = '7a0717adc68261c7adb3a3db74a9326d6103519f' - repo_url = 'https://github.com/openstack/%s/deployment_files@%s' % ( + repo_url = 'https://opendev.org/airship/%s/deployment_files@%s' % ( repo_name, repo_rev) self._validate_list_site_action(repo_url) @@ -694,13 +694,13 @@ class TestSiteCliActionsWithSubdirectory(BaseCLIActionTest): """Validates list action with subpath in local repo path.""" # Scenario: # - # 1) List sites for local repo at /tmp/.../airship-in-a-bottle/ + # 1) List sites for local repo at /tmp/.../in-a-bottle/ # deployment_files # Perform site action using local repo path. - repo_name = 'airship-in-a-bottle' + repo_name = 'in-a-bottle' repo_rev = '7a0717adc68261c7adb3a3db74a9326d6103519f' - repo_url = 'https://github.com/openstack/%s' % repo_name + repo_url = 'https://opendev.org/airship/%s' % repo_name _repo_path = git.git_handler(repo_url, ref=repo_rev) repo_path = os.path.join(_repo_path, 'deployment_files')