From 3215ac8cf0470d182b9b112bf325c77d6d6f9deb Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Thu, 3 Feb 2022 14:39:06 -0500 Subject: [PATCH 1/2] [ci] Skip Android webview FTL tests on stable These tests crash on stable due to https://github.com/flutter/flutter/issues/96661 now that 2.10 has been released to stable. Fixes out-of-band tree closure from the 2.10 release. --- .cirrus.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index f2372a91f2f5..fa20b520512b 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -222,6 +222,7 @@ task: # only run unit tests. # Must come after build-examples. - ./script/tool_runner.sh native-test --android --no-integration --exclude script/configs/exclude_native_unit_android.yaml + - fi firebase_test_lab_script: # Unsetting CIRRUS_CHANGE_MESSAGE and CIRRUS_COMMIT_MESSAGE as they # might include non-ASCII characters which makes Gradle crash. @@ -230,7 +231,15 @@ task: - export CIRRUS_COMMIT_MESSAGE="" - if [[ -n "$GCLOUD_FIREBASE_TESTLAB_KEY" ]]; then - echo $GCLOUD_FIREBASE_TESTLAB_KEY > ${HOME}/gcloud-service-key.json - - ./script/tool_runner.sh firebase-test-lab --device model=redfin,version=30 --device model=starqlteue,version=26 --exclude=script/configs/exclude_integration_android.yaml + # TODO(stuartmorgan): Remove this condition once + # https://github.com/flutter/flutter/issues/96661 is fixed and + # cherry picked. Currently webview_flutter tests crash on stable on + # Android so must be skipped. + - if [[ "$CHANNEL" == "stable" ]]; then + - ./script/tool_runner.sh firebase-test-lab --device model=redfin,version=30 --device model=starqlteue,version=26 --exclude=script/configs/exclude_integration_android.yaml,webview_flutter + - else + - ./script/tool_runner.sh firebase-test-lab --device model=redfin,version=30 --device model=starqlteue,version=26 --exclude=script/configs/exclude_integration_android.yaml + - fi - else - echo "This user does not have permission to run Firebase Test Lab tests." - fi From 1b52e590b37d92b21d2e58e41079980a6fb4856a Mon Sep 17 00:00:00 2001 From: David Iglesias Date: Thu, 3 Feb 2022 13:55:05 -0800 Subject: [PATCH 2/2] Update .cirrus.yml Remove unneeded `fi` --- .cirrus.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index fa20b520512b..c4951a6a7750 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -222,7 +222,6 @@ task: # only run unit tests. # Must come after build-examples. - ./script/tool_runner.sh native-test --android --no-integration --exclude script/configs/exclude_native_unit_android.yaml - - fi firebase_test_lab_script: # Unsetting CIRRUS_CHANGE_MESSAGE and CIRRUS_COMMIT_MESSAGE as they # might include non-ASCII characters which makes Gradle crash.