Merge pull request #2642 from mbiarnes/re-use-microshift-advisory

ART-14766: re-use existing microshift advisory

Author: openshift-merge-bot[bot]

pyartcd/pyartcd/pipelines/build_microshift.py

@@ -115,6 +115,12 @@ async def run(self):
             # Check if microshift advisory is defined in assembly
             if ('microshift' not in advisories or advisories.get("microshift") <= 0) and not self.skip_prepare_advisory:
                 self.advisory_num = await self.create_microshift_advisory()
+                # Immediately save advisory to assembly config to prevent race conditions
+                self._logger.info("Saving advisory %s to assembly config", self.advisory_num)
+                pr_url = await self._create_or_update_pull_request(nvrs=None)
+                await self.slack_client.say_in_thread(
+                    f"Microshift advisory {self.advisory_num} saved to assembly: {pr_url}"
+                )
             await self._rebase_and_build_for_named_assembly()
             await self._trigger_microshift_sync()
             await self._trigger_build_microshift_bootc()
@@ -512,30 +518,55 @@ async def _rebase_and_build_rpm(
             record_log = parse_record_log(file)
             return record_log["build_rpm"][-1]["nvrs"].split(",")
 
-    def _pin_nvrs(self, nvrs: List[str], releases_config) -> Dict:
-        """Update releases.yml to pin the specified NVRs.
+    def _pin_nvrs(self, nvrs: Optional[List[str]], releases_config) -> Optional[Dict]:
+        """Update releases.yml to pin the advisory and optionally the specified NVRs.
+
+        If nvrs is None or empty, only saves the advisory number.
+
         Example:
             releases:
                 4.11.7:
                     assembly:
-                    members:
-                        rpms:
-                        - distgit_key: microshift
-                        metadata:
-                            is:
-                                el8: microshift-4.11.7-202209300751.p0.g7ebffc3.assembly.4.11.7.el8
+                        group:
+                            advisories:
+                                microshift: 12345
+                        members:
+                            rpms:
+                            - distgit_key: microshift
+                              metadata:
+                                is:
+                                    el8: microshift-4.11.7-202209300751.p0.g7ebffc3.assembly.4.11.7.el8
         """
+        # Always save advisory number if available
+        if self.advisory_num:
+            advisories = (
+                releases_config["releases"][self.assembly]
+                .setdefault("assembly", {})
+                .setdefault("group", {})
+                .setdefault("advisories", {})
+            )
+            existing = advisories.get("microshift")
+            if existing and existing > 0 and existing != self.advisory_num:
+                self._logger.warning(
+                    f"Assembly {self.assembly} already references microshift advisory {existing}; "
+                    f"adopting existing advisory instead of newly created advisory {self.advisory_num}."
+                )
+                self.advisory_num = existing
+            else:
+                advisories["microshift"] = self.advisory_num
+
+        # If no NVRs provided, we're done (advisory-only save)
+        if not nvrs:
+            return None
+
+        # Pin NVRs
         is_entry = {}
         dg_key = "microshift"
         for nvr in nvrs:
             el_version = isolate_el_version_in_release(nvr)
             assert el_version is not None
             is_entry[f"el{el_version}"] = nvr
 
-        if self.advisory_num:
-            releases_config["releases"][self.assembly].setdefault("assembly", {}).setdefault("group", {}).setdefault(
-                "advisories", {}
-            ).setdefault("microshift", self.advisory_num)
         rpms_entry = (
             releases_config["releases"][self.assembly]
             .setdefault("assembly", {})
@@ -549,10 +580,17 @@ def _pin_nvrs(self, nvrs: List[str], releases_config) -> Dict:
         microshift_entry.setdefault("metadata", {})["is"] = is_entry
         return microshift_entry
 
-    async def _create_or_update_pull_request(self, nvrs: List[str]):
+    async def _create_or_update_pull_request(self, nvrs: Optional[List[str]] = None):
         branch = f"auto-pin-microshift-{self.group}-{self.assembly}"
-        title = f"Pin microshift build for {self.group} {self.assembly}"
-        body = f"Created by job run {jenkins.get_build_url()}"
+
+        # Determine PR title and body based on what we're saving
+        if nvrs:
+            title = f"Pin microshift build for {self.group} {self.assembly}"
+            body = f"Pinning builds: {', '.join(nvrs)}\nCreated by job run {jenkins.get_build_url()}"
+        else:
+            title = f"Add microshift advisory for {self.group} {self.assembly}"
+            body = f"Advisory {self.advisory_num} created by job run {jenkins.get_build_url()}"
+
         if self.runtime.dry_run:
             self._logger.warning(
                 "[DRY RUN] Would have created pull-request with head '%s', title '%s', body '%s'",
@@ -561,28 +599,37 @@ async def _create_or_update_pull_request(self, nvrs: List[str]):
                 body,
             )
             return "https://github.example.com/foo/bar/pull/1234"
+
         upstream_repo = self.github_client.get_repo("openshift-eng/ocp-build-data")
         release_file_content = yaml.load(upstream_repo.get_contents("releases.yml", ref=self.group).decoded_content)
         source_file_content = copy.deepcopy(release_file_content)
         self._pin_nvrs(nvrs, release_file_content)
+
         if source_file_content == release_file_content:
-            self._logger.warning("PR is not created: upstream already updated, nothing to change.")
+            self._logger.info("PR is not created: upstream already updated, nothing to change.")
             return "Nothing to change"
+
+        # Delete branch if it exists
         for b in upstream_repo.get_branches():
             if b.name == branch:
                 upstream_repo.get_git_ref(f"heads/{branch}").delete()
+
+        # Create branch and commit changes
         upstream_repo.create_git_ref(f"refs/heads/{branch}", upstream_repo.get_branch(self.group).commit.sha)
         output = io.BytesIO()
         yaml.dump(release_file_content, output)
         output.seek(0)
         fork_file = upstream_repo.get_contents("releases.yml", ref=branch)
         upstream_repo.update_file("releases.yml", body, output.read(), fork_file.sha, branch=branch)
-        # create pr
+
+        # Create and merge PR
         try:
             pr = upstream_repo.create_pull(title=title, body=body, base=self.group, head=branch)
             pr.merge()
+            self._logger.info("PR created and merged: %s", pr.html_url)
         except GithubException as e:
             self._logger.warning(f"Failed to create pr: {e}")
+            raise
         return pr.html_url
 
     async def _notify_microshift_alerts(self, version_release: str):