diff --git a/docs/index.md b/docs/index.md index 1b5e5843c5..5e76f54b43 100644 --- a/docs/index.md +++ b/docs/index.md @@ -279,7 +279,7 @@ flank: ### Billing Project ID ## The billing enabled Google Cloud Platform project id to use - # project: flank-open-source + # project: ftl-flank-open-source ### Local Result Directory Storage ## Local folder to store the test result. Folder is DELETED before each run to ensure only artifacts from the new run are saved. @@ -659,7 +659,7 @@ flank: ### Billing Project ID ## The billing enabled Google Cloud Platform id name to use - # project: flank-open-source + # project: ftl-flank-open-source ### Local Results Directory ## Local folder to store the test result. Folder is DELETED before each run to ensure only artifacts from the new run are saved. diff --git a/docs/onboarding/1_environment_setup.md b/docs/onboarding/1_environment_setup.md index f84301aaa5..3659a19ffd 100644 --- a/docs/onboarding/1_environment_setup.md +++ b/docs/onboarding/1_environment_setup.md @@ -14,8 +14,8 @@ export PATH=$PATH:$HOME/$FLANK_REPO/flank/test_projects/android/bash export PATH=$PATH:$HOME/Library/Android/sdk/platform-tools export PATH=$PATH:$HOME/Library/Python/2.7/bin #export PATH=$PATH:$HOME/"path to your local gcloud repository"/gcloud_cli/google-cloud-sdk/bin -export FLANK_PROJECT_ID=flank-open-source -export GOOGLE_CLOUD_PROJECT=flank-open-source +export FLANK_PROJECT_ID=ftl-flank-open-source +export GOOGLE_CLOUD_PROJECT=ftl-flank-open-source export GITHUB_TOKEN="type your gihub token here" ``` diff --git a/integration_tests/src/test/kotlin/integration/CustomShardingIT.kt b/integration_tests/src/test/kotlin/integration/CustomShardingIT.kt index 47cd450054..4b16850916 100644 --- a/integration_tests/src/test/kotlin/integration/CustomShardingIT.kt +++ b/integration_tests/src/test/kotlin/integration/CustomShardingIT.kt @@ -110,7 +110,7 @@ val customSharding = mapOf( "matrix-0" to AndroidTestShards( app = "../test_runner/src/test/kotlin/ftl/fixtures/tmp/apk/app-debug.apk", - test = "gs://flank-open-source.appspot.com/integration/app-single-success-debug-androidTest.apk", + test = "gs://flank-integration/app-single-success-debug-androidTest.apk", shards = mapOf( "shard-0" to listOf( "class com.example.test_app.InstrumentedTest#test" diff --git a/integration_tests/src/test/resources/cases/flank_android_custom_sharding.yml b/integration_tests/src/test/resources/cases/flank_android_custom_sharding.yml index 76721e10f3..f702322235 100644 --- a/integration_tests/src/test/resources/cases/flank_android_custom_sharding.yml +++ b/integration_tests/src/test/resources/cases/flank_android_custom_sharding.yml @@ -11,7 +11,7 @@ flank: max-test-shards: 2 num-test-runs: 1 additional-app-test-apks: - - test: gs://flank-open-source.appspot.com/integration/app-single-success-debug-androidTest.apk + - test: gs://flank-integration/app-single-success-debug-androidTest.apk - test: ../test_runner/src/test/kotlin/ftl/fixtures/tmp/apk/app-multiple-error-debug-androidTest.apk - test: ../test_runner/src/test/kotlin/ftl/fixtures/tmp/apk/app-multiple-success-debug-androidTest.apk - test: ../test_projects/android/apks/invalid.apk diff --git a/integration_tests/src/test/resources/cases/flank_android_multiple_apk.yml b/integration_tests/src/test/resources/cases/flank_android_multiple_apk.yml index b988e5b073..c64b7010e1 100644 --- a/integration_tests/src/test/resources/cases/flank_android_multiple_apk.yml +++ b/integration_tests/src/test/resources/cases/flank_android_multiple_apk.yml @@ -16,7 +16,7 @@ flank: version: 28 test-targets: - class com.example.test_app.InstrumentedTest#test2 - - test: gs://flank-open-source.appspot.com/integration/app-single-success-debug-androidTest.apk + - test: gs://flank-integration/app-single-success-debug-androidTest.apk device: - model: Nexus6P version: 27 diff --git a/integration_tests/src/test/resources/cases/flank_android_multiple_devices.yml b/integration_tests/src/test/resources/cases/flank_android_multiple_devices.yml index 228fa2ecbc..90e99bbb82 100644 --- a/integration_tests/src/test/resources/cases/flank_android_multiple_devices.yml +++ b/integration_tests/src/test/resources/cases/flank_android_multiple_devices.yml @@ -17,6 +17,6 @@ flank: additional-app-test-apks: - test: ../test_runner/src/test/kotlin/ftl/fixtures/tmp/apk/app-multiple-success-debug-androidTest.apk - test: ../test_runner/src/test/kotlin/ftl/fixtures/tmp/apk/app-multiple-error-debug-androidTest.apk - - test: gs://flank-open-source.appspot.com/integration/app-single-success-debug-androidTest.apk + - test: gs://flank-integration/app-single-success-debug-androidTest.apk disable-usage-statistics: true output-report: json diff --git a/integration_tests/src/test/resources/cases/flank_android_run_timeout.yml b/integration_tests/src/test/resources/cases/flank_android_run_timeout.yml index 52f3576572..331ad488bd 100644 --- a/integration_tests/src/test/resources/cases/flank_android_run_timeout.yml +++ b/integration_tests/src/test/resources/cases/flank_android_run_timeout.yml @@ -1,6 +1,6 @@ gcloud: - app: gs://flank-open-source.appspot.com/integration/app-debug.apk - test: gs://flank-open-source.appspot.com/integration/app-single-success-debug-androidTest.apk + app: gs://flank-integration/app-debug.apk + test: gs://flank-integration/app-single-success-debug-androidTest.apk flank: disable-results-upload: true diff --git a/integration_tests/src/test/resources/compare/AllTestFilteredIT-android-compare b/integration_tests/src/test/resources/compare/AllTestFilteredIT-android-compare index 1beaf92d6b..06eda9e03c 100644 --- a/integration_tests/src/test/resources/compare/AllTestFilteredIT-android-compare +++ b/integration_tests/src/test/resources/compare/AllTestFilteredIT-android-compare @@ -49,7 +49,7 @@ AndroidArgs files-to-download: test-targets-always-run: disable-sharding: true - project: flank-open-source + project: ftl-flank-open-source local-result-dir: results full-junit-result: false # Android Flank Yml diff --git a/integration_tests/src/test/resources/compare/AllTestFilteredIT-ios-compare b/integration_tests/src/test/resources/compare/AllTestFilteredIT-ios-compare index c8bdc90928..f1c7415c1a 100644 --- a/integration_tests/src/test/resources/compare/AllTestFilteredIT-ios-compare +++ b/integration_tests/src/test/resources/compare/AllTestFilteredIT-ios-compare @@ -43,7 +43,7 @@ IosArgs test-targets: - nonExisting\/Class disable-sharding: false - project: flank-open-source + project: ftl-flank-open-source local-result-dir: results run-timeout: -1 ignore-failed-tests: false diff --git a/integration_tests/src/test/resources/compare/GameloopIT-android-compare b/integration_tests/src/test/resources/compare/GameloopIT-android-compare index 5d0e305ae2..741fe1f720 100644 --- a/integration_tests/src/test/resources/compare/GameloopIT-android-compare +++ b/integration_tests/src/test/resources/compare/GameloopIT-android-compare @@ -50,7 +50,7 @@ AndroidArgs files-to-download: test-targets-always-run: disable-sharding: true - project: flank-open-source + project: ftl-flank-open-source local-result-dir: results full-junit-result: false # Android Flank Yml @@ -76,7 +76,7 @@ RunTests Raw results will be stored in your GCS bucket at \[https:\/\/console.developers.google.com\/storage\/browser\/test-lab-[a-zA-Z0-9-]*\/[.a-zA-Z0-9_-]*\] \s* Matrices webLink - matrix-[a-zA-Z0-9]* https:\/\/console.firebase.google.com\/project\/flank-open-source\/testlab\/histories\/[.a-zA-Z0-9_-]*\/matrices\/[.a-zA-Z0-9_-]*(\/executions\/[.a-zA-Z0-9_-]*)? + matrix-[a-zA-Z0-9]* https:\/\/console.firebase.google.com\/project\/ftl-flank-open-source\/testlab\/histories\/[.a-zA-Z0-9_-]*\/matrices\/[.a-zA-Z0-9_-]*(\/executions\/[.a-zA-Z0-9_-]*)? [\s\S]* CostReport Virtual devices @@ -95,4 +95,4 @@ FetchArtifacts Updating matrix file \s* Matrices webLink - matrix-[a-zA-Z0-9]* https:\/\/console.firebase.google.com\/project\/flank-open-source\/testlab\/histories\/[.a-zA-Z0-9_-]*\/matrices\/[.a-zA-Z0-9_-]*(\/executions\/[.a-zA-Z0-9_-]*)? + matrix-[a-zA-Z0-9]* https:\/\/console.firebase.google.com\/project\/ftl-flank-open-source\/testlab\/histories\/[.a-zA-Z0-9_-]*\/matrices\/[.a-zA-Z0-9_-]*(\/executions\/[.a-zA-Z0-9_-]*)? diff --git a/integration_tests/src/test/resources/compare/GameloopIT-ios-compare b/integration_tests/src/test/resources/compare/GameloopIT-ios-compare index d71af8f517..ad4c9f5591 100644 --- a/integration_tests/src/test/resources/compare/GameloopIT-ios-compare +++ b/integration_tests/src/test/resources/compare/GameloopIT-ios-compare @@ -43,7 +43,7 @@ IosArgs # iOS flank test-targets: disable-sharding: false - project: flank-open-source + project: ftl-flank-open-source local-result-dir: results run-timeout: -1 ignore-failed-tests: false @@ -65,7 +65,7 @@ RunTests Raw results will be stored in your GCS bucket at \[https:\/\/console.developers.google.com\/storage\/browser\/test-lab-[a-zA-Z0-9_-]*\/[.a-zA-Z0-9_-]*\] Matrices webLink - matrix-[a-zA-Z0-9]* https:\/\/console.firebase.google.com\/project\/flank-open-source\/testlab\/histories\/[.a-zA-Z0-9_-]*\/matrices\/[.a-zA-Z0-9_-]*(\/executions\/[.a-zA-Z0-9_-]*)? + matrix-[a-zA-Z0-9]* https:\/\/console.firebase.google.com\/project\/ftl-flank-open-source\/testlab\/histories\/[.a-zA-Z0-9_-]*\/matrices\/[.a-zA-Z0-9_-]*(\/executions\/[.a-zA-Z0-9_-]*)? [\s\S]* @@ -90,4 +90,4 @@ FetchArtifacts Updating matrix file \s* Matrices webLink - matrix-[a-zA-Z0-9]* https:\/\/console.firebase.google.com\/project\/flank-open-source\/testlab\/histories\/[.a-zA-Z0-9_-]*\/matrices\/[.a-zA-Z0-9_-]*(\/executions\/[.a-zA-Z0-9_-]*)? + matrix-[a-zA-Z0-9]* https:\/\/console.firebase.google.com\/project\/ftl-flank-open-source\/testlab\/histories\/[.a-zA-Z0-9_-]*\/matrices\/[.a-zA-Z0-9_-]*(\/executions\/[.a-zA-Z0-9_-]*)? diff --git a/integration_tests/src/test/resources/compare/IgnoreFailedIT-compare b/integration_tests/src/test/resources/compare/IgnoreFailedIT-compare index 99b2ad16a6..a31fb335f8 100644 --- a/integration_tests/src/test/resources/compare/IgnoreFailedIT-compare +++ b/integration_tests/src/test/resources/compare/IgnoreFailedIT-compare @@ -48,7 +48,7 @@ AndroidArgs files-to-download: test-targets-always-run: disable-sharding: false - project: flank-open-source + project: ftl-flank-open-source local-result-dir: results full-junit-result: false # Android Flank Yml @@ -79,7 +79,7 @@ RunTests Raw results will be stored in your GCS bucket at \[https:\/\/console.developers.google.com\/storage\/browser\/test-lab-[a-zA-Z0-9_-]*\/[.a-zA-Z0-9_-]*\] Matrices webLink - matrix-[a-zA-Z0-9]* https:\/\/console.firebase.google.com\/project\/flank-open-source\/testlab\/histories\/[.a-zA-Z0-9_-]*\/matrices\/[.a-zA-Z0-9_-]*(\/executions\/[.a-zA-Z0-9_-]*)? + matrix-[a-zA-Z0-9]* https:\/\/console.firebase.google.com\/project\/ftl-flank-open-source\/testlab\/histories\/[.a-zA-Z0-9_-]*\/matrices\/[.a-zA-Z0-9_-]*(\/executions\/[.a-zA-Z0-9_-]*)? [\s\S]* CostReport Virtual devices @@ -91,11 +91,11 @@ MatrixResultsReport 1 matrices failed [\s\S]* More details are available at: -https:\/\/console.firebase.google.com\/project\/flank-open-source\/testlab\/histories\/[.a-zA-Z0-9_-]*\/matrices\/[.a-zA-Z0-9_-]*(\/executions\/[.a-zA-Z0-9_-]*)? +https:\/\/console.firebase.google.com\/project\/ftl-flank-open-source\/testlab\/histories\/[.a-zA-Z0-9_-]*\/matrices\/[.a-zA-Z0-9_-]*(\/executions\/[.a-zA-Z0-9_-]*)? FetchArtifacts Updating matrix file \s* Matrices webLink - matrix-[a-zA-Z0-9]* https:\/\/console.firebase.google.com\/project\/flank-open-source\/testlab\/histories\/[.a-zA-Z0-9_-]*\/matrices\/[.a-zA-Z0-9_-]*(\/executions\/[.a-zA-Z0-9_-]*)? + matrix-[a-zA-Z0-9]* https:\/\/console.firebase.google.com\/project\/ftl-flank-open-source\/testlab\/histories\/[.a-zA-Z0-9_-]*\/matrices\/[.a-zA-Z0-9_-]*(\/executions\/[.a-zA-Z0-9_-]*)? diff --git a/integration_tests/src/test/resources/compare/MultipleApksIT-compare b/integration_tests/src/test/resources/compare/MultipleApksIT-compare index 470091a131..0a97bf2739 100644 --- a/integration_tests/src/test/resources/compare/MultipleApksIT-compare +++ b/integration_tests/src/test/resources/compare/MultipleApksIT-compare @@ -48,7 +48,7 @@ AndroidArgs files-to-download: test-targets-always-run: disable-sharding: false - project: flank-open-source + project: ftl-flank-open-source local-result-dir: results full-junit-result: false # Android Flank Yml @@ -59,7 +59,7 @@ AndroidArgs - app: null test: [0-9a-zA-Z\\\/_.:-]*[\\\/]test_runner[\\\/]src[\\\/]test[\\\/]kotlin[\\\/]ftl[\\\/]fixtures[\\\/]tmp[\\\/]apk[\\\/]app-multiple-error-debug-androidTest.apk - app: null - test: gs:\/\/flank-open-source.appspot.com\/integration\/app-single-success-debug-androidTest.apk + test: gs:\/\/ftl-flank-open-source.appspot.com\/integration\/app-single-success-debug-androidTest.apk run-timeout: -1 legacy-junit-result: false ignore-failed-tests: false @@ -91,10 +91,10 @@ RunTests Raw results will be stored in your GCS bucket at \[https:\/\/console.developers.google.com\/storage\/browser\/test-lab-[a-zA-Z0-9_-]*\/[.a-zA-Z0-9_-]*\] \s* Matrices webLink - matrix-[a-zA-Z0-9]* https:\/\/console.firebase.google.com\/project\/flank-open-source\/testlab\/histories\/[.a-zA-Z0-9_-]*\/matrices\/[.a-zA-Z0-9_-]*(\/executions\/[.a-zA-Z0-9_-]*)? - matrix-[a-zA-Z0-9]* https:\/\/console.firebase.google.com\/project\/flank-open-source\/testlab\/histories\/[.a-zA-Z0-9_-]*\/matrices\/[.a-zA-Z0-9_-]*(\/executions\/[.a-zA-Z0-9_-]*)? - matrix-[a-zA-Z0-9]* https:\/\/console.firebase.google.com\/project\/flank-open-source\/testlab\/histories\/[.a-zA-Z0-9_-]*\/matrices\/[.a-zA-Z0-9_-]*(\/executions\/[.a-zA-Z0-9_-]*)? - matrix-[a-zA-Z0-9]* https:\/\/console.firebase.google.com\/project\/flank-open-source\/testlab\/histories\/[.a-zA-Z0-9_-]*\/matrices\/[.a-zA-Z0-9_-]*(\/executions\/[.a-zA-Z0-9_-]*)? + matrix-[a-zA-Z0-9]* https:\/\/console.firebase.google.com\/project\/ftl-flank-open-source\/testlab\/histories\/[.a-zA-Z0-9_-]*\/matrices\/[.a-zA-Z0-9_-]*(\/executions\/[.a-zA-Z0-9_-]*)? + matrix-[a-zA-Z0-9]* https:\/\/console.firebase.google.com\/project\/ftl-flank-open-source\/testlab\/histories\/[.a-zA-Z0-9_-]*\/matrices\/[.a-zA-Z0-9_-]*(\/executions\/[.a-zA-Z0-9_-]*)? + matrix-[a-zA-Z0-9]* https:\/\/console.firebase.google.com\/project\/ftl-flank-open-source\/testlab\/histories\/[.a-zA-Z0-9_-]*\/matrices\/[.a-zA-Z0-9_-]*(\/executions\/[.a-zA-Z0-9_-]*)? + matrix-[a-zA-Z0-9]* https:\/\/console.firebase.google.com\/project\/ftl-flank-open-source\/testlab\/histories\/[.a-zA-Z0-9_-]*\/matrices\/[.a-zA-Z0-9_-]*(\/executions\/[.a-zA-Z0-9_-]*)? [\s\S]* CostReport Virtual devices @@ -107,7 +107,7 @@ MatrixResultsReport 1 matrices failed [\s\S]* More details are available at: -https:\/\/console.firebase.google.com\/project\/flank-open-source\/testlab\/histories\/[.a-zA-Z0-9_-]*\/matrices\/[.a-zA-Z0-9_-]*(\/executions\/[.a-zA-Z0-9_-]*)? +https:\/\/console.firebase.google.com\/project\/ftl-flank-open-source\/testlab\/histories\/[.a-zA-Z0-9_-]*\/matrices\/[.a-zA-Z0-9_-]*(\/executions\/[.a-zA-Z0-9_-]*)? \s* Uploading \[MatrixResultsReport.txt\] to https:\/\/console.developers.google.com\/storage\/browser\/test-lab-[a-zA-Z0-9_-]*\/[.a-zA-Z0-9_-]*\/\.* Uploading \[HtmlErrorReport.html\] to https:\/\/console.developers.google.com\/storage\/browser\/test-lab-[a-zA-Z0-9_-]*\/[.a-zA-Z0-9_-]*\/\.* @@ -118,7 +118,7 @@ FetchArtifacts Updating matrix file \s* Matrices webLink - matrix-[a-zA-Z0-9]* https:\/\/console.firebase.google.com\/project\/flank-open-source\/testlab\/histories\/[.a-zA-Z0-9_-]*\/matrices\/[.a-zA-Z0-9_-]*(\/executions\/[.a-zA-Z0-9_-]*)? - matrix-[a-zA-Z0-9]* https:\/\/console.firebase.google.com\/project\/flank-open-source\/testlab\/histories\/[.a-zA-Z0-9_-]*\/matrices\/[.a-zA-Z0-9_-]*(\/executions\/[.a-zA-Z0-9_-]*)? - matrix-[a-zA-Z0-9]* https:\/\/console.firebase.google.com\/project\/flank-open-source\/testlab\/histories\/[.a-zA-Z0-9_-]*\/matrices\/[.a-zA-Z0-9_-]*(\/executions\/[.a-zA-Z0-9_-]*)? - matrix-[a-zA-Z0-9]* https:\/\/console.firebase.google.com\/project\/flank-open-source\/testlab\/histories\/[.a-zA-Z0-9_-]*\/matrices\/[.a-zA-Z0-9_-]*(\/executions\/[.a-zA-Z0-9_-]*)? + matrix-[a-zA-Z0-9]* https:\/\/console.firebase.google.com\/project\/ftl-flank-open-source\/testlab\/histories\/[.a-zA-Z0-9_-]*\/matrices\/[.a-zA-Z0-9_-]*(\/executions\/[.a-zA-Z0-9_-]*)? + matrix-[a-zA-Z0-9]* https:\/\/console.firebase.google.com\/project\/ftl-flank-open-source\/testlab\/histories\/[.a-zA-Z0-9_-]*\/matrices\/[.a-zA-Z0-9_-]*(\/executions\/[.a-zA-Z0-9_-]*)? + matrix-[a-zA-Z0-9]* https:\/\/console.firebase.google.com\/project\/ftl-flank-open-source\/testlab\/histories\/[.a-zA-Z0-9_-]*\/matrices\/[.a-zA-Z0-9_-]*(\/executions\/[.a-zA-Z0-9_-]*)? + matrix-[a-zA-Z0-9]* https:\/\/console.firebase.google.com\/project\/ftl-flank-open-source\/testlab\/histories\/[.a-zA-Z0-9_-]*\/matrices\/[.a-zA-Z0-9_-]*(\/executions\/[.a-zA-Z0-9_-]*)? diff --git a/integration_tests/src/test/resources/compare/MultipleDevicesIT-android-compare b/integration_tests/src/test/resources/compare/MultipleDevicesIT-android-compare index af256f6f09..190fb4284d 100644 --- a/integration_tests/src/test/resources/compare/MultipleDevicesIT-android-compare +++ b/integration_tests/src/test/resources/compare/MultipleDevicesIT-android-compare @@ -56,7 +56,7 @@ AndroidArgs files-to-download: test-targets-always-run: disable-sharding: false - project: flank-open-source + project: ftl-flank-open-source local-result-dir: results full-junit-result: false # Android Flank Yml @@ -67,7 +67,7 @@ AndroidArgs - app: null test: [0-9a-zA-Z\\\/_.:-]*[\\\/]test_runner[\\\/]src[\\\/]test[\\\/]kotlin[\\\/]ftl[\\\/]fixtures[\\\/]tmp[\\\/]apk[\\\/]app-multiple-error-debug-androidTest.apk - app: null - test: gs:\/\/flank-open-source.appspot.com\/integration\/app-single-success-debug-androidTest.apk + test: gs:\/\/ftl-flank-open-source.appspot.com\/integration\/app-single-success-debug-androidTest.apk run-timeout: -1 legacy-junit-result: false ignore-failed-tests: false @@ -101,9 +101,9 @@ RunTests Raw results will be stored in your GCS bucket at \[https:\/\/console.developers.google.com\/storage\/browser\/test-lab-[a-zA-Z0-9-]*\/[.a-zA-Z0-9_-]*\] \s* Matrices webLink - matrix-[a-zA-Z0-9]* https:\/\/console.firebase.google.com\/project\/flank-open-source\/testlab\/histories\/[.a-zA-Z0-9_-]*\/matrices\/[.a-zA-Z0-9_-]*(\/executions\/[.a-zA-Z0-9_-]*)? - matrix-[a-zA-Z0-9]* https:\/\/console.firebase.google.com\/project\/flank-open-source\/testlab\/histories\/[.a-zA-Z0-9_-]*\/matrices\/[.a-zA-Z0-9_-]*(\/executions\/[.a-zA-Z0-9_-]*)? - matrix-[a-zA-Z0-9]* https:\/\/console.firebase.google.com\/project\/flank-open-source\/testlab\/histories\/[.a-zA-Z0-9_-]*\/matrices\/[.a-zA-Z0-9_-]*(\/executions\/[.a-zA-Z0-9_-]*)? + matrix-[a-zA-Z0-9]* https:\/\/console.firebase.google.com\/project\/ftl-flank-open-source\/testlab\/histories\/[.a-zA-Z0-9_-]*\/matrices\/[.a-zA-Z0-9_-]*(\/executions\/[.a-zA-Z0-9_-]*)? + matrix-[a-zA-Z0-9]* https:\/\/console.firebase.google.com\/project\/ftl-flank-open-source\/testlab\/histories\/[.a-zA-Z0-9_-]*\/matrices\/[.a-zA-Z0-9_-]*(\/executions\/[.a-zA-Z0-9_-]*)? + matrix-[a-zA-Z0-9]* https:\/\/console.firebase.google.com\/project\/ftl-flank-open-source\/testlab\/histories\/[.a-zA-Z0-9_-]*\/matrices\/[.a-zA-Z0-9_-]*(\/executions\/[.a-zA-Z0-9_-]*)? [\s\S]* CostReport Virtual devices @@ -116,7 +116,7 @@ MatrixResultsReport 1 matrices failed [\s\S]* More details are available at: -https:\/\/console.firebase.google.com\/project\/flank-open-source\/testlab\/histories\/[.a-zA-Z0-9_-]*\/matrices\/[.a-zA-Z0-9_-]*(\/executions\/[.a-zA-Z0-9_-]*)? +https:\/\/console.firebase.google.com\/project\/ftl-flank-open-source\/testlab\/histories\/[.a-zA-Z0-9_-]*\/matrices\/[.a-zA-Z0-9_-]*(\/executions\/[.a-zA-Z0-9_-]*)? \s* Uploading \[MatrixResultsReport.txt\] to https:\/\/console.developers.google.com\/storage\/browser\/test-lab-[a-zA-Z0-9_-]*\/[.a-zA-Z0-9_-]*\/\.* Uploading \[HtmlErrorReport.html\] to https:\/\/console.developers.google.com\/storage\/browser\/test-lab-[a-zA-Z0-9_-]*\/[.a-zA-Z0-9_-]*\/\.* @@ -127,6 +127,6 @@ FetchArtifacts Updating matrix file \s* Matrices webLink - matrix-[a-zA-Z0-9]* https:\/\/console.firebase.google.com\/project\/flank-open-source\/testlab\/histories\/[.a-zA-Z0-9_-]*\/matrices\/[.a-zA-Z0-9_-]*(\/executions\/[.a-zA-Z0-9_-]*)? - matrix-[a-zA-Z0-9]* https:\/\/console.firebase.google.com\/project\/flank-open-source\/testlab\/histories\/[.a-zA-Z0-9_-]*\/matrices\/[.a-zA-Z0-9_-]*(\/executions\/[.a-zA-Z0-9_-]*)? - matrix-[a-zA-Z0-9]* https:\/\/console.firebase.google.com\/project\/flank-open-source\/testlab\/histories\/[.a-zA-Z0-9_-]*\/matrices\/[.a-zA-Z0-9_-]*(\/executions\/[.a-zA-Z0-9_-]*)? + matrix-[a-zA-Z0-9]* https:\/\/console.firebase.google.com\/project\/ftl-flank-open-source\/testlab\/histories\/[.a-zA-Z0-9_-]*\/matrices\/[.a-zA-Z0-9_-]*(\/executions\/[.a-zA-Z0-9_-]*)? + matrix-[a-zA-Z0-9]* https:\/\/console.firebase.google.com\/project\/ftl-flank-open-source\/testlab\/histories\/[.a-zA-Z0-9_-]*\/matrices\/[.a-zA-Z0-9_-]*(\/executions\/[.a-zA-Z0-9_-]*)? + matrix-[a-zA-Z0-9]* https:\/\/console.firebase.google.com\/project\/ftl-flank-open-source\/testlab\/histories\/[.a-zA-Z0-9_-]*\/matrices\/[.a-zA-Z0-9_-]*(\/executions\/[.a-zA-Z0-9_-]*)? diff --git a/integration_tests/src/test/resources/compare/RunTimeoutIT-compare b/integration_tests/src/test/resources/compare/RunTimeoutIT-compare index 47df8ef23f..24da049551 100644 --- a/integration_tests/src/test/resources/compare/RunTimeoutIT-compare +++ b/integration_tests/src/test/resources/compare/RunTimeoutIT-compare @@ -9,8 +9,8 @@ AndroidArgs network-profile: null results-history-name: null # Android gcloud - app: [0-9a-zA-Z\\\/_.:-]*[\\\/]flank-open-source.appspot.com[\\\/]integration[\\\/]app-debug.apk - test: [0-9a-zA-Z\\\/_.:-]*[\\\/]flank-open-source.appspot.com[\\\/]integration[\\\/]app-single-success-debug-androidTest.apk + app: [0-9a-zA-Z\\\/_.:-]*[\\\/]ftl-flank-open-source.appspot.com[\\\/]integration[\\\/]app-debug.apk + test: [0-9a-zA-Z\\\/_.:-]*[\\\/]ftl-flank-open-source.appspot.com[\\\/]integration[\\\/]app-single-success-debug-androidTest.apk additional-apks: auto-google-login: false use-orchestrator: true @@ -48,7 +48,7 @@ AndroidArgs files-to-download: test-targets-always-run: disable-sharding: true - project: flank-open-source + project: ftl-flank-open-source local-result-dir: results full-junit-result: false # Android Flank Yml @@ -73,7 +73,7 @@ RunTests Raw results will be stored in your GCS bucket at \[https:\/\/console.developers.google.com\/storage\/browser\/test-lab-[a-zA-Z0-9_-]*\/[.a-zA-Z0-9_-]*\] Matrices webLink - matrix-[0-9a-zA-Z\/_.-]* https:\/\/console.firebase.google.com\/project\/flank-open-source\/testlab\/histories\/[.a-zA-Z0-9_-]*\/matrices\/[.a-zA-Z0-9_-]*(\/executions\/[.a-zA-Z0-9_-]*)? + matrix-[0-9a-zA-Z\/_.-]* https:\/\/console.firebase.google.com\/project\/ftl-flank-open-source\/testlab\/histories\/[.a-zA-Z0-9_-]*\/matrices\/[.a-zA-Z0-9_-]*(\/executions\/[.a-zA-Z0-9_-]*)? [\s\S]* diff --git a/integration_tests/src/test/resources/compare/SanityRoboIT-compare b/integration_tests/src/test/resources/compare/SanityRoboIT-compare index 2f0c58a733..74e75d117b 100644 --- a/integration_tests/src/test/resources/compare/SanityRoboIT-compare +++ b/integration_tests/src/test/resources/compare/SanityRoboIT-compare @@ -48,7 +48,7 @@ AndroidArgs files-to-download: test-targets-always-run: disable-sharding: false - project: flank-open-source + project: ftl-flank-open-source local-result-dir: results full-junit-result: false # Android Flank Yml @@ -73,7 +73,7 @@ RunTests Raw results will be stored in your GCS bucket at \[https:\/\/console.developers.google.com\/storage\/browser\/test-lab-[a-zA-Z0-9_-]*\/[.a-zA-Z0-9_-]*\] Matrices webLink - matrix-[a-zA-Z0-9]* https:\/\/console.firebase.google.com\/project\/flank-open-source\/testlab\/histories\/[.a-zA-Z0-9_-]*\/matrices\/[.a-zA-Z0-9_-]*\/executions\/[.a-zA-Z0-9_-]* + matrix-[a-zA-Z0-9]* https:\/\/console.firebase.google.com\/project\/ftl-flank-open-source\/testlab\/histories\/[.a-zA-Z0-9_-]*\/matrices\/[.a-zA-Z0-9_-]*\/executions\/[.a-zA-Z0-9_-]* [\s\S]* CostReport Virtual devices @@ -92,4 +92,4 @@ FetchArtifacts Updating matrix file \s* Matrices webLink - matrix-[a-zA-Z0-9]* https:\/\/console.firebase.google.com\/project\/flank-open-source\/testlab\/histories\/[.a-zA-Z0-9_-]*\/matrices\/[.a-zA-Z0-9_-]*\/executions\/[.a-zA-Z0-9_-]* + matrix-[a-zA-Z0-9]* https:\/\/console.firebase.google.com\/project\/ftl-flank-open-source\/testlab\/histories\/[.a-zA-Z0-9_-]*\/matrices\/[.a-zA-Z0-9_-]*\/executions\/[.a-zA-Z0-9_-]* diff --git a/integration_tests/src/test/resources/compare/TestFilteringIT-compare b/integration_tests/src/test/resources/compare/TestFilteringIT-compare index 2b68b0e29e..d9bd26dad7 100644 --- a/integration_tests/src/test/resources/compare/TestFilteringIT-compare +++ b/integration_tests/src/test/resources/compare/TestFilteringIT-compare @@ -49,7 +49,7 @@ AndroidArgs files-to-download: test-targets-always-run: disable-sharding: true - project: flank-open-source + project: ftl-flank-open-source local-result-dir: results full-junit-result: false # Android Flank Yml @@ -81,7 +81,7 @@ RunTests Raw results will be stored in your GCS bucket at \[https:\/\/console.developers.google.com\/storage\/browser\/test-lab-[a-zA-Z0-9_-]*\/[.a-zA-Z0-9_-]*\] \s* Matrices webLink - matrix-[a-zA-Z0-9]* https:\/\/console.firebase.google.com\/project\/flank-open-source\/testlab\/histories\/[.a-zA-Z0-9_-]*\/matrices\/[.a-zA-Z0-9_-]*(\/executions\/[.a-zA-Z0-9_-]*)? + matrix-[a-zA-Z0-9]* https:\/\/console.firebase.google.com\/project\/ftl-flank-open-source\/testlab\/histories\/[.a-zA-Z0-9_-]*\/matrices\/[.a-zA-Z0-9_-]*(\/executions\/[.a-zA-Z0-9_-]*)? [\s\S]* CostReport Virtual devices @@ -100,4 +100,4 @@ FetchArtifacts Updating matrix file \s* Matrices webLink - matrix-[a-zA-Z0-9]* https:\/\/console.firebase.google.com\/project\/flank-open-source\/testlab\/histories\/[.a-zA-Z0-9_-]*\/matrices\/[.a-zA-Z0-9_-]*(\/executions\/[.a-zA-Z0-9_-]*)? + matrix-[a-zA-Z0-9]* https:\/\/console.firebase.google.com\/project\/ftl-flank-open-source\/testlab\/histories\/[.a-zA-Z0-9_-]*\/matrices\/[.a-zA-Z0-9_-]*(\/executions\/[.a-zA-Z0-9_-]*)? diff --git a/test_projects/flutter/flutter_example/build_and_run_tests_firebase.sh b/test_projects/flutter/flutter_example/build_and_run_tests_firebase.sh index e54faabbe2..f346a84fcc 100755 --- a/test_projects/flutter/flutter_example/build_and_run_tests_firebase.sh +++ b/test_projects/flutter/flutter_example/build_and_run_tests_firebase.sh @@ -9,7 +9,7 @@ pushd android popd gcloud alpha firebase test android run \ - --project flank-open-source \ + --project ftl-flank-open-source \ --type instrumentation \ --app build/app/outputs/apk/debug/app-debug.apk \ --test build/app/outputs/apk/androidTest/debug/app-debug-androidTest.apk \ diff --git a/test_runner/flank.ios.yml b/test_runner/flank.ios.yml index 7ef4911c9d..69164ea5e7 100644 --- a/test_runner/flank.ios.yml +++ b/test_runner/flank.ios.yml @@ -214,7 +214,7 @@ flank: ### Billing Project ID ## The billing enabled Google Cloud Platform project id to use - # project: flank-open-source + # project: ftl-flank-open-source ### Local Result Directory Storage ## Local folder to store the test result. Folder is DELETED before each run to ensure only artifacts from the new run are saved. diff --git a/test_runner/flank.yml b/test_runner/flank.yml index 671677546c..98fb99ce86 100644 --- a/test_runner/flank.yml +++ b/test_runner/flank.yml @@ -294,7 +294,7 @@ flank: ### Billing Project ID ## The billing enabled Google Cloud Platform project id to use - # project: flank-open-source + # project: ftl-flank-open-source ### Local Results Directory ## Local folder to store the test result. Folder is DELETED before each run to ensure only artifacts from the new run are saved. diff --git a/test_runner/src/main/kotlin/ftl/mock/MockServer.kt b/test_runner/src/main/kotlin/ftl/mock/MockServer.kt index 8d92932e96..e498116e24 100644 --- a/test_runner/src/main/kotlin/ftl/mock/MockServer.kt +++ b/test_runner/src/main/kotlin/ftl/mock/MockServer.kt @@ -198,7 +198,7 @@ object MockServer { } // GcTestMatrix.build - // http://localhost:8080/v1/projects/flank-open-source/testMatrices + // http://localhost:8080/v1/projects/ftl-flank-open-source/testMatrices post("/v1/projects/{project}/testMatrices") { println("Responding to POST ${call.request.uri}") val projectId = call.parameters["project"] @@ -248,7 +248,7 @@ object MockServer { } // GcToolResults.getStepResult(toolResultsStep) - // GET /toolresults/v1beta3/projects/flank-open-source/histories/1/executions/1/steps/1 + // GET /toolresults/v1beta3/projects/ftl-flank-open-source/histories/1/executions/1/steps/1 get("/toolresults/v1beta3/projects/{project}/histories/{historyId}/executions/{executionId}/steps/{stepId}") { println("Responding to GET ${call.request.uri}") val stepId = call.parameters["stepId"] ?: "" @@ -256,14 +256,14 @@ object MockServer { } // GcToolResults.getExecutionResult(toolResultsStep) - // GET /toolresults/v1beta3/projects/flank-open-source/histories/1/executions/1 + // GET /toolresults/v1beta3/projects/ftl-flank-open-source/histories/1/executions/1 get("/toolresults/v1beta3/projects/{project}/histories/{historyId}/executions/{executionId}") { println("Responding to GET ${call.request.uri}") val executionId = call.parameters["executionId"] ?: "" call.respond(fakeStep(executionId)) } // GcToolResults.listTestCases(toolResultsStep) - // GET /toolresults/v1beta3/projects/flank-open-source/histories/1/executions/1/steps/1/testCases + // GET /toolresults/v1beta3/projects/ftl-flank-open-source/histories/1/executions/1/steps/1/testCases get("/toolresults/v1beta3/projects/{project}/histories/{historyId}/executions/{executionId}/steps/{stepId}/testCases") { println("Responding to GET ${call.request.uri}") val executionId = call.parameters["executionId"] ?: "" diff --git a/test_runner/src/test/kotlin/ftl/args/AndroidArgsFileTest.kt b/test_runner/src/test/kotlin/ftl/args/AndroidArgsFileTest.kt index 962ab70926..0e3a4e2ff4 100644 --- a/test_runner/src/test/kotlin/ftl/args/AndroidArgsFileTest.kt +++ b/test_runner/src/test/kotlin/ftl/args/AndroidArgsFileTest.kt @@ -251,7 +251,7 @@ class AndroidArgsFileTest { defaultAndroidConfig().apply { common.apply { gcloud.resultsBucket = oldConfig.resultsBucket - flank.project = "flank-open-source" + flank.project = "ftl-flank-open-source" } platform.gcloud.apply { app = oldConfig.appApk diff --git a/test_runner/src/test/kotlin/ftl/args/yml/ErrorParserTest.kt b/test_runner/src/test/kotlin/ftl/args/yml/ErrorParserTest.kt index 87da061c63..2d30fe47f1 100644 --- a/test_runner/src/test/kotlin/ftl/args/yml/ErrorParserTest.kt +++ b/test_runner/src/test/kotlin/ftl/args/yml/ErrorParserTest.kt @@ -90,7 +90,7 @@ Error node: { val testYaml = """ flank: disable-sharding: false - project: flank-open-source + project: ftl-flank-open-source gcloud: app: ../test_app/apks/app-debug.apk test: ../test_app/apks/app-debug-androidTest.apk diff --git a/test_runner/src/test/kotlin/ftl/args/yml/test_error_yaml_cases/flank-bad-yaml-formatting.yml b/test_runner/src/test/kotlin/ftl/args/yml/test_error_yaml_cases/flank-bad-yaml-formatting.yml index 02afcb5907..d1ba409932 100644 --- a/test_runner/src/test/kotlin/ftl/args/yml/test_error_yaml_cases/flank-bad-yaml-formatting.yml +++ b/test_runner/src/test/kotlin/ftl/args/yml/test_error_yaml_cases/flank-bad-yaml-formatting.yml @@ -1,6 +1,6 @@ flank: disable-sharding: false - project: flank-open-source + project: ftl-flank-open-source gcloud: app: ../test_projects/android/apks/app-debug.apk test: ../test_projects/android/apks/app-debug-androidTest.apk