Revert "Bug 1810150 - don't run pull-request task graphs when we already have a push graph" (#556)

.mergify.yml

 queue_rules:
   - name: default
     conditions:
-      - or:
-        - status-success=complete-pr
-        - status-success=complete-push
+      - status-success=complete-pr
 pull_request_rules:
   - name: Resolve conflict
     conditions:
@@ -14,7 +12,7 @@ pull_request_rules:
   - name: MickeyMoz - Auto Merge
     conditions:
       - author=MickeyMoz
-      - status-success=complete-push
+      - status-success=complete-pr
       - files~=^android-components/(Gecko\.kt|components/lib/publicsuffixlist/src/main/assets/publicsuffixes)
       - -files~=^(?!android-components/(Gecko\.kt|components/lib/publicsuffixlist/src/main/assets/publicsuffixes)).+$
     actions:
@@ -27,7 +25,7 @@ pull_request_rules:
   - name: L10N - Auto Merge
     conditions:
       - author~=(mozilla-l10n-automation-bot|github-actions\[bot\])
-      - status-success=complete-push
+      - status-success=complete-pr
       - files~=^(android-components|focus-android)/(.+/strings\.xml|l10n\.toml)
       - -files~=^(?!(android-components|focus-android)/(.+/strings\.xml|l10n\.toml)).+$
     actions:
@@ -40,7 +38,7 @@ pull_request_rules:
   - name: Release automation
     conditions:
       - author=github-actions[bot]
-      - status-success=complete-push
+      - status-success=complete-pr
       - files~=^android-components/(\.buildconfig\.yml|.+/NimbusGradlePlugin\.groovy|plugins/dependencies/src/main/java/(Gecko|DependenciesPlugin)\.kt|buildSrc/src/main/java/Gecko\.kt)
       - -files~=^(?!android-components/(\.buildconfig\.yml|.+/NimbusGradlePlugin\.groovy|plugins/dependencies/src/main/java/(Gecko|DependenciesPlugin)\.kt|buildSrc/src/main/java/Gecko\.kt)).+$
     actions:
@@ -54,9 +52,7 @@ pull_request_rules:
         force: false
   - name: Needs landing - Rebase
     conditions:
-      - or:
-        - status-success=complete-pr
-        - status-success=complete-push
+      - status-success=complete-pr
       - label=🛬 needs landing
       - "#approved-reviews-by>=1"
       - -draft
@@ -68,9 +64,7 @@ pull_request_rules:
         name: default
   - name: Needs landing - Squash
     conditions:
-      - or:
-        - status-success=complete-pr
-        - status-success=complete-push
+      - status-success=complete-pr
       - label=🛬 needs landing (squash)
       - "#approved-reviews-by>=1"
       - -draft

.taskcluster.yml

@@ -146,8 +146,8 @@ tasks:
               in:
                   $if: >
                       tasks_for in ["action", "cron"]
-                      || (isPullRequest && pullRequestAction in ["opened", "reopened", "synchronize"] && baseRepoUrl != repoUrl)
-                      || (tasks_for == "github-push" && head_ref[:10] != "refs/tags/" && short_head_ref != "staging.tmp" && short_head_ref != "trying.tmp")
+                      || (isPullRequest && pullRequestAction in ["opened", "reopened", "synchronize"])
+                      || (tasks_for == "github-push" && head_ref[:10] != "refs/tags/" && short_head_ref != "staging.tmp" && short_head_ref != "trying.tmp" && short_head_ref[:8] != "mergify/")
                   then:
                       $mergeDeep:
                           - $if: 'tasks_for != "action"'

taskcluster/android_taskgraph/transforms/complete.py

@@ -3,10 +3,8 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 
-import os
 from taskgraph.transforms.base import TransformSequence
 from taskgraph.util.schema import resolve_keyed_by
-from taskgraph.util.vcs import get_repository
 
 
 transforms = TransformSequence()
@@ -27,19 +25,13 @@ def resolve_keys(config, tasks):
         yield task
 
 
-def _get_commit_message(config):
-    rev = config.params["head_rev"]
-    repository = get_repository(os.getcwd())
-    message = repository.get_commit_message(rev)
-    return message.splitlines()[0]
-
-
 def _get_geckoview_bump(config, task):
     if all(
         (
-            task["name"] == "push",  # Filter out push-1 and push-2
+            task["name"] == "pr",  # Filter out pr-1 and pr-2
             config.params["owner"] == "github-actions[bot]@users.noreply.github.com",
-            config.params["tasks_for"] == "github-push",
+            config.params["head_repository"] == config.params["base_repository"],
+            config.params["tasks_for"] == "github-pull-request-untrusted",
             config.params["head_ref"] == "relbot/upgrade-geckoview-ac-main",
         )
     ):
@@ -55,16 +47,13 @@ def add_notifications(config, tasks):
     for task in tasks:
         notifications = task.pop("notifications", None)
         if notifications:
-            commit_message = _get_commit_message(config)
             emails = notifications["emails"]
             subject = notifications["subject"].format(
-                commit=config.params["head_rev"],
-                commit_message=commit_message,
+                pull_request_number=config.params["pull_request_number"]
             )
             message = notifications["message"].format(
                 repository=config.params["base_repository"],
-                commit=config.params["head_rev"],
-                commit_message=commit_message,
+                pull_request_number=config.params["pull_request_number"],
             )
 
             status_types = notifications.get("status-types", ["on-failed"])

taskcluster/ci/complete/kind.yml

@@ -38,8 +38,8 @@ task-defaults:
     notifications:
         by-geckoview-bump:
             nightly:
-                subject: "[Firefox-Android] Failed CI for {commit_message}"
-                message: "Please check {repository}/commit/{commit}"
+                subject: "[Android-Components] Failed to update geckoview nightly PR#{pull_request_number}"
+                message: "Please check {repository}/pull/{pull_request_number}"
                 emails:
                     - fenix-eng-notifications@mozilla.com
                     - geckoview-core@mozilla.com