Merge pull request #111 from rtibblesbot/issue-107-0a1e6e

Add wait-for-builds polling for Launchpad build completion

Author: rtibbles

.github/workflows/build_debian.yml

@@ -5,6 +5,8 @@ on:
 jobs:
   check_version:
     runs-on: ubuntu-latest
+    outputs:
+      version: ${{ steps.version.outputs.VERSION }}
     steps:
       - name: Checkout codebase
         uses: actions/checkout@v4
@@ -50,8 +52,35 @@ jobs:
           echo "Signing package..."
           make sign-and-upload
           echo "upload completed successfully!"
+  wait_for_source_builds:
+    needs:
+      - check_version
+      - build_package
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout codebase
+        uses: actions/checkout@v4
+      - name: Install dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y python3-launchpadlib
+      - name: Write Launchpad credentials
+        env:
+          LP_CREDENTIALS: ${{ secrets.LP_CREDENTIALS }}
+        run: |
+          echo "$LP_CREDENTIALS" > /tmp/lp-creds.txt
+      - name: Wait for source package builds
+        env:
+          LP_CREDENTIALS_FILE: /tmp/lp-creds.txt
+        run: |
+          python3 scripts/launchpad_copy.py wait-for-builds \
+            --package kolibri-server \
+            --version "${{ needs.check_version.outputs.version }}"
+      - name: Cleanup Launchpad credentials
+        if: always()
+        run: rm -f /tmp/lp-creds.txt
   copy_to_other_distributions:
-    needs: build_package
+    needs: wait_for_source_builds
     runs-on: ubuntu-latest
     steps:
       - name: Checkout codebase
@@ -73,10 +102,37 @@ jobs:
       - name: Cleanup Launchpad credentials
         if: always()
         run: rm -f /tmp/lp-creds.txt
+  wait_for_copy_builds:
+    needs:
+      - check_version
+      - copy_to_other_distributions
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout codebase
+        uses: actions/checkout@v4
+      - name: Install dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y python3-launchpadlib
+      - name: Write Launchpad credentials
+        env:
+          LP_CREDENTIALS: ${{ secrets.LP_CREDENTIALS }}
+        run: |
+          echo "$LP_CREDENTIALS" > /tmp/lp-creds.txt
+      - name: Wait for copy builds to complete
+        env:
+          LP_CREDENTIALS_FILE: /tmp/lp-creds.txt
+        run: |
+          python3 scripts/launchpad_copy.py wait-for-builds \
+            --package kolibri-server \
+            --version "${{ needs.check_version.outputs.version }}"
+      - name: Cleanup Launchpad credentials
+        if: always()
+        run: rm -f /tmp/lp-creds.txt
   block_release_step:
     if: ${{ !github.event.release.prerelease }}
     name: Job to block publish of a release until it has been manually approved
-    needs: copy_to_other_distributions
+    needs: wait_for_copy_builds
     runs-on: ubuntu-latest
     environment: release
     steps:

pyproject.toml

@@ -1,3 +1,18 @@
+[project]
+name = "kolibri-server"
+version = "0.0.0"
+requires-python = ">=3.10"
+dependencies = [
+    "launchpadlib",
+    "keyring",
+]
+
+[project.optional-dependencies]
+test = [
+    "pytest",
+    "vcrpy",
+]
+
 [tool.ruff]
 target-version = "py310"
 line-length = 120

scripts/launchpad_copy.py

@@ -27,6 +27,25 @@
 POCKET = "Release"
 APP_NAME = "ppa-kolibri-server-copy-packages"
 
+TERMINAL_BUILD_STATES = frozenset(
+    {
+        "Successfully built",
+        "Failed to build",
+        "Chroot problem",
+        "Failed to upload",
+        "Cancelled build",
+    }
+)
+
+FAILED_BUILD_STATES = frozenset(
+    {
+        "Failed to build",
+        "Chroot problem",
+        "Failed to upload",
+        "Cancelled build",
+    }
+)
+
 log = logging.getLogger(APP_NAME)
 
 STARTUP_TIME = LAST_LOG_TIME = time.time()
@@ -288,6 +307,79 @@ def copy_to_series(self):
         log.debug("All done")
         return 0
 
