Auto merge of #23356 - jdm:tc-android-mac, r=jdm

Move android mac build to taskcluster

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/23356)
<!-- Reviewable:end -->

3 files changed, 25 insertions, 14 deletions

diff --git a/etc/ci/buildbot_steps.yml b/etc/ci/buildbot_steps.yml
index 7ee31c790c2..f57d244079b 100644
--- a/etc/ci/buildbot_steps.yml
+++ b/etc/ci/buildbot_steps.yml
@@ -124,16 +124,6 @@ linux-nightly:
   - rm -rf ./python/_virtualenv
   - ./etc/ci/clean_build_artifacts.sh
 
-android-mac:
- commands:
-  - ./mach clean-nightlies --keep 3 --force
-  - ./mach clean-cargo-cache --keep 3 --force
-  - ./mach bootstrap-android --accept-all-licences --build
-  - ./mach build --android --dev
-  - ./mach package --android --dev
-  - bash ./etc/ci/lockfile_changed.sh
-  - ./etc/ci/clean_build_artifacts.sh
-
 magicleap:
  env:
   MAGICLEAP_SDK: /Users/servo/magicleap/v0.17.0
@@ -225,6 +215,7 @@ arm64:
 linux-dev: []
 mac-dev-unit: []
 windows-msvc-dev: []
+android-mac: []
 android: []
 android-x86: []
 mac-rel-wpt1: []
diff --git a/etc/taskcluster/decision_task.py b/etc/taskcluster/decision_task.py
index ba062caa51d..73899105eca 100644
--- a/etc/taskcluster/decision_task.py
+++ b/etc/taskcluster/decision_task.py
@@ -18,8 +18,7 @@ def main(task_for):
 
     if task_for == "github-push":
         # FIXME https://github.com/servo/servo/issues/22325 implement these:
-        magicleap_dev = linux_arm32_dev = linux_arm64_dev = \
-            android_arm32_dev_from_macos = lambda: None
+        magicleap_dev = linux_arm32_dev = linux_arm64_dev = lambda: None
 
         # FIXME https://github.com/servo/servo/issues/22187
         # In-emulator testing is disabled for now. (Instead we only compile.)
@@ -36,6 +35,7 @@ def main(task_for):
             macos_unit,
             magicleap_dev,
             android_arm32_dev,
+            android_arm32_dev_from_macos,
             android_arm32_release,
             android_x86_wpt,
             linux_arm32_dev,
@@ -251,6 +251,18 @@ def with_rust_nightly():
     )
 
 
+def android_arm32_dev_from_macos():
+    return (
+        macos_build_task("Dev build (macOS)")
+        .with_treeherder("Android ARMv7")
+        .with_script("""
+            ./mach bootstrap-android --accept-all-licences --build
+            ./mach build --android --dev
+        """)
+        .find_or_create("android_arm32_dev.macos." + CONFIG.git_sha)
+    )
+
+
 def android_arm32_dev():
     return (
         android_build_task("Dev build")
diff --git a/etc/taskcluster/macos/README.md b/etc/taskcluster/macos/README.md
index 194c721ca39..0b5918a84fb 100644
--- a/etc/taskcluster/macos/README.md
+++ b/etc/taskcluster/macos/README.md
@@ -42,20 +42,28 @@ This issue is tracked at
 
 * Log in through VNC, and run `xcode-select --install`
 
+* Still in VNC, install the jdk8 package from http://adoptopenjdk.net
+
+* Install an ssh key into /Users/administrator/.ssh/authorized_keys and
+/var/root/.ssh/authorized_keys.
 
 ## Taskcluster secrets
 
 This SaltStack configuration has a custom module that uses Taskcluster’s
 [secrets service](https://tools.taskcluster.net/secrets/).
-These secrets include an [authentication token](
+These secrets include an authentication token.
 You’ll need to authenticate with a Taskcluster client ID
 that has scope `secrets:get:project/servo/*`.
 This should be the case if you’re a Servo project administrator (the `project-admin:servo` role).
 
+To authenticate, install [taskcluster-cli](https://github.com/taskcluster/taskcluster-cli)
+and run `eval \`taskcluster signin\``. This will set up the TASKCLUSTER_CLIENT_ID and
+TASKCLUSTER_ACCESS_TOKEN variables to allow retrieving secrets appropriately in the current
+terminal session.
 
 ## Worker’s client ID
 
 Workers are configured to authenticate with client ID
 [`project/servo/worker/macos/1`](
 https://tools.taskcluster.net/auth/clients/project%2Fservo%2Fworker%macos%2F1).
-This client has the scopes required to run tasks for this worker type.
\ No newline at end of file
+This client has the scopes required to run tasks for this worker type.