Merge branch 'main' into rl.plugin.product

Author: rlazo

.github/workflows/fireperf-e2e.yml

@@ -21,12 +21,6 @@ jobs:
     steps:
       - name: Checkout firebase-android-sdk
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      - name: Checkout firebase-android-buildtools
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-        with:
-          repository: FirebasePrivate/firebase-android-buildtools
-          token: ${{ secrets.OSS_BOT_BUILDTOOLS_CHECKOUT_PAT }}
-          path: firebase-android-buildtools
       - name: Set up JDK 17
         uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
         with:
@@ -48,7 +42,6 @@ jobs:
       - name: Run fireperf end-to-end tests
         run: |
           fireci fireperf_e2e_test \
-            --plugin_repo_dir=firebase-android-buildtools \
             --target_environment=${{ matrix.environment }}
       - name: Notify developers upon failures
         if: ${{ failure() }}

ci/README.md

@@ -4,7 +4,9 @@ This directory contains tooling used to run Continuous Integration tasks.
 
 ## Prerequisites
 
-- Requires python3.9+ and setuptools to be installed.
+- Install python `3.9`, ideally using [`pyenv`](https://github.com/pyenv/pyenv).
+
+- Install `setuptools`: `pip3 install --upgrade setuptools`
 
 ## Setup
 

ci/fireci/fireciplugins/fireperf.py

@@ -24,25 +24,19 @@
 _logger = logging.getLogger('fireci.fireperf')
 
 
-@click.option(
-  '--plugin_repo_dir',
-  help='The location of the fireperf plugin repository.',
-  required=True,
-)
 @click.option(
   '--target_environment',
   type=click.Choice(['prod', 'autopush'], case_sensitive=False),
   help='The target environment fireperf is built for.',
   required=True,
 )
 @ci_command()
-def fireperf_e2e_test(target_environment, plugin_repo_dir):
+def fireperf_e2e_test(target_environment):
   """Run Firebase Performance end-to-end test."""
 
   _logger.info('Building fireperf plugin ...')
-  with chdir(plugin_repo_dir):
-    build_plugin_task = ':firebase-performance:perf-plugin:publishToMavenLocal'
-    gradle.run(build_plugin_task, gradle.P('publishMode', 'SNAPSHOT'))
+  build_plugin_task = ':firebase-perf-gradle:publishToMavenLocal'
+  gradle.run(build_plugin_task, gradle.P('publishMode', 'SNAPSHOT'))
 
   version = _find_fireperf_plugin_version()
   _logger.info(f'Setting environment variable: FIREBASE_PERF_PLUGIN_VERSION={version} ...')