automate version validation with prod test suite (#8015)

Co-authored-by: Chris Chestnut <cchestnut@google.com>

Author: MaesterChestnut

.github/workflows/app-distribution-gradle-compatibility-tests.yml

@@ -25,21 +25,30 @@ jobs:
           java-version: 17
           distribution: temurin
           cache: gradle
+
+      - name: Setup local.properties for prodTest
+        run: |
+          echo "${{ secrets.INTEG_TESTS_FAD_GRADLE_PROD_TEST_PROPERTIES }}" > local.properties
+    
       - name: Add FAD service-credentials.json
         env:
           INTEG_TESTS_FAD_SERVICE_CREDENTIALS: ${{ secrets.INTEG_TESTS_FAD_SERVICE_CREDENTIALS }}
         if: env.INTEG_TESTS_FAD_SERVICE_CREDENTIALS != '' && env.INTEG_TESTS_FAD_SERVICE_CREDENTIALS != 'null'
         run: |
           echo $INTEG_TESTS_FAD_SERVICE_CREDENTIALS | base64 -d > firebase-appdistribution-gradle/service-credentials.json
+
       - name: Run tests
         id: tests
+        env:
+          FIREBASE_TOKEN: ${{ secrets.INTEG_TESTS_FAD_FIREBASE_TOKEN }}
         run: |
           ./gradlew \
-          :firebase-appdistribution-gradle:integrationTest
+          :firebase-appdistribution-gradle:prodTest \
+          :firebase-appdistribution-gradle:integrationTest --continue
 
       - name: Upload Test Report
         if: failure()
         uses: actions/upload-artifact@v4
         with:
           name: integration-test-report
-          path: firebase-appdistribution-gradle/build/reports/tests/integrationTest/
+          path: firebase-appdistribution-gradle/build/reports/tests/

firebase-appdistribution-gradle/firebase-appdistribution-gradle.gradle

@@ -89,9 +89,23 @@ sourceSets {
   }
 
   // Source set for integration tests
-  integrationTest
+  integrationTest {
+    java {
+      srcDirs += ['src/testUtil/java']
+    }
+    kotlin {
+      srcDirs += ['src/testUtil/java']
+    }
+  }
 
-  prodTest
+  prodTest {
+    java {
+      srcDirs += ['src/testUtil/java']
+    }
+    kotlin {
+      srcDirs += ['src/testUtil/java']
+    }
+  }
 
   // Source set for Gradle Runner test build. Gradle Runner test builds are run in separate
   // processes i.e. test build does not share same class paths as test process. So we need
@@ -185,6 +199,10 @@ task prodTest(type: Test) {
       environment 'FIREBASE_TOKEN', token
     }
   }
+
+  testLogging {
+    showStandardStreams = true
+  }
 }
 
 test {

firebase-appdistribution-gradle/src/integrationTest/java/com/google/firebase/appdistribution/gradle/UploadDistributionTaskTest.kt

@@ -719,10 +719,6 @@ class UploadDistributionTaskTest {
   }
 
   companion object {
-    // Latest gradle, AGP and google-services plugin versions. Update this when new releases come
-    // out.
-    // Also remember to update the latest AGP/gradle versions in BeePlusGradleProject.java.
-    // firebase-appdistribution-gradle/src/prodTest/java/com/google/firebase/appdistribution/gradle/BeePlusGradleProject.java#L59-L60
     private val LATEST_GRADLE_VERSION = VersionUtils.fetchLatestGradleVersion()
     private val LATEST_AGP_VERSION = VersionUtils.fetchLatestAgpVersion()
     private val LATEST_GOOGLE_SERVICES_VERSION = VersionUtils.fetchLatestGoogleServicesVersion()
@@ -746,6 +742,7 @@ class UploadDistributionTaskTest {
     @org.junit.BeforeClass
     @JvmStatic
     fun logVersions() {
+      LOGGER.info("Integration tests using versions:")
       LOGGER.info("Latest Gradle Version: $LATEST_GRADLE_VERSION")
       LOGGER.info("Latest AGP Version: $LATEST_AGP_VERSION")
       LOGGER.info("Latest Google Services Version: $LATEST_GOOGLE_SERVICES_VERSION")

firebase-appdistribution-gradle/src/prodTest/java/com/google/firebase/appdistribution/gradle/BeePlusGradleProject.java

@@ -28,6 +28,7 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.Random;
+import java.util.logging.Logger;
 import java.util.stream.Collectors;
 import org.apache.commons.io.FileUtils;
 import org.gradle.testkit.runner.BuildResult;
@@ -56,10 +57,17 @@ private static String getRequiredSystemProperty(String propertyName) {
   }
 
   static final String PACKAGE_NAME = "com.firebase.appdistribution.prober";
-  // Also remember to update the latest AGP/gradle versions in UploadDistributionTaskTest.kt
-  // firebase-appdistribution-gradle/src/integrationTest/java/com/google/firebase/appdistribution/gradle/UploadDistributionTaskTest.kt#L724-L726
-  static final String LATEST_AGP_VERSION = "9.2.1";
-  static final String LATEST_GRADLE_VERSION = "9.5.0";
+  static final String LATEST_AGP_VERSION = VersionUtils.INSTANCE.fetchLatestAgpVersion();
+  static final String LATEST_GRADLE_VERSION = VersionUtils.INSTANCE.fetchLatestGradleVersion();
+
+  private static final Logger LOGGER = Logger.getLogger(BeePlusGradleProject.class.getName());
+
+  static {
+    LOGGER.info("Production compat tests using versions:");
+    LOGGER.info("Latest Gradle Version: " + LATEST_GRADLE_VERSION);
+    LOGGER.info("Latest AGP Version: " + LATEST_AGP_VERSION);
+  }
+
   // The project number for App Distro Probes. We need to use this project
   // because this is the one that's actually linked to play for BeePlus,
   // which is required for AAB uploads.
@@ -184,7 +192,7 @@ public BuildResult runUploadAab() {
 
   private String getToken() {
     String token = System.getenv("FIREBASE_TOKEN");
-    if (token == null || token.isEmpty()) {
+    if (isNullOrEmpty(token)) {
       throw new IllegalStateException(
           "FIREBASE_TOKEN environment variable not set. This is required for production tests.");
     }