init

Author: omer-vishlitzky

components.yaml

@@ -11,6 +11,10 @@ components:
     name: openshift/assisted-service
     image_pattern: quay.io/edge-infrastructure/assisted-service
     versioning_selection_mechanism: commit
+  - repository: https://github.com/openshift/assisted-service
+    name: openshift/assisted-service-el8
+    image_pattern: quay.io/edge-infrastructure/assisted-service-el8
+    versioning_selection_mechanism: commit
   - repository: https://github.com/openshift/assisted-image-service
     name: openshift/assisted-image-service
     image_pattern: quay.io/edge-infrastructure/assisted-image-service

hack/versions-management/core/clients/image_registry_client.py

@@ -18,3 +18,22 @@ def exists(self, image: str, tag: str) -> bool:
         except Exception as e:
             logger.error(f"Error checking image {image} existence: {e}")
             return False
+
+    def resolve_digest(self, image: str, tag: str) -> str | None:
+        path = image.replace("quay.io/", "")
+        url = f"{self.registry_url}/v2/{path}/manifests/{tag}"
+        headers = {"Accept": "application/vnd.docker.distribution.manifest.v2+json"}
+
+        try:
+            response = requests.get(url, headers=headers)
+            if response.status_code == 200:
+                digest = response.headers.get("Docker-Content-Digest")
+                if digest:
+                    return digest
+                else:
+                    logger.warning(f"No digest found in headers for {image}:{tag}")
+            else:
+                logger.warning(f"Failed to resolve digest: {image}:{tag} (status code {response.status_code})")
+        except Exception as e:
+            logger.error(f"Error resolving digest for {image}:{tag}: {e}")
+        return None

hack/versions-management/core/repositories/version_repository.py

@@ -11,7 +11,7 @@ def __init__(self, file_path: str):
 
     def find_all(self) -> list[Version]:
         if not os.path.isfile(self.file_path):
-            return []
+            raise Exception("versions.yaml file is required")
         with open(self.file_path, "r") as f:
             data = self.yaml.load(f)
             try:

hack/versions-management/core/services/ansible_test_runner_service.py

@@ -2,7 +2,6 @@
 import os
 from dataclasses import replace
 from typing import override
-from zlib import compressobj
 
 from core.clients.ansible_client import AnsibleClient
 from core.models import Snapshot
@@ -29,7 +28,7 @@ def run(self) -> None:
         self.export_env(pending_snapshot)
 
         try:
-            self.ansible.run_playbook("test/ansible/run_test.yaml", "test/ansible/inventory.yaml")
+            self.ansible.run_playbook("test/playbooks/run_test.yaml", "test/playbooks/inventories/remote_host.yaml")
             updated = replace(pending_snapshot.metadata, status="successful")
         except Exception:
             updated = replace(pending_snapshot.metadata, status="failed")
@@ -42,6 +41,7 @@ def export_env(self, snapshot: Snapshot) -> None:
             "kubernetes-sigs/cluster-api": "CAPI_VERSION",
             "metal3-io/cluster-api-provider-metal3": "CAPM3_VERSION",
             "quay.io/edge-infrastructure/assisted-service": "ASSISTED_SERVICE_IMAGE",
+            "quay.io/edge-infrastructure/assisted-service-el8": "ASSISTED_SERVICE_EL8_IMAGE",
             "quay.io/edge-infrastructure/assisted-image-service": "ASSISTED_IMAGE_SERVICE_IMAGE",
             "quay.io/edge-infrastructure/assisted-installer-agent": "ASSISTED_INSTALLER_AGENT_IMAGE",
             "quay.io/edge-infrastructure/assisted-installer-controller": "ASSISTED_INSTALLER_CONTROLLER_IMAGE",
@@ -56,10 +56,12 @@ def export_env(self, snapshot: Snapshot) -> None:
                         os.environ[env_key] = comp.ref
                         self.logger.info(f"Exported {env_key}={comp.ref}")
                 case "commit":
-                    image_key = comp.image_url.split(":")[0]
+                    image_key = comp.image_url.split("@")[0]
                     env_key = name_map.get(image_key)
                     if env_key:
                         os.environ[env_key] = comp.image_url
                         self.logger.info(f"Exported {env_key}={comp.image_url}")
