From f577ea15aa42d73e9873437d6a9dfec5d63086c5 Mon Sep 17 00:00:00 2001
From: Matthias Urhahn <matthias.urhahn@sap.com>
Date: Wed, 27 Jan 2021 18:09:55 +0100
Subject: [PATCH] Fix incorrect instrumentation test results being pulled (DEV)
(#2222)
* Copy directly from main bucket folder
* Setup BUCKETDIR as bash environment variable to persist across consoles.
* Don't reevaluate the bucket dir on each console spawn.
Fail job if gsutil fails.
* Specify sub-folder
Co-authored-by: Mohamed Metwalli <Mohamed.Metwalli@sap.com>
---
.circleci/config.yml | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 9c0712ad8..377608e55 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -116,11 +116,11 @@ commands:
name: Install Android SDK
command: |
sh .circleci/install-android-sdk.sh
- echo 'export PATH=$ANDROID_SDK_ROOT/cmdline-tools/latest/bin:$PATH' >> $BASH_ENV
- echo 'export PATH=$ANDROID_SDK_ROOT/cmdline-tools/latest:$PATH' >> $BASH_ENV
- echo 'export PATH=$ANDROID_SDK_ROOT/platform-tools:$PATH' >> $BASH_ENV
- echo 'export PATH=$ANDROID_SDK_ROOT/emulator:$PATH' >> $BASH_ENV
- echo 'export PATH=$ANDROID_SDK_ROOT/build-tools/29.0.3:$PATH' >> $BASH_ENV
+ echo 'export PATH=$ANDROID_SDK_ROOT/cmdline-tools/latest/bin:$PATH' >> $BASH_ENV
+ echo 'export PATH=$ANDROID_SDK_ROOT/cmdline-tools/latest:$PATH' >> $BASH_ENV
+ echo 'export PATH=$ANDROID_SDK_ROOT/platform-tools:$PATH' >> $BASH_ENV
+ echo 'export PATH=$ANDROID_SDK_ROOT/emulator:$PATH' >> $BASH_ENV
+ echo 'export PATH=$ANDROID_SDK_ROOT/build-tools/29.0.3:$PATH' >> $BASH_ENV
source $BASH_ENV
sdkmanager --list
- save_cache:
@@ -465,10 +465,15 @@ jobs:
- run-gradle-cmd:
desc: Build instrumentation test APK
cmd: ":Corona-Warn-App:assembleDeviceForTestersDebugAndroidTest"
+ - run:
+ name: Setup Testlab environment
+ command: |
+ echo "export BUCKETDIR=\"`date "+%Y-%m-%d-%H:%M:%S:%3N"`-${RANDOM}\"" >> $BASH_ENV
+ source $BASH_ENV
+ echo "$BUCKETDIR is setup."
- run:
name: Test with Firebase Test Lab
command: |
- BUCKETDIR="`date "+%Y-%m-%d-%H:%M:%S:%3N"`-${RANDOM}"
echo "Using bucketdir $BUCKETDIR"
sudo gcloud firebase test android run \
--type instrumentation \
@@ -492,7 +497,7 @@ jobs:
name: Install gsutil dependency and copy test results data
command: |
sudo pip install -U crcmod
- sudo gsutil -m cp -R -U "`sudo gsutil ls gs://${GOOGLE_PROJECT_ID}-circleci-android/${BUCKETDIR} | tail -1`*" firebase-results | true
+ sudo gsutil -m cp -R -U gs://${GOOGLE_PROJECT_ID}-circleci-android/${BUCKETDIR}/flame* firebase-results
- store_test_results:
path: ./firebase-results/flame-29-de_DE-portrait
- compress-path:
--
GitLab