Set galaxy to old-galaxy for community tools and tests. (#1911)

No-Issue --------- Signed-off-by: James Tanner <tanner.jc@gmail.com>
ansible · Oct 2, 2023 · cc59441 · cc59441
1 parent cecf61a
commit cc59441
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 7 deletions.
diff --git a/galaxy_ng/app/api/v1/serializers.py b/galaxy_ng/app/api/v1/serializers.py
@@ -399,7 +399,7 @@ class LegacySyncSerializer(serializers.Serializer):
 
     baseurl = serializers.CharField(
         required=False,
-        default='https://galaxy.ansible.com/api/v1/roles/'
+        default='https://old-galaxy.ansible.com/api/v1/roles/'
     )
     github_user = serializers.CharField(required=False)
     role_name = serializers.CharField(required=False)

diff --git a/galaxy_ng/app/management/commands/sync-collection-download-counts.py b/galaxy_ng/app/management/commands/sync-collection-download-counts.py
@@ -13,7 +13,7 @@
 log = logging.getLogger(__name__)
 
 
-DEFAULT_UPSTREAM = 'https://galaxy.ansible.com'
+DEFAULT_UPSTREAM = 'https://old-galaxy.ansible.com'
 
 SKIPLIST = [
     'larrymou9',

diff --git a/galaxy_ng/app/utils/galaxy.py b/galaxy_ng/app/utils/galaxy.py
@@ -82,7 +82,7 @@ def find_namespace(baseurl=None, name=None, id=None):
 
     logger.info(f'baseurl1: {baseurl}')
     if baseurl is None or not baseurl:
-        baseurl = 'https://galaxy.ansible.com'
+        baseurl = 'https://old-galaxy.ansible.com'
     baseurl += '/api/v1/namespaces'
     logger.info(f'baseurl2: {baseurl}')
 
@@ -151,7 +151,7 @@ def upstream_namespace_iterator(
     """Abstracts the pagination of v2 collections into a generator with error handling."""
     logger.info(f'baseurl1: {baseurl}')
     if baseurl is None or not baseurl:
-        baseurl = 'https://galaxy.ansible.com/api/v1/namespaces'
+        baseurl = 'https://old-galaxy.ansible.com/api/v1/namespaces'
     if not baseurl.rstrip().endswith('/api/v1/namespaces'):
         baseurl = baseurl.rstrip() + '/api/v1/namespaces'
     logger.info(f'baseurl2: {baseurl}')
@@ -228,7 +228,7 @@ def upstream_collection_iterator(
     """Abstracts the pagination of v2 collections into a generator with error handling."""
     logger.info(f'baseurl1: {baseurl}')
     if baseurl is None or not baseurl:
-        baseurl = 'https://galaxy.ansible.com/api/v2/collections'
+        baseurl = 'https://old-galaxy.ansible.com/api/v2/collections'
     logger.info(f'baseurl2: {baseurl}')
 
     # normalize the upstream url
@@ -411,7 +411,7 @@ def upstream_role_iterator(
     """Abstracts the pagination of v1 roles into a generator with error handling."""
     logger.info(f'baseurl1: {baseurl}')
     if baseurl is None or not baseurl:
-        baseurl = 'https://galaxy.ansible.com/api/v1/roles'
+        baseurl = 'https://old-galaxy.ansible.com/api/v1/roles'
     logger.info(f'baseurl2: {baseurl}')
 
     # normalize the upstream url

diff --git a/galaxy_ng/tests/integration/cli/test_community_sync.py b/galaxy_ng/tests/integration/cli/test_community_sync.py
@@ -25,7 +25,7 @@ def test_community_collection_download_count_sync(ansible_config):
 
     # pick an upstream collection at random that does not exist locally ...
     sync_collection = None
-    base_url = 'https://galaxy.ansible.com'
+    base_url = 'https://old-galaxy.ansible.com'
     next_url = base_url + '/api/v2/collections/'
     while next_url:
         rr = requests.get(next_url)

diff --git a/galaxy_ng/tests/integration/community/test_community_namespace_rbac.py b/galaxy_ng/tests/integration/community/test_community_namespace_rbac.py
@@ -474,3 +474,9 @@ def test_social_user_sync_with_changed_login(ansible_config):
 @pytest.mark.deployment_community
 def test_rbac_utils_get_owned_v3_namespaces(ansible_config):
     pass
+
+
+@pytest.mark.skip(reason='this should be unit tested')
+@pytest.mark.deployment_community
+def test_community_tools_urls(ansible_config):
+    pass