[ISV-6605] Fix static-tests error message on incorrect replaces version

Author: RichardPlesnik

ansible/inventory/group_vars/operator-pipeline.yml

@@ -1,7 +1,7 @@
 ---
 ##### General settings
 ansible_connection: local
-ansible_python_interpreter: /usr/bin/python3
+ansible_python_interpreter: "{{ ansible_playbook_python }}"
 env: unset
 oc_namespace: "operator-pipeline-{{ env }}"
 oc_signing_namespace: "signing-pipeline-{{ env }}"

operator-pipeline-images/operatorcert/entrypoints/bulk_retrigger.py

@@ -23,7 +23,6 @@
 from github.Repository import Repository
 from github.PullRequest import PullRequest
 
-
 logger = logging.getLogger(__name__)
 
 

operator-pipeline-images/operatorcert/entrypoints/integration_tests.py

@@ -9,7 +9,6 @@
 
 from operatorcert.integration.runner import run_integration_tests
 
-
 LOGGER = logging.getLogger("operator-cert")
 
 

operator-pipeline-images/operatorcert/static_tests/community/bundle.py

@@ -343,6 +343,14 @@ def check_replaces_availability(bundle: Bundle) -> Iterator[CheckResult]:
         x.csv_operator_version: x.operator_version
         for x in bundle.operator.all_bundles()
     }
+
+    if replaces_version not in ver_to_dir:
+        yield Fail(
+            f"{bundle} attempts to replace version '{replaces_version}' which"
+            f" does not exist. Available versions: {sorted(ver_to_dir.keys())}"
+        )
+        return
+
     replaces_bundle = bundle.operator.bundle(ver_to_dir[replaces_version])
 
     ocp_versions_str = bundle.annotations.get("com.redhat.openshift.versions")

operator-pipeline-images/tests/integration/conftest.py

@@ -6,13 +6,11 @@
 @pytest.fixture
 def operator_pipelines_path(tmp_path: Path) -> Path:
     ansible_cfg = tmp_path / "ansible.cfg"
-    ansible_cfg.write_text(
-        """
+    ansible_cfg.write_text("""
 [defaults]
 roles_path=./ansible/roles
 inventory=./ansible/inventory/local
-"""
-    )
+""")
     roles_dir = tmp_path / "ansible" / "roles"
     inventory_dir = tmp_path / "ansible" / "inventory"
     playbooks_dir = tmp_path / "ansible" / "playbooks"
@@ -22,13 +20,11 @@ def operator_pipelines_path(tmp_path: Path) -> Path:
     inventory = inventory_dir / "local"
     inventory.write_text("localhost ansible_connection=local\n")
     site_playbook = playbooks_dir / "site.yml"
-    site_playbook.write_text(
-        """
+    site_playbook.write_text("""
 ---
 - hosts: localhost
   tasks: []
-"""
-    )
+""")
     return tmp_path
 
 

operator-pipeline-images/tests/static_tests/community/test_bundle.py

@@ -606,6 +606,34 @@ def test_check_replaces_availability(
     assert set(errors) == expected
 
 
+def test_check_replaces_availability_nonexistent_version(
+    tmp_path: Path,
+) -> None:
+    """Test that attempting to replace a non-existent version produces a clear error message"""
+    create_files(
+        tmp_path,
+        bundle_files("hello", "0.0.1"),
+        bundle_files(
+            "hello",
+            "0.0.2",
+            csv={"spec": {"replaces": "hello.v0.0.5"}},  # 0.0.5 doesn't exist
+        ),
+    )
+
+    repo = Repo(tmp_path)
+    operator = repo.operator("hello")
+    bundle = operator.bundle("0.0.2")
+    errors = list(check_replaces_availability(bundle))
+
+    assert len(errors) == 1
+    assert isinstance(errors[0], Fail)
+    assert (
+        "Bundle(hello/0.0.2) attempts to replace version '0.0.5' which does not exist"
+        in errors[0].reason
+    )
+    assert "Available versions:" in errors[0].reason
+
+
 @pytest.mark.parametrize(
     "files, bundle_to_check, expected",
     [

operator-pipeline-images/tests/test_tekton.py

@@ -40,8 +40,7 @@ def test_pipelinerun() -> None:
     assert str(pr.start_time) == "2021-11-10 18:38:09+00:00"
     assert pr.finally_taskruns == pr.taskruns[:2]
 
-    md = textwrap.dedent(
-        """
+    md = textwrap.dedent("""
         # Pipeline Summary
 
         Pipeline: *operator-hosted-pipeline*
@@ -60,7 +59,6 @@ def test_pipelinerun() -> None:
         | :heavy_check_mark: | bundle-path-validation | 2021-11-10 18:39:29+00:00 | 14 seconds |
         | :heavy_check_mark: | content-hash | 2021-11-10 18:39:46+00:00 | 17 seconds |
         | :x: | certification-project-check | 2021-11-10 18:39:46+00:00 | 17 seconds |
-    """
-    )
+    """)
 
     assert pr.markdown_summary() == md

pdm.lock

@@ -95,7 +95,7 @@ build-backend = "pdm.pep517.api"
 [project.optional-dependencies]
 operatorcert-dev = [
     "black>=23.3.0",
-    "pytest>=7.3.2",
+    "pytest>=9.0.3",
     "pytest-cov>=4.1.0",
     "yamllint>=1.32.0",
     "requests-mock>=1.11.0",