+                    else:
+                        self.logger.warning(f"No environment variable mapping found for {comp.name}")
                 case _:
-                    raise Exception("Unsupported versioning selection mechanism")
+                    raise Exception(f"Unsupported versioning selection mechanism: {comp.versioning_selection_mechanism}") 

hack/versions-management/core/services/tag_reconciliation_service.py

@@ -10,7 +10,7 @@ class TagReconciliationService(Service):
     def __init__(self, versions_file_path: str, dry_run: bool):
         self.github: GitHubClient = GitHubClient()
         self.versions_repo: VersionRepository = VersionRepository(versions_file_path)
-        self.logger: logging.Logger = setup_logger("TagReconcilerService")
+        self.logger: logging.Logger = setup_logger("TagReconciliationService")
         self.dry_run: bool = dry_run
 
     @override

hack/versions-management/core/services/version_discovery_service.py

@@ -1,7 +1,6 @@
 import hashlib
 import logging
 from datetime import datetime
-from os import name
 from typing import override
 from concurrent.futures import ThreadPoolExecutor
 
@@ -75,20 +74,20 @@ def process_repository(
                         name=component.name,
                         image_url=None,
                     )
-            elif component.versioning_selection_mechanism == "commit":
+            elif component.versioning_selection_mechanism == "commit" and img_pattern:
                 self.logger.info(f"Checking commits of component {component.name}")
                 for commit in gh_repo.get_commits()[:20]:
                     sha = commit.sha
                     tag = f"latest-{sha}"
-                    img = f"{img_pattern}"
-                    if self.registry.exists(img, tag):
+                    if self.registry.exists(img_pattern, tag):
+                        digest = self.registry.resolve_digest(img_pattern, tag)
                         self.logger.info(f"Found commit {sha} for repository {repo}")
                         return Artifact(
                             repository=f"https://github.com/{repo}",
                             ref=sha,
                             versioning_selection_mechanism=component.versioning_selection_mechanism,
                             name=component.name,
-                            image_url=f"{img}:{tag}",
+                            image_url=f"{img_pattern}@{digest}",
                         )
             else:
                 raise Exception(f"Versioning mechanism of component {component.repository} is not supported")

hack/versions-management/test/assets/components.yaml

@@ -11,6 +11,10 @@ components:
     name: openshift/assisted-service
     image_pattern: quay.io/edge-infrastructure/assisted-service
     versioning_selection_mechanism: commit
+  - repository: https://github.com/openshift/assisted-service
+    name: openshift/assisted-service-el8
+    image_pattern: quay.io/edge-infrastructure/assisted-service-el8
+    versioning_selection_mechanism: commit
   - repository: https://github.com/openshift/assisted-image-service
     name: openshift/assisted-image-service
     image_pattern: quay.io/edge-infrastructure/assisted-image-service

hack/versions-management/test/assets/release-candidates.yaml

@@ -19,6 +19,11 @@ snapshots:
         name: openshift/assisted-service
         versioning_selection_mechanism: commit
         image_url: quay.io/edge-infrastructure/assisted-service:latest-76d29d2a7f0899dcede9700fc88fcbad37b6ccca
+      - repository: https://github.com/openshift/assisted-service
+        ref: 76d29d2a7f0899dcede9700fc88fcbad37b6ccca
+        name: openshift/assisted-service-el8
+        versioning_selection_mechanism: commit
+        image_url: quay.io/edge-infrastructure/assisted-service-el8:latest-76d29d2a7f0899dcede9700fc88fcbad37b6ccca
       - repository: https://github.com/openshift/assisted-image-service
         ref: 2249c85d05600191b24e93dd92e733d49a1180ec
         name: openshift/assisted-image-service

hack/versions-management/test/assets/versions.yaml

@@ -16,6 +16,11 @@ versions:
       name: openshift/assisted-service
       versioning_selection_mechanism: commit
       image_url: quay.io/edge-infrastructure/assisted-service:latest-76d29d2a7f0899dcede9700fc88fcbad37b6ccca
