Backed out 4 changesets (bug 1865886) for causing python failures CLO…

…SED TREE

Backed out changeset 7cc03b5ce4a9 (bug 1865886)
Backed out changeset e2529b2ccc91 (bug 1865886)
Backed out changeset df1b87110c9d (bug 1865886)
Backed out changeset 7bf33179c4b8 (bug 1865886)

taskcluster/ci/build/android.yml

@@ -389,7 +389,7 @@ android-aarch64/debug:
 
 android-aarch64-shippable/opt:
     description: "Android 5.0 AArch64 Shippable"
-    use-pgo: android-aarch64-shippable/opt
+    use-pgo: android-x86_64-shippable/opt
     attributes:
         enable-full-crashsymbols: true
         shippable: true
@@ -420,7 +420,7 @@ android-aarch64-shippable/opt:
 
 android-aarch64-shippable-lite/opt:
     description: "Android 5.0 AArch64 Shippable Lite"
-    use-pgo: android-aarch64-shippable/opt
+    use-pgo: android-x86_64-shippable/opt
     attributes:
         enable-full-crashsymbols: true
         shippable: true

taskcluster/ci/generate-profile/kind.yml

@@ -166,46 +166,6 @@ jobs:
                 - android-system-image-x86_64-linux
                 - android-avd-x86_64-linux
 
-    android-aarch64-shippable/opt:
-        description: "Android 5.0 Aarch64 Profile Generation"
-        shipping-phase: build
-        shipping-product: fennec
-        index:
-            product: mobile
-            job-name: android-aarch64-profile
-        treeherder:
-            platform: android-5-0-aarch64/pgo
-        worker-type: b-linux-kvm-gcp
-        worker:
-            chain-of-trust: true
-            max-run-time: 2700
-            kvm: true  # for access to /dev/kvm for hw accel in the emulator
-            docker-image: {in-tree: ubuntu1804-test}
-            env:
-                WORKING_DIR: "/builds/worker"
-                MOZHARNESS_PATH: "/builds/worker/checkouts/gecko/testing/mozharness"
-            artifacts:
-                - type: directory
-                  name: public/build
-                  path: /builds/worker/artifacts/
-        run:
-            using: mozharness
-            job-script: taskcluster/scripts/tester/test-linux.sh
-            script: android_emulator_pgo.py
-            tooltool-downloads: internal
-            options: [installer-path=/builds/worker/fetches/geckoview-test_runner.apk]
-            config:
-                - android/android_common.py
-                - android/android-aarch64-profile-generation.py
-                - android/android_pgo.py
-        fetches:
-            toolchain:
-                - linux64-clang
-                - linux64-minidump-stackwalk
-                - android-sdk-linux
-                - android31-system-image-x86_64-linux
-                - android31-avd-x86_64-linux
-
     win32-shippable/opt:
         description: "Win32 Profile Generation"
         shipping-phase: build

taskcluster/ci/instrumented-build/kind.yml

@@ -280,60 +280,6 @@ jobs:
                 - sysroot-x86_64-linux-gnu
                 - sysroot-wasm32-wasi
 
