fix: Fixes for Workflow files & IT tests (#1581)

* Windows fixes for running IT * Minor updates * update it Co-authored-by: adamfilipow92 <[email protected]> Co-authored-by: Adam <[email protected]>
Flank · Feb 10, 2021 · fa7a606 · fa7a606
1 parent 38849bc
commit fa7a606
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 10 deletions.
diff --git a/.github/workflows/full_suite_integration_tests.yml b/.github/workflows/full_suite_integration_tests.yml
@@ -99,14 +99,14 @@ jobs:
 
       - name: Prepare Google Service Account
         env:
-          GOOGLE_CLOUD_PROJECT: flank-open-source #needs to be removed.
           GCLOUD_KEY: ${{ secrets.GCLOUD_KEY }}
 
         run: |
             if [ "$RUNNER_OS" == "Windows" ]; then
-                set GCLOUD_DIR="%HOMEPATH%/.config/gcloud/"
-                mkdir %GCLOUD_DIR%
-                echo certutil -decode %GCLOUD_KEY% %GCLOUD_DIR%application_default_credentials.json
+                GCLOUD_DIR=$HOMEPATH\\.config\\gcloud\\
+                mkdir -p $GCLOUD_DIR
+                echo $GCLOUD_KEY > key.txt
+                certutil -decode key.txt $GCLOUD_DIR\application_default_credentials.json
             else
                 GCLOUD_DIR="$HOME/.config/gcloud/"
                 mkdir -p "$GCLOUD_DIR"

diff --git a/integration_tests/src/test/resources/compare/AllTestFilteredIT-android-compare b/integration_tests/src/test/resources/compare/AllTestFilteredIT-android-compare
@@ -67,7 +67,7 @@ AndroidArgs
 RunTests
   No tests for app-single-success-debug-androidTest.apk
 
-  Saved 0 shards to .*\/android_shards.json
+  Saved 0 shards to .*[\\\/]android_shards.json
   Uploading \[android_shards.json\] to https:\/\/console.developers.google.com\/storage\/browser\/test-lab-[a-zA-Z0-9_-]*\/[.a-zA-Z0-9_-]*\/\.*
 
 There are no tests to run.
diff --git a/integration_tests/src/test/resources/compare/IgnoreFailedIT-compare b/integration_tests/src/test/resources/compare/IgnoreFailedIT-compare
@@ -68,7 +68,7 @@ RunTests
  Smart Flank cache hit: 0\% \(0 \/ 1\)
   Shard times: 120s
 
-  Saved 1 shards to .*\/android_shards.json
+  Saved 1 shards to .*[\\\/]android_shards.json
   Uploading \[app-debug.apk\] to https:\/\/console.developers.google.com\/storage\/browser\/test-lab-[a-zA-Z0-9_-]*\/[.a-zA-Z0-9_-]*\/\.*
   Uploading \[app-single-error-debug-androidTest.apk\] to https:\/\/console.developers.google.com\/storage\/browser\/test-lab-[a-zA-Z0-9_-]*\/[.a-zA-Z0-9_-]*\/\.*
 

diff --git a/integration_tests/src/test/resources/compare/MultipleApksIT-compare b/integration_tests/src/test/resources/compare/MultipleApksIT-compare
@@ -80,7 +80,7 @@ RunTests
  Smart Flank cache hit: 0\% \(0 \/ 1\)
   Shard times: 120s
 \s*
-  Saved 3 shards to .*\/android_shards.json
+  Saved 3 shards to .*[\\\/]android_shards.json
   Uploading \[android_shards.json\] to https:\/\/console.developers.google.com\/storage\/browser\/test-lab-[a-zA-Z0-9_-]*\/[.a-zA-Z0-9_-]*\/\.*
   Uploading \[app-debug.apk\] to https:\/\/console.developers.google.com\/storage\/browser\/test-lab-[a-zA-Z0-9_-]*\/[.a-zA-Z0-9_-]*\/\.*
 [\s\S]*

diff --git a/integration_tests/src/test/resources/compare/MultipleDevicesIT-android-compare b/integration_tests/src/test/resources/compare/MultipleDevicesIT-android-compare
@@ -90,7 +90,7 @@ RunTests
  Smart Flank cache hit: 0\% \(0 \/ 1\)
   Shard times: 120s
 \s*
-  Saved 3 shards to .*\/android_shards.json
+  Saved 3 shards to .*[\\\/]android_shards.json
   Uploading \[android_shards.json\] to https:\/\/console.developers.google.com\/storage\/browser\/test-lab-[a-zA-Z0-9_-]*\/[.a-zA-Z0-9_-]*\/\.*
   Uploading \[app-debug.apk\] to https:\/\/console.developers.google.com\/storage\/browser\/test-lab-[a-zA-Z0-9_-]*\/[.a-zA-Z0-9_-]*\/\.*
 [\s\S]*

diff --git a/integration_tests/src/test/resources/compare/RunTimeoutIT-compare b/integration_tests/src/test/resources/compare/RunTimeoutIT-compare
@@ -64,7 +64,7 @@ AndroidArgs
       output-report: none
 
 RunTests
-  Saved 1 shards to .*\/android_shards.json
+  Saved 1 shards to .*[\\\/]android_shards.json
 
   1 test \/ 1 shard
 

diff --git a/integration_tests/src/test/resources/compare/TestFilteringIT-compare b/integration_tests/src/test/resources/compare/TestFilteringIT-compare
@@ -69,7 +69,7 @@ AndroidArgs
 RunTests
   No tests for app-single-success-debug-androidTest.apk
 \s*
-  Saved 1 shards to .*\/android_shards.json
+  Saved 1 shards to .*[\\\/]android_shards.json
   Uploading \[android_shards.json\] to https:\/\/console.developers.google.com\/storage\/browser\/test-lab-[a-zA-Z0-9_-]*\/[.a-zA-Z0-9_-]*\/\.*
   Uploading \[app-debug.apk\] to https:\/\/console.developers.google.com\/storage\/browser\/test-lab-[a-zA-Z0-9_-]*\/[.a-zA-Z0-9_-]*\/\.*
   Uploading \[app-multiple-success-debug-androidTest.apk\] to https:\/\/console.developers.google.com\/storage\/browser\/test-lab-[a-zA-Z0-9_-]*\/[.a-zA-Z0-9_-]*\/\.*