+    - repository: https://github.com/openshift/assisted-service
+      ref: 76d29d2a7f0899dcede9700fc88fcbad37b6ccca
+      name: openshift/assisted-service-el8
+      versioning_selection_mechanism: commit
+      image_url: quay.io/edge-infrastructure/assisted-service-el8:latest-76d29d2a7f0899dcede9700fc88fcbad37b6ccca
     - repository: https://github.com/openshift/assisted-image-service
       ref: 2249c85d05600191b24e93dd92e733d49a1180ec
       name: openshift/assisted-image-service

hack/versions-management/test/repositories/test_release_repository.py

@@ -31,14 +31,15 @@ def test_release_repository_find_all(snapshots_file):
     assert snapshot.metadata.status == "pending"
     assert snapshot.metadata.generated_at == datetime.fromisoformat("2025-03-10T10:32:04.642635")
 
-    assert len(snapshot.artifacts) == 7
+    assert len(snapshot.artifacts) == 8
     assert snapshot.artifacts[0].repository == "https://github.com/kubernetes-sigs/cluster-api"
     assert snapshot.artifacts[1].repository == "https://github.com/metal3-io/cluster-api-provider-metal3"
     assert snapshot.artifacts[2].repository == "https://github.com/openshift/assisted-service"
-    assert snapshot.artifacts[3].repository == "https://github.com/openshift/assisted-image-service"
-    assert snapshot.artifacts[4].repository == "https://github.com/openshift/assisted-installer-agent"
-    assert snapshot.artifacts[5].repository == "https://github.com/openshift/assisted-installer"
+    assert snapshot.artifacts[3].repository == "https://github.com/openshift/assisted-service"
+    assert snapshot.artifacts[4].repository == "https://github.com/openshift/assisted-image-service"
+    assert snapshot.artifacts[5].repository == "https://github.com/openshift/assisted-installer-agent"
     assert snapshot.artifacts[6].repository == "https://github.com/openshift/assisted-installer"
+    assert snapshot.artifacts[7].repository == "https://github.com/openshift/assisted-installer"
 
 
 def test_release_repository_find_by_id(snapshots_file):

hack/versions-management/test/repositories/test_version_repository.py

@@ -23,7 +23,7 @@ def test_version_repository_find_all(versions_file):
     version = versions[0]
 
     assert version.name == "v0.0.1"
-    assert len(version.artifacts) == 7
+    assert len(version.artifacts) == 8
 
     assert version.artifacts[0].repository == "https://github.com/kubernetes-sigs/cluster-api"
     assert version.artifacts[2].image_url.startswith("quay.io/edge-infrastructure/assisted-service")
@@ -36,3 +36,11 @@ def test_invalid_versions_file_schema(tmp_path):
     repo = VersionRepository(str(bad_file))
     with pytest.raises(ValueError, match="Invalid versions.yaml structure"):
         repo.find_all()
+
+
+def test_non_existent_versions_file(tmp_path):
+    non_existent_file = tmp_path / "non_existent.yaml"
+
+    repo = VersionRepository(str(non_existent_file))
+    with pytest.raises(Exception, match="versions.yaml file is required"):
+        repo.find_all()

hack/versions-management/test/services/test_ansible_test_runner_service.py

@@ -107,35 +107,42 @@ def service_with_pending(snapshots_file):
                         ref="ref",
                         name="openshift/assisted-service",
                         versioning_selection_mechanism="commit",
