PR feedback fixes

.github/workflows/android-app.yml

@@ -37,18 +37,18 @@ on:
         type: boolean
         required: false
       mockapi_test_repeat:
-        description: Mockapi test repeat(self hosted)
+        description: Mockapi test repeat (self hosted)
         default: '1'
         required: true
         type: string
       e2e_test_repeat:
-        description: e2e test repeat(self hosted)
+        description: e2e test repeat (self hosted)
         default: '0'
         required: true
         type: string
       e2e_tests_infra_flavor:
         description: >
-          Infra environment to run e2e tests on(prod/stagemole).
+          Infra environment to run e2e tests on (prod/stagemole).
           If set to 'stagemole' test-related artefacts will be uploaded.
         default: 'stagemole'
         required: true
@@ -348,7 +348,9 @@ jobs:
 
       - name: Build stagemole app
         uses: burrunan/gradle-cache-action@v1
-        if: github.event.inputs.e2e_test_repeat != '0'
+        if: >
+          (github.event.inputs.e2e_test_repeat != '0' && github.event.inputs.e2e_tests_infra_flavor == 'stagemole') ||
+          github.event.inputs.run_firebase_tests == 'true'
         with:
           job-id: jdk17
           arguments: assemblePlayStagemoleDebug

android/scripts/run-instrumented-tests.sh

@@ -109,6 +109,10 @@ case "$TEST_TYPE" in
         echo ""
         echo "Error: The 'e2e' test type with billing flavor 'play' require infra flavor 'stagemole'."
         exit 1
+    elif [[ $BILLING_FLAVOR == "oss" && $INFRA_FLAVOR != "prod" ]]; then
+        echo ""
+        echo "Error: The 'e2e' test type with billing flavor 'oss' require infra flavor 'prod'."
+        exit 1
     fi
     OPTIONAL_TEST_ARGUMENTS=""
     if [[ -n ${INVALID_TEST_ACCOUNT_NUMBER-} ]]; then