more updates for kitten

AlmaLinux · Oct 17, 2024 · 92ca057 · 92ca057
1 parent 6eaa4f8
commit 92ca057
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/json_schemas/service_config/v3.json b/json_schemas/service_config/v3.json
@@ -91,7 +91,7 @@
         "Version": {
             "oneOf": [
                 {
-                    "pattern": "^[0-9]+(.[0-9]+(-beta)?)?$"
+                    "pattern": "^[0-9]+(.[0-9]+(-beta)?|(-kitten)?)?$"
                 }
             ]
         },

diff --git a/utils.py b/utils.py
@@ -238,7 +238,7 @@ def _process_repo_attributes(
             # rules for major versions listed in duplicates will be used if found
             if version:
                 version = next((i for i in yaml_data['duplicated_versions'] if yaml_data['duplicated_versions'][i] == version), version)
-            if repo_arch not in attributes.get(version, list(set(val for sublist in attributes.values() for val in sublist))):
+            if repo_arch not in attributes.get(version, list(set(val for sublist in attributes.values() for val in sublist))) and repo_arch not in yaml_data['arches']:
                 raise ValidationError(
                     f'Attr "{repo_arch}" of repo "{repo_name}" is absent '
                     f'in the main list of attrs "{", ".join(attributes.get(version, list(set(val for sublist in attributes.values() for val in sublist))))}"'
@@ -672,7 +672,7 @@ async def optional_modules_available(
                 url_for_check = urljoin(
                     urljoin(
                         urljoin(
-                            mirror_info.mirror_url + '/',
+                            mirror_info.module_urls[module].get('http', mirror_info.module_urls[module].get('https', None)) + '/',
                             f'{ver}-{module}',
                         ) + '/',
                         repo_path,