+    def wait_for_builds(self, package, version, ppa_name=None, timeout=1800, interval=60):
+        """Wait for all builds of a source package to reach a terminal state.
+
+        Returns 0 if all builds succeed, 1 on failure or timeout.
+        """
+        ppa_name = ppa_name or PROPOSED_PPA_NAME
+        ppa = self.get_ppa(ppa_name)
+        deadline = time.time() + timeout
+
+        # Phase 1: Wait for source to appear
+        log.info("Waiting for %s %s to appear in %s...", package, version, ppa_name)
+        sources = []
+        while time.time() < deadline:
+            published = ppa.getPublishedSources(
+                source_name=package,
+                version=version,
+                order_by_date=True,
+            )
+            sources = [s for s in published if s.status not in ("Deleted", "Superseded", "Obsolete")]
+            if sources:
+                log.info("Found %d source(s) for %s %s", len(sources), package, version)
+                break
+            remaining = int(deadline - time.time())
+            log.info("Source not yet available. Retrying in %ds (%ds remaining)...", interval, remaining)
+            time.sleep(interval)
+        else:
+            log.error("Timeout: %s %s did not appear in %s within %ds", package, version, ppa_name, timeout)
+            return 1
+
+        # Phase 2: Wait for all builds to complete
+        return self._poll_builds(sources, package, version, deadline, interval)
+
+    def _poll_builds(self, sources, package, version, deadline, interval):
+        """Poll builds for all sources until terminal state or timeout."""
+        log.info("Waiting for builds to complete...")
+        while time.time() < deadline:
+            all_terminal = True
+            total = 0
+            succeeded = 0
+            failed = []
+            building = 0
+
+            for source in sources:
+                builds = source.getBuilds()
+                for build in builds:
+                    total += 1
+                    state = build.buildstate
+                    if state == "Successfully built":
+                        succeeded += 1
+                    elif state in FAILED_BUILD_STATES:
+                        failed.append((build.arch_tag, state, build.web_link))
+                    else:
+                        building += 1
+                        all_terminal = False
+
+            if failed:
+                log.error("Build failures detected:")
+                for arch, state, link in failed:
+                    log.error("  %s: %s - %s", arch, state, link)
+                return 1
+
+            if total > 0 and all_terminal:
+                log.info("All %d build(s) completed successfully.", total)
+                return 0
+
+            log.info("Waiting for builds: %d/%d complete, %d building...", succeeded, total, building)
+            remaining = int(deadline - time.time())
+            log.info("Retrying in %ds (%ds remaining)...", interval, remaining)
+            time.sleep(interval)
+
+        log.error("Timeout: builds for %s %s did not complete within timeout", package, version)
+        return 1
+
     def promote(self):
         """Promote published packages from kolibri-proposed to kolibri PPA."""
         log.info("Promoting packages from %s to %s", PROPOSED_PPA_NAME, RELEASE_PPA_NAME)
@@ -362,6 +454,18 @@ def build_parser():
         help="Promote published packages from kolibri-proposed to kolibri PPA.",
     )
 
+    wait_parser = subparsers.add_parser(
+        "wait-for-builds",
+        help="Wait for Launchpad builds to complete for a source package.",
+    )
+    wait_parser.add_argument("--package", required=True, help="Source package name.")
+    wait_parser.add_argument("--version", required=True, help="Expected version string.")
+    wait_parser.add_argument("--ppa", default=PROPOSED_PPA_NAME, help="PPA name to poll (default: %(default)s).")
+    wait_parser.add_argument("--timeout", type=int, default=1800, help="Max wait in seconds (default: %(default)s).")
+    wait_parser.add_argument(
+        "--interval", type=int, default=60, help="Polling interval in seconds (default: %(default)s)."
+    )
+
     return parser
 
 
@@ -385,6 +489,18 @@ def cmd_copy_to_series(args):
     return lp.copy_to_series()
 
 
+def cmd_wait_for_builds(args):
+    """Wait for Launchpad builds to complete."""
+    lp = LaunchpadWrapper()
+    return lp.wait_for_builds(
+        package=args.package,
+        version=args.version,
+        ppa_name=args.ppa,
+        timeout=args.timeout,
+        interval=args.interval,
+    )
+
+
 def cmd_promote(args):
     """Promote published packages from kolibri-proposed to kolibri PPA."""
     lp = LaunchpadWrapper()
@@ -400,6 +516,8 @@ def main():
         return cmd_copy_to_series(args)
     elif args.command == "promote":
         return cmd_promote(args)
+    elif args.command == "wait-for-builds":
+        return cmd_wait_for_builds(args)
 
 
 if __name__ == "__main__":