From 4c95bbd1c67a23eda09e61b69fcdf349503082ab Mon Sep 17 00:00:00 2001 From: Todd Volkert Date: Tue, 3 Dec 2019 19:53:28 -0800 Subject: [PATCH] Re-enable hostonly tests on non-master branches (#46037) This is a follow-on to #45455 - the test failures indicated a real problem, so re-enabling the tests on non-master. https://github.com/flutter/flutter/issues/45453 --- .cirrus.yml | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 1ae3c4f282..51a58da8fd 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -229,7 +229,6 @@ task: - dart --enable-asserts ./dev/bots/test.dart - name: hostonly_devicelab_tests-0-linux - only_if: "$CIRRUS_PR != '' || $CIRRUS_BRANCH == 'master'" # https://github.com/flutter/flutter/issues/45453 environment: # Some of the host-only devicelab tests are pretty involved and need a lot of RAM. CPU: 2 @@ -238,7 +237,6 @@ task: - dart --enable-asserts ./dev/bots/test.dart - name: hostonly_devicelab_tests-1-linux - only_if: "$CIRRUS_PR != '' || $CIRRUS_BRANCH == 'master'" # https://github.com/flutter/flutter/issues/45453 environment: # Some of the host-only devicelab tests are pretty involved and need a lot of RAM. CPU: 2 @@ -247,7 +245,6 @@ task: - dart --enable-asserts ./dev/bots/test.dart - name: hostonly_devicelab_tests-2-linux - only_if: "$CIRRUS_PR != '' || $CIRRUS_BRANCH == 'master'" # https://github.com/flutter/flutter/issues/45453 environment: # Some of the host-only devicelab tests are pretty involved and need a lot of RAM. CPU: 2 @@ -256,7 +253,6 @@ task: - dart --enable-asserts ./dev/bots/test.dart - name: hostonly_devicelab_tests-3_last-linux - only_if: "$CIRRUS_PR != '' || $CIRRUS_BRANCH == 'master'" # https://github.com/flutter/flutter/issues/45453 environment: # Some of the host-only devicelab tests are pretty involved and need a lot of RAM. CPU: 2 @@ -403,22 +399,22 @@ task: - dart --enable-asserts dev\bots\test.dart - name: hostonly_devicelab_tests-0-windows - only_if: "changesInclude('.cirrus.yml', 'dev/**', 'bin/internal/**') || ($CIRRUS_PR == '' && $CIRRUS_BRANCH == 'master')" # https://github.com/flutter/flutter/issues/41941 https://github.com/flutter/flutter/issues/45453 + only_if: "changesInclude('.cirrus.yml', 'dev/**', 'bin/internal/**') || $CIRRUS_PR == ''" # https://github.com/flutter/flutter/issues/41941 script: - dart --enable-asserts ./dev/bots/test.dart - name: hostonly_devicelab_tests-1-windows - only_if: "changesInclude('.cirrus.yml', 'dev/**', 'bin/internal/**') || ($CIRRUS_PR == '' && $CIRRUS_BRANCH == 'master')" # https://github.com/flutter/flutter/issues/41941 https://github.com/flutter/flutter/issues/45453 + only_if: "changesInclude('.cirrus.yml', 'dev/**', 'bin/internal/**') || $CIRRUS_PR == ''" # https://github.com/flutter/flutter/issues/41941 script: - dart --enable-asserts ./dev/bots/test.dart - name: hostonly_devicelab_tests-2-windows - only_if: "changesInclude('.cirrus.yml', 'dev/**', 'bin/internal/**') || ($CIRRUS_PR == '' && $CIRRUS_BRANCH == 'master')" # https://github.com/flutter/flutter/issues/41941 https://github.com/flutter/flutter/issues/45453 + only_if: "changesInclude('.cirrus.yml', 'dev/**', 'bin/internal/**') || $CIRRUS_PR == ''" # https://github.com/flutter/flutter/issues/41941 script: - dart --enable-asserts ./dev/bots/test.dart - name: hostonly_devicelab_tests-3_last-windows - only_if: "changesInclude('.cirrus.yml', 'dev/**', 'bin/internal/**') || ($CIRRUS_PR == '' && $CIRRUS_BRANCH == 'master')" # https://github.com/flutter/flutter/issues/41941 https://github.com/flutter/flutter/issues/45453 + only_if: "changesInclude('.cirrus.yml', 'dev/**', 'bin/internal/**') || $CIRRUS_PR == ''" # https://github.com/flutter/flutter/issues/41941 script: - dart --enable-asserts ./dev/bots/test.dart @@ -516,25 +512,25 @@ task: - dart --enable-asserts ./dev/bots/test.dart - name: hostonly_devicelab_tests-0-macos - only_if: "changesInclude('.cirrus.yml', 'dev/**', 'bin/internal/**') || ($CIRRUS_PR == '' && $CIRRUS_BRANCH == 'master')" # https://github.com/flutter/flutter/issues/41941 https://github.com/flutter/flutter/issues/45453 + only_if: "changesInclude('.cirrus.yml', 'dev/**', 'bin/internal/**') || $CIRRUS_PR == ''" # https://github.com/flutter/flutter/issues/41941 script: - ulimit -S -n 2048 # https://github.com/flutter/flutter/issues/2976 - dart --enable-asserts ./dev/bots/test.dart - name: hostonly_devicelab_tests-1-macos - only_if: "changesInclude('.cirrus.yml', 'dev/**', 'bin/internal/**') || ($CIRRUS_PR == '' && $CIRRUS_BRANCH == 'master')" # https://github.com/flutter/flutter/issues/41941 https://github.com/flutter/flutter/issues/45453 + only_if: "changesInclude('.cirrus.yml', 'dev/**', 'bin/internal/**') || $CIRRUS_PR == ''" # https://github.com/flutter/flutter/issues/41941 script: - ulimit -S -n 2048 # https://github.com/flutter/flutter/issues/2976 - dart --enable-asserts ./dev/bots/test.dart - name: hostonly_devicelab_tests-2-macos - only_if: "changesInclude('.cirrus.yml', 'dev/**', 'bin/internal/**') || ($CIRRUS_PR == '' && $CIRRUS_BRANCH == 'master')" # https://github.com/flutter/flutter/issues/41941 https://github.com/flutter/flutter/issues/45453 + only_if: "changesInclude('.cirrus.yml', 'dev/**', 'bin/internal/**') || $CIRRUS_PR == ''" # https://github.com/flutter/flutter/issues/41941 script: - ulimit -S -n 2048 # https://github.com/flutter/flutter/issues/2976 - dart --enable-asserts ./dev/bots/test.dart - name: hostonly_devicelab_tests-3_last-macos - only_if: "changesInclude('.cirrus.yml', 'dev/**', 'bin/internal/**') || ($CIRRUS_PR == '' && $CIRRUS_BRANCH == 'master')" # https://github.com/flutter/flutter/issues/41941 https://github.com/flutter/flutter/issues/45453 + only_if: "changesInclude('.cirrus.yml', 'dev/**', 'bin/internal/**') || $CIRRUS_PR == ''" # https://github.com/flutter/flutter/issues/41941 script: - ulimit -S -n 2048 # https://github.com/flutter/flutter/issues/2976 - dart --enable-asserts ./dev/bots/test.dart