Allow update of multiple operator catalogs

Author: RichardPlesnik

ansible/roles/operator-pipeline/templates/openshift/pipelines/operator-ci-pipeline.yml

@@ -223,6 +223,8 @@ spec:
           value: "$(params.pipeline_image)"
         - name: operator_path
           value: "$(tasks.bundle-path-validation.results.package_path)"
+        - name: affected_operators
+          value: "$(tasks.bundle-path-validation.results.package_name)"
       workspaces:
         - name: source
           workspace: pipeline

ansible/roles/operator-pipeline/templates/openshift/pipelines/operator-hosted-pipeline.yml

@@ -527,6 +527,8 @@ spec:
           value: "$(params.pipeline_image)"
         - name: operator_path
           value: "$(tasks.detect-changes.results.operator_path)"
+        - name: affected_operators
+          value: "$(tasks.detect-changes.results.affected_operators)"
         - name: cert_project_required
           value: "$(params.cert_project_required)"
       workspaces:
@@ -1037,8 +1039,8 @@ spec:
         - input: "$(tasks.certification-project-check.results.certification_project_id)"
           operator: "notin"
           values: [""]
-        - input: "$(tasks.detect-changes.results.affected_catalogs)"
-          operator: in
+        - input: "$(tasks.detect-changes.results.added_or_modified_bundles)"
+          operator: "notin"
           values: [""]
       params:
         - name: pipeline_image

ansible/roles/operator-pipeline/templates/openshift/pipelines/operator-release-pipeline.yml

@@ -278,6 +278,8 @@ spec:
           value: "$(params.pipeline_image)"
         - name: operator_path
           value: "$(tasks.detect-changes.results.operator_path)"
+        - name: affected_operators
+          value: "$(tasks.detect-changes.results.affected_operators)"
         - name: cert_project_required
           value: "$(params.cert_project_required)"
       workspaces:

ansible/roles/operator-pipeline/templates/openshift/tasks/cert-project-check.yml

@@ -9,6 +9,8 @@ spec:
     - name: operator_path
       description: path indicating the location of the certified operator within the repository
       default: ""
+    - name: affected_operators
+      description: Comma separated list of affected operators
     - name: cert_project_required
       description: A flag determines whether a cert project ID needs to be present
       default: "true"
@@ -37,13 +39,21 @@ spec:
           exit 1
         fi
 
-        CI_FILE_PATH="$(params.operator_path)/ci.yaml"
+        IFS=',' read -ra operator_array <<< "$(params.affected_operators)"  # Load string of comma separated operators into list
+        for operator_name in $(printf "%s\n" "${operator_array[@]}" | tac); do  # Loop backwards to save reference to first cert_proejct in the end
+          file_path="operators/$operator_name/ci.yaml"
 
-        CERT_PROJECT_ID=$(cat $CI_FILE_PATH | yq -r '.cert_project_id | select (.!=null)')
+          if [ ! -f "$file_path" ]; then
+            echo "File '$file_path' not found."
+            exit 1
+          fi
 
-        if [ -z $CERT_PROJECT_ID ]; then
-          echo "Certification project ID is missing in ci.yaml file (cert_project_id)"
-          exit 1
-        fi
+          CERT_PROJECT_ID=$(cat "$file_path" | yq -r '.cert_project_id | select (.!=null)')
+
+          if [ -z "$CERT_PROJECT_ID" ]; then
+            echo "Certification project ID is missing in '$file_path' file (cert_project_id)"
+            exit 1
+          fi
+        done
 
-        echo -n $CERT_PROJECT_ID | tee $(results.certification_project_id.path)
+        echo -n "$CERT_PROJECT_ID" | tee "$(results.certification_project_id.path)"

ansible/roles/operator-pipeline/templates/openshift/tasks/parse-repo-changes.yml

@@ -24,6 +24,10 @@ spec:
       description: Path to the operator containing the new bundle
     - name: bundle_path
       description: Path to the new bundle
+    - name: affected_operators
+      description: Comma separated list of affected operators
+    - name: added_or_modified_bundles
+      description: Comma separated list of added or updated bundles
     - name: affected_catalogs
       description: Comma separated list of updated catalogs
     - name: added_or_modified_catalogs
@@ -83,6 +87,12 @@ spec:
         affected_catalogs="$(jq -r '.affected_catalogs | join(",")' < changes.json)"
         echo -n $affected_catalogs > "$(results.affected_catalogs.path)"
 
