Fix instrumentation tests

Change-Id: I19626079ce9c6dfb86788454c9607452b9eb7d09

.github/workflows/Build.yaml

@@ -46,27 +46,37 @@ jobs:
       - name: Check lint
         run: ./gradlew lintDebug --stacktrace
 
-      - name: Build debug
-        run: ./gradlew assembleDebug --stacktrace
-
-      - name: Build release
-        run: ./gradlew assembleRelease --stacktrace
+      - name: Build all build type and flavor permutations
+        run: ./gradlew assemble --stacktrace
 
       - name: Run local tests
-        run: ./gradlew testDebug --stacktrace
+        run: ./gradlew testDemoDebug testProdDebug --stacktrace
+
+      - name: Upload Demo build outputs (APKs)
+        uses: actions/upload-artifact@v2
+        with:
+          name: build-outputs-demo
+          path: app/demo/build/outputs
 
-      - name: Upload build outputs (APKs)
+      - name: Upload Prod build outputs (APKs)
+        uses: actions/upload-artifact@v2
+        with:
+          name: build-outputs-prod
+          path: app/prod/build/outputs
+
+      - name: Upload Demo build reports
+        if: always()
         uses: actions/upload-artifact@v2
         with:
-          name: build-outputs
-          path: app/build/outputs
+          name: build-reports-demo
+          path: app/demo/build/reports
 
-      - name: Upload build reports
+      - name: Upload Prod build reports
         if: always()
         uses: actions/upload-artifact@v2
         with:
-          name: build-reports
-          path: app/build/reports
+          name: build-reports-prod
+          path: app/prod/build/reports
 
   androidTest:
     needs: build
@@ -107,7 +117,7 @@ jobs:
           disable-animations: true
           disk-size: 1500M
           heap-size: 512M
-          script: ./gradlew connectedAndroidTest -x :benchmark:connectedBenchmarkAndroidTest
+          script: ./gradlew connectedProdDebugAndroidTest -x :benchmark:connectedProdDebugBenchmarkAndroidTest
 
       - name: Upload test reports
         if: always()