updates pipeline to bypass ci checks for release candidate promotion PRs

airbytehq · Dec 17, 2024 · 8e6e620 · 8e6e620
1 parent 920aef8
commit 8e6e620
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/airbyte-ci/connectors/auto_merge/src/auto_merge/consts.py b/airbyte-ci/connectors/auto_merge/src/auto_merge/consts.py
@@ -4,6 +4,7 @@
 
 AIRBYTE_REPO = "airbytehq/airbyte"
 AUTO_MERGE_LABEL = "auto-merge"
+AUTO_MERGE_PROMOTED_RC_LABEL = "auto-merge/promoted-rc"
 BASE_BRANCH = "master"
 CONNECTOR_PATH_PREFIXES = {
     "airbyte-integrations/connectors",

diff --git a/airbyte-ci/connectors/auto_merge/src/auto_merge/main.py b/airbyte-ci/connectors/auto_merge/src/auto_merge/main.py
@@ -12,10 +12,10 @@
 
 from github import Auth, Github
 
-from .consts import AIRBYTE_REPO, AUTO_MERGE_LABEL, BASE_BRANCH, MERGE_METHOD
+from .consts import AIRBYTE_REPO, AUTO_MERGE_LABEL, AUTO_MERGE_PROMOTED_RC_LABEL, BASE_BRANCH, MERGE_METHOD
 from .env import GITHUB_TOKEN, PRODUCTION
 from .helpers import generate_job_summary_as_markdown
-from .pr_validators import ENABLED_VALIDATORS
+from .pr_validators import DEFAULT_ENABLED_VALIDATORS, PROMOTED_RC_PR_VALIDATORS
 
 if TYPE_CHECKING:
     from github.Commit import Commit as GithubCommit
@@ -49,7 +49,8 @@ def check_if_pr_is_auto_mergeable(head_commit: GithubCommit, pr: PullRequest, re
     Returns:
         bool: True if the PR is auto-mergeable, False otherwise
     """
-    for validator in ENABLED_VALIDATORS:
+    validators = PROMOTED_RC_PR_VALIDATORS if AUTO_MERGE_PROMOTED_RC_LABEL in pr.labels else DEFAULT_ENABLED_VALIDATORS
+    for validator in validators:
         is_valid, error = validator(head_commit, pr, required_checks)
         if not is_valid:
             if error:

diff --git a/airbyte-ci/connectors/auto_merge/src/auto_merge/pr_validators.py b/airbyte-ci/connectors/auto_merge/src/auto_merge/pr_validators.py
@@ -48,12 +48,14 @@ def head_commit_passes_all_required_checks(
     return True, None
 
 
-# A PR is considered auto-mergeable if:
+# A standard PR is considered auto-mergeable if:
 #     - it has the AUTO_MERGE_LABEL
 #     - it targets the BASE_BRANCH
 #     - it touches only files in CONNECTOR_PATH_PREFIXES
 #     - the head commit passes all required checks
 
 # PLEASE BE CAREFUL OF THE VALIDATOR ORDERING
-# Let's declared faster checks first as the  check_if_pr_is_auto_mergeable function fails fast.
-ENABLED_VALIDATORS = [has_auto_merge_label, targets_main_branch, only_modifies_connectors, head_commit_passes_all_required_checks]
+# Let's declare faster checks first as the check_if_pr_is_auto_mergeable function fails fast.
+DEFAULT_ENABLED_VALIDATORS = [has_auto_merge_label, targets_main_branch, only_modifies_connectors, head_commit_passes_all_required_checks]
+
+PROMOTED_RC_PR_VALIDATORS = [has_auto_merge_label, targets_main_branch, only_modifies_connectors]
diff --git a/airbyte-ci/connectors/pipelines/pipelines/airbyte_ci/connectors/publish/pipeline.py b/airbyte-ci/connectors/pipelines/pipelines/airbyte_ci/connectors/publish/pipeline.py
@@ -750,7 +750,7 @@ async def run_connector_promote_pipeline(context: PublishConnectorContext, semap
                     all_modified_files.update(
                         await add_changelog_entry.export_modified_files(context.connector.local_connector_documentation_directory)
                     )
-                post_changelog_pr_update = CreateOrUpdatePullRequest(context, skip_ci=False, labels=["auto-merge"])
+                post_changelog_pr_update = CreateOrUpdatePullRequest(context, skip_ci=True, labels=["auto-merge", "auto-merge/promoted-rc"])
                 pr_creation_args, pr_creation_kwargs = get_promotion_pr_creation_arguments(
                     all_modified_files, context, results, current_version, promoted_version
                 )