+        affected_operators="$(jq -r '.affected_operators | join(",")' < changes.json)"
+        echo -n $affected_operators > "$(results.affected_operators.path)"
+
+        added_or_modified_bundles="$(jq -r '.added_or_modified_bundles | join(",")' < changes.json)"
+        echo -n $added_or_modified_bundles > "$(results.added_or_modified_bundles.path)"
+
         added_or_modified_catalogs="$(jq -r '.added_or_modified_catalogs | join(",")' < changes.json)"
         echo -n $added_or_modified_catalogs > "$(results.added_or_modified_catalogs.path)"
 

operator-pipeline-images/operatorcert/parsed_file.py

@@ -249,9 +249,12 @@ def check_extra_files(self) -> None:
 
     def check_affected_operators(self) -> None:
         """
-        The PR should affect at most one operator
+        The PR should affect at most one operator unless only non-bundle files are updated.
         """
-        if len(self.object.affected_operators.union) > 1:
+        if (
+            len(self.object.affected_operators.union) > 1
+            and len(self.object.affected_bundles.union) != 0
+        ):
             self.errors.append(
                 "The PR affects more than one operator: "
                 f"{sorted(self.object.affected_operators.union)}"
@@ -349,8 +352,7 @@ def check_added_bundles(self) -> None:
 
     def check_affected_catalog_operators(self) -> None:
         """
-        Check if the PR affects at most one catalog operator and PR doesn't contains
-        catalog changes and operator changes
+        Check if the PR doesn't contains catalog changes and operator changes at the same time.
         """
         added_or_modified_bundles = (
             self.object.affected_bundles.added | self.object.affected_bundles.modified
@@ -363,18 +365,6 @@ def check_affected_catalog_operators(self) -> None:
                 f"({sorted(self.object.affected_catalog_operators.union)}) at the same time. "
                 "Split operator and catalog changes into 2 separate pull requests."
             )
-        catalog_operators = sorted(
-            list(
-                {
-                    operator[1]
-                    for operator in self.object.affected_catalog_operators.union
-                }
-            )
-        )
-        if len(catalog_operators) > 1:
-            self.errors.append(
-                f"The PR affects more than one catalog operator: {catalog_operators}"
-            )
 
     def validate(self) -> None:
         """

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

@@ -496,9 +496,19 @@ def test_github_pr_affected_files_invalid_url(
                 "extra_files": [],
                 "added_operators": ["operator-e2e", "operator-clone-e2e"],
             },
+            True,
+            None,
+            id="Multiple operators - no bundle change",
+        ),
+        pytest.param(
+            {
+                "extra_files": [],
+                "added_operators": ["operator-e2e", "operator-clone-e2e"],
+                "added_bundles": [("operator-e2e", "0.0.101")],
+            },
             False,
             "The PR affects more than one operator: ['operator-clone-e2e', 'operator-e2e']",
-            id="Multiple operators",
+            id="Multiple operators - with bundle change",
         ),
         pytest.param(
             {
@@ -526,17 +536,17 @@ def test_github_pr_affected_files_invalid_url(
                     ("v4.15", "operator-2"),
                 ],
             },
-            False,
-            "The PR affects more than one catalog operator: ['operator-1', 'operator-2']",
+            True,
+            None,
             id="Multiple catalog operators",
         ),
         pytest.param(
             {
                 "extra_files": ["empty.txt", "operators/empty.txt"],
-                "added_operators": ["operator-e2e", "operator-clone-e2e"],
+                "added_bundles": ["operator-e2e", "operator-clone-e2e"],
             },
             False,
-            "The PR affects more than one operator: ['operator-clone-e2e', 'operator-e2e']\n"
+            "The PR affects more than one bundle: ['operator-clone-e2e', 'operator-e2e']\n"
             "The PR affects non-operator files: ['empty.txt', 'operators/empty.txt']",
             id="Multiple issues",
         ),
@@ -578,6 +588,19 @@ def test_github_pr_affected_files_invalid_url(
             None,
             id="Add operator catalog",
         ),
+        pytest.param(
+            {
+                "added_catalog_operators": [
+                    ("v4.15", "operator-e2e"),
+                    ("v4.15", "operator-e2e"),
+                ],
+                "modified_operators": ["operator-e2e", "operator-clone-e2e"],
+                "modified_bundles": [],
+            },
+            True,
+            None,
+            id="Modify two operators' non-bundle files and their catalogs.",
+        ),
     ],
 )
 def test_ParserRules_validate(