-    android-aarch64-shippable/opt:
-        description: "Android 5.0 AArch64 PGO instrumented"
-        index:
-            product: mobile
-            job-name: instrumented-android-aarch64
-        shipping-product: fennec
-        treeherder:
-            platform: android-5-0-aarch64/pgo
-        worker-type: b-linux-gcp
-        worker:
-            docker-image: {in-tree: android-build}
-            env:
-                GRADLE_USER_HOME: "/builds/worker/checkouts/gecko/mobile/android/gradle/dotgradle-offline"
-                TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android/releng.manifest"
-            artifacts:
-                - name: public/build
-                  path: /builds/worker/artifacts/
-                  type: directory
-                - name: public/build/geckoview-androidTest.apk
-                  path: /builds/worker/workspace/obj-build/gradle/build/mobile/android/geckoview/outputs/apk/androidTest/withGeckoBinaries/debug/geckoview-withGeckoBinaries-debug-androidTest.apk
-                  type: file
-                - name: public/build/geckoview-test_runner.apk
-                  path: /builds/worker/workspace/obj-build/gradle/build/mobile/android/test_runner/outputs/apk/withGeckoBinaries/debug/test_runner-withGeckoBinaries-debug.apk
-                  type: file
-                - name: public/build/geckoview-test_runner.aab
-                  path: /builds/worker/workspace/obj-build/gradle/build/mobile/android/test_runner/outputs/bundle/withGeckoBinariesDebug/test_runner-withGeckoBinaries-debug.aab
-                  type: file
-                - name: public/build/geckoview_example.apk
-                  path: /builds/worker/workspace/obj-build/gradle/build/mobile/android/geckoview_example/outputs/apk/withGeckoBinaries/debug/geckoview_example-withGeckoBinaries-debug.apk
-                  type: file
-                - name: public/build/geckoview_example.aab
-                  path: /builds/worker/workspace/obj-build/gradle/build/mobile/android/geckoview_example/outputs/bundle/withGeckoBinariesDebug/geckoview_example-withGeckoBinaries-debug.aab
-                  type: file
-        run:
-            config:
-                - builds/releng_base_android_64_builds.py
-            custom-build-variant-cfg: aarch64-profile-generate
-            tooltool-downloads: internal
-        fetches:
-            toolchain:
-                - android-gradle-dependencies
-                - android-ndk-linux
-                - android-sdk-linux
-                - linux64-jdk
-                - linux64-clang
-                - linux64-rust-android
-                - linux64-rust-size
-                - linux64-cbindgen
-                - linux64-dump_syms
-                - linux64-nasm
-                - linux64-node
-                - sysroot-x86_64-linux-gnu
-                - sysroot-wasm32-wasi
-
     win32-shippable/opt:
         description: "Win32 Shippable PGO Instrumented"
         index:

taskcluster/ci/toolchain/android.yml

@@ -35,27 +35,6 @@ linux64-android-avd-x86_64-repack:
             # Aliases aren't allowed for toolchains depending on toolchains.
             - linux64-jdk-repack
 
-linux64-android31-avd-x86_64-repack:
-    description: "Android AVD (Linux) repack toolchain build"
-    treeherder:
-        symbol: TL(avd31-x86_64-linux)
-    worker-type: b-linux-kvm-gcp
-    worker:
-        kvm: true
-    run:
-        script: repack-android-avd-linux.sh
-        arguments:
-            - 'python/mozboot/mozboot/android-avds/android31-x86_64.json'
-        resources:
-            - 'python/mozboot/**/*android*'
-        toolchain-artifact: public/build/android-avd-linux.tar.zst
-        toolchain-alias: android31-avd-x86_64-linux
-    fetches:
-        toolchain:
-            # Aliases aren't allowed for toolchains depending on toolchains.
-            - linux64-jdk-repack
-
-
 linux64-android-avd-arm-repack:
     attributes:
         local-toolchain: true
@@ -111,24 +90,6 @@ linux64-android-system-image-x86_64-repack:
             # Aliases aren't allowed for toolchains depending on toolchains.
             - linux64-jdk-repack
 
-linux64-android31-system-image-x86_64-repack:
-    description: "Android System Images (Linux) repack toolchain build"
-    treeherder:
-        symbol: TL(x86_64-avd31-img-linux)
-    run:
-        script: repack-android-system-images-linux.sh
-        arguments:
-            - 'python/mozboot/mozboot/android-avds/android31-x86_64.json'
-        resources:
-            - 'python/mozboot/**/*android*'
-        toolchain-artifact: project/gecko/android-system-images/android-system-images-linux.tar.zst
-        toolchain-alias: android31-system-image-x86_64-linux
-    fetches:
-        toolchain:
-            # Aliases aren't allowed for toolchains depending on toolchains.
-            - linux64-jdk-repack
-
-
 linux64-jdk-repack:
     description: "Java JDK (Linux) repack toolchain build"
     treeherder:

testing/mozharness/mozharness/mozilla/building/buildbase.py

@@ -330,7 +330,6 @@ class BuildOptionParser(object):
         "aarch64-pgo": path_base + "%s_aarch64_pgo.py",
         "aarch64-debug": path_base + "%s_aarch64_debug.py",
         "aarch64-lite-debug": path_base + "%s_aarch64_debug_lite.py",
-        "aarch64-profile-generate": path_base + "%s_aarch64_profile_generate.py",
         "android-geckoview-docs": path_base + "%s_geckoview_docs.py",
         "valgrind": path_base + "%s_valgrind.py",
     }