Saves test artifacts in a human-readable directory structure

Author: JoseAlcerreca

circle.yml

@@ -17,6 +17,5 @@ test:
   override:
     - ./test_all_ftl.sh
   post:
-    - sudo /opt/google-cloud-sdk/bin/gsutil -m cp -r -U `sudo /opt/google-cloud-sdk/bin/gsutil ls gs://cloud-test-android-devrel-ci | tail -1` $CIRCLE_ARTIFACTS/ | true
     - mkdir -p $CIRCLE_TEST_REPORTS/junit/
     - find $CIRCLE_ARTIFACTS -name \*.xml -exec cp {} $CIRCLE_TEST_REPORTS/junit/ \;

test_all_ftl.sh

@@ -4,34 +4,39 @@ set -e  # Exit immediately if a command exits with a non-zero status.
 
 for line in $(find . -name 'gradlew'); do
    p=$(dirname "${line}");
+   name="${p##*/}";
    echo
    echo
-   echo Running unit and Android tests in $p
+   echo Running unit and Android tests in $name
    echo "====================================================================="
 
    pushd $p > /dev/null  # Silent pushd
-   ./gradlew :app:assembleDebug -PdisablePreDex | sed "s@^@$p @"  # Prefix every line with directory
+   ./gradlew :app:assembleDebug -PdisablePreDex | sed "s@^@$name @"  # Prefix every line with directory
    code=${PIPESTATUS[0]}
    if [ "$code" -ne "0" ]; then
        exit $code
    fi
 
-   ./gradlew :app:assembleAndroidTest -PdisablePreDex | sed "s@^@$p @"  # Prefix every line with directory
-   ./gradlew test -PdisablePreDex | sed "s@^@$p @"  # Prefix every line with directory
+   ./gradlew :app:assembleAndroidTest -PdisablePreDex | sed "s@^@$name @"  # Prefix every line with directory
+   ./gradlew test -PdisablePreDex | sed "s@^@$name @"  # Prefix every line with directory
 
    apkfile=app/build/outputs/apk/debug/app-debug.apk
    testapkfile=app/build/outputs/apk/androidTest/debug/app-debug-androidTest.apk
    if [ ! -f $apkfile ] || [ ! -f $testapkfile ] ; then
-      echo "APKs not found, probably due to project using multiple flavors. Skipping $p"
+      echo "APKs not found, probably due to project using multiple flavors. Skipping $name"
       popd > /dev/null  # Silent popd
       continue
    fi
    echo "Sending APKs to Firebase..."
-   echo "y" | sudo /opt/google-cloud-sdk/bin/gcloud firebase test android run --app $apkfile --test $testapkfile -d Nexus5X -v 26 -l fr --results-bucket android-architecture-components-test-results
+   echo "y" | sudo /opt/google-cloud-sdk/bin/gcloud firebase test android run --app $apkfile --test $testapkfile -d Nexus5X -v 26 -l fr --results-bucket=android-architecture-components-test-results --results-dir=$CIRCLE_BUILD_NUM/$name
+
    code=${PIPESTATUS[0]}
    if [ "$code" -ne "0" ]; then
        exit $code
    fi
+
+   # Copy the test results to the build artifacts folder in CircleCI
+   sudo /opt/google-cloud-sdk/bin/gsutil -m cp -r -U `sudo /opt/google-cloud-sdk/bin/gsutil ls gs://android-architecture-components-test-results/$CIRCLE_BUILD_NUM/$name/test_result*.xml | tail -1` $CIRCLE_ARTIFACTS/ | true
    popd > /dev/null  # Silent popd
 done