Update basic template schema in scratch catalog step

A basic schema underwent a breaking change in new opm version and needs
to be updated in the build scratch catalog task.

JIRA: ISV-5164

Signed-off-by: Ales Raszka <[email protected]>

Author: Allda

ansible/inventory/group_vars/operator-pipeline-integration-tests.yml

@@ -24,7 +24,7 @@ integration_tests_src_operator_git_branch: e2e-test-operator
 integration_tests_src_operator_package_name: test-e2e-operator
 integration_tests_src_operator_bundle_version: 0.0.8
 
-integration_tests_ocp_versions_range: "=v4.14"
+integration_tests_ocp_versions_range: "=v4.15"
 
 integration_tests_fbc_catalog: false
 integration_tests_verify_bundle_in_catalog: true

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

@@ -89,10 +89,14 @@ def generate_and_save_basic_template(  # pylint: disable=too-many-arguments
     }
 
     bundles = {"schema": "olm.bundle", "image": bundle_pullspec}
+    template = {
+        "schema": "olm.template.basic",
+        "entries": [package_obj, channel, bundles],
+    }
 
     with open(template_path, "w", encoding="utf-8") as f:
-        yaml.safe_dump_all(
-            [package_obj, channel, bundles],
+        yaml.safe_dump(
+            template,
             f,
             explicit_start=True,
             indent=2,

operator-pipeline-images/tests/entrypoints/test_build_scratch_catalog.py

@@ -10,8 +10,8 @@ def test_setup_argparser() -> None:
     assert build_scratch_catalog.setup_argparser() is not None
 
 
-@patch("operatorcert.entrypoints.build_scratch_catalog.yaml.safe_dump_all")
-def test_generate_and_save_basic_template(mock_yaml_dump_all: MagicMock) -> None:
+@patch("operatorcert.entrypoints.build_scratch_catalog.yaml.safe_dump")
+def test_generate_and_save_basic_template(mock_yaml_dump: MagicMock) -> None:
     with patch(
         "operatorcert.entrypoints.build_scratch_catalog.open", mock.mock_open()
     ) as mock_open:
@@ -37,10 +37,14 @@ def test_generate_and_save_basic_template(mock_yaml_dump_all: MagicMock) -> None
     }
 
     bundles = {"schema": "olm.bundle", "image": "bundle_pullspec"}
+    template = {
+        "schema": "olm.template.basic",
+        "entries": [package_obj, channel, bundles],
+    }
 
     mock_open.assert_called_once_with("template.yaml", "w", encoding="utf-8")
-    mock_yaml_dump_all.assert_called_once_with(
-        [package_obj, channel, bundles],
+    mock_yaml_dump.assert_called_once_with(
+        template,
         mock_open.return_value,
         explicit_start=True,
         indent=2,