-                        image_url="quay.io/edge-infrastructure/assisted-service:latest-tag"
+                        image_url="quay.io/edge-infrastructure/assisted-service@sha256:latestref"
+                    ),
+                    Artifact(
+                        repository="https://github.com/openshift/assisted-service",
+                        ref="ref",
+                        name="openshift/assisted-service-el8",
+                        versioning_selection_mechanism="commit",
+                        image_url="quay.io/edge-infrastructure/assisted-service-el8@sha256:latestref"
                     ),
                     Artifact(
                         repository="https://github.com/openshift/assisted-image-service",
                         ref="ref",
                         name="openshift/assisted-image-service",
                         versioning_selection_mechanism="commit",
-                        image_url="quay.io/edge-infrastructure/assisted-image-service:latest-tag"
+                        image_url="quay.io/edge-infrastructure/assisted-image-service@sha256:latestref"
                     ),
                     Artifact(
                         repository="https://github.com/openshift/assisted-installer-agent",
                         ref="ref",
                         name="openshift/assisted-installer-agent",
                         versioning_selection_mechanism="commit",
-                        image_url="quay.io/edge-infrastructure/assisted-installer-agent:latest-tag"
+                        image_url="quay.io/edge-infrastructure/assisted-installer-agent@sha256:latestref"
                     ),
                     Artifact(
                         repository="https://github.com/openshift/assisted-installer",
                         ref="ref",
                         name="openshift/assisted-installer-controller",
                         versioning_selection_mechanism="commit",
-                        image_url="quay.io/edge-infrastructure/assisted-installer-controller:latest-tag"
+                        image_url="quay.io/edge-infrastructure/assisted-installer-controller@sha256:latestref"
                     ),
                     Artifact(
                         repository="https://github.com/openshift/assisted-installer",
                         ref="ref",
                         name="openshift/assisted-installer",
                         versioning_selection_mechanism="commit",
-                        image_url="quay.io/edge-infrastructure/assisted-installer:latest-tag"
+                        image_url="quay.io/edge-infrastructure/assisted-installer@sha256:latestref"
                     )
                 ]
             )
@@ -156,26 +163,27 @@ def test_export_env_variables(service_with_pending):
 
         assert os.environ.get("CAPI_VERSION") == "ref"
         assert os.environ.get("CAPM3_VERSION") == "ref"
-        assert os.environ.get("ASSISTED_SERVICE_IMAGE") == "quay.io/edge-infrastructure/assisted-service:latest-tag"
-        assert os.environ.get("ASSISTED_IMAGE_SERVICE_IMAGE") == "quay.io/edge-infrastructure/assisted-image-service:latest-tag"
-        assert os.environ.get("ASSISTED_INSTALLER_AGENT_IMAGE") == "quay.io/edge-infrastructure/assisted-installer-agent:latest-tag"
-        assert os.environ.get("ASSISTED_INSTALLER_CONTROLLER_IMAGE") == "quay.io/edge-infrastructure/assisted-installer-controller:latest-tag"
-        assert os.environ.get("ASSISTED_INSTALLER_IMAGE") == "quay.io/edge-infrastructure/assisted-installer:latest-tag"
+        assert os.environ.get("ASSISTED_SERVICE_IMAGE") == "quay.io/edge-infrastructure/assisted-service@sha256:latestref"
+        assert os.environ.get("ASSISTED_SERVICE_EL8_IMAGE") == "quay.io/edge-infrastructure/assisted-service-el8@sha256:latestref"
+        assert os.environ.get("ASSISTED_IMAGE_SERVICE_IMAGE") == "quay.io/edge-infrastructure/assisted-image-service@sha256:latestref"
+        assert os.environ.get("ASSISTED_INSTALLER_AGENT_IMAGE") == "quay.io/edge-infrastructure/assisted-installer-agent@sha256:latestref"
+        assert os.environ.get("ASSISTED_INSTALLER_CONTROLLER_IMAGE") == "quay.io/edge-infrastructure/assisted-installer-controller@sha256:latestref"
+        assert os.environ.get("ASSISTED_INSTALLER_IMAGE") == "quay.io/edge-infrastructure/assisted-installer@sha256:latestref"
 
 
 def test_successful_test_run(service_with_pending):
     service_with_pending.run()
 
     # Verify playbook was run
     service_with_pending.ansible.run_playbook.assert_called_with(
-        "test/ansible/run_test.yaml", "test/ansible/inventory.yaml"
+        "test/playbooks/run_test.yaml", "test/playbooks/inventories/remote_host.yaml"
     )
 
     # Verify snapshot was updated
     assert service_with_pending.repo.update.call_count == 1
     updated_snapshot = service_with_pending.repo.update.call_args[0][0]
     assert updated_snapshot.metadata.status == "successful"
-    assert len(updated_snapshot.artifacts) == 7
+    assert len(updated_snapshot.artifacts) == 8
 
 
 def test_failed_test_run(service_with_pending):