Ignore test branches for auto-approval workflow (#1358)

* Ignore test branches

* bump version

* Make the forked repo setup more robust

* more sleep

* use min instead of max

.github/workflows/bot_pr_approval.yaml

@@ -2,6 +2,8 @@ name: Provide approval for bot PRs
 
 on:
   pull_request:
+    branches-ignore:
+      - '**test-branch/**'
 
 jobs:
   bot_pr_approval:

pyproject.toml

@@ -3,7 +3,7 @@
 
 [tool.poetry]
 name = "repo-policy-compliance"
-version = "1.8.0"
+version = "1.8.1"
 description = "Checks GitHub repository settings for compliance with policy"
 authors = ["Canonical IS DevOps <launchpad.net/~canonical-is-devops>"]
 license = "Apache 2.0"

rockcraft.yaml

@@ -3,7 +3,7 @@
 
 name: repo-policy-compliance
 base: [email protected]
-version: '1.8.0'
+version: '1.8.1'
 summary: Check the repository setup for policy compliance
 description: |
     Used to check whether a GitHub repository complies with expected policies.

tests/app/integration/conftest.py

@@ -5,7 +5,7 @@
 
 import os
 from time import sleep
-from typing import Iterator, cast
+from typing import Any, Callable, Iterator, cast
 
 import pytest
 from github import Github
@@ -75,22 +75,33 @@ def fixture_forked_github_repository(
     github_repository: Repository,
 ) -> Iterator[Repository]:
     """Create a fork for a GitHub repository."""
-    forked_repository = github_repository.create_fork()
+    forked_repository = _simple_retry(github_repository.create_fork)
 
-    # Wait for repo to be ready
-    for _ in range(10):
-        try:
-            sleep(10)
-            forked_repository.get_branches()
-            break
-        except GithubException:
-            pass
-    else:
-        assert False, "timed out whilst waiting for repository creation"
+    # Wait for repo to be ready. We assume its ready if we can get the default branch.
+    _simple_retry(forked_repository.get_branch, github_repository.default_branch)
 
     yield forked_repository
 
-    forked_repository.delete()
+    _simple_retry(forked_repository.delete)
+
+
+def _simple_retry(func: Callable[..., Any], *args: Any, **kwargs: Any) -> Any:
+    """Retry a function 10 times before failing.
+
+    Args:
+        func: The function to retry.
+        args: The positional arguments to pass to the function.
+        kwargs: The keyword arguments to pass to the function.
+
+    Returns:
+        The result of the function.
+    """
+    for i in range(10):
+        try:
+            return func(*args, **kwargs)
+        except GithubException:
+            sleep(min(10 + i * 10, 60))
+    assert False, f"timed out while waiting for func {func.__name__} to complete"
 
 
 @pytest.fixture(name="github_branch")