From 2639ac1d2eb6a98f70a15675715a3c336feafaaa Mon Sep 17 00:00:00 2001
From: keyonghan <54558023+keyonghan@users.noreply.github.com>
Date: Fri, 9 Oct 2020 15:57:04 -0700
Subject: [PATCH] Enable build_gallery tests in try/prod builders (#67749)

---
 .cirrus.yml            | 68 ------------------------------------------
 dev/prod_builders.json | 12 ++++++++
 dev/try_builders.json  | 12 ++++++++
 3 files changed, 24 insertions(+), 68 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 2ad36c5e2e..75fd565e0d 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -191,71 +191,3 @@ task:
         - sleep 1
         - cd ../../../examples/hello_world/
         - flutter drive --target=test_driver/smoke_web_engine.dart -d web-server --profile --browser-name=chrome
-
-    - name: deploy_gallery-linux # linux- and macos- only
-      # Do not add more tasks here. Nothing is currently deployed from master branch, so it is safe to run
-      # even if a test has failed. The behavior of failing dependencies is non-ideal for infra health.
-      # See also: https://github.com/flutter/flutter/pull/49454
-      depends_on:
-        - analyze-linux
-      # As of October 2019, 1 CPU and 4G of RAM let deploy_gallery-linux finish in about 15
-      # minutes, once it got started.
-      script:
-        - ./dev/bots/deploy_gallery.sh
-
-# MACOS SHARDS
-# Mac doesn't use caches because they apparently take longer to populate and save
-# than just fetching the data in the first place.
-task:
-  osx_instance:
-    image: catalina-xcode-12.0-flutter # see https://cirrus-ci.org/guide/macOS/ for list of images (we should update regularly)
-    # cpu is always 2
-    # memory is always 8G
-  environment:
-    CIRRUS_WORKING_DIR: "/tmp/$FLUTTER_SDK_PATH_WITH_SPACE"
-    FLUTTER_FRAMEWORK_DIR: "$CIRRUS_WORKING_DIR/bin/cache/artifacts/engine/ios/"
-    PATH: "$CIRRUS_WORKING_DIR/bin:$CIRRUS_WORKING_DIR/bin/cache/dart-sdk/bin:$PATH"
-    COCOAPODS_DISABLE_STATS: true
-    CPU: 2
-    MEMORY: 8G
-    SHOULD_UPDATE_PACKAGES: 'TRUE'
-  setup_script:
-    - date
-    - which flutter
-    - bundle --version
-    - bundle config set system 'true'
-    - sudo bundle install --gemfile=dev/ci/mac/Gemfile
-    - git clean -xffd --exclude=bin/cache/
-    - git fetch origin
-    - git fetch origin master # To set FETCH_HEAD, so that "git merge-base" works.
-    - flutter config --no-analytics
-    - if [ "$SHOULD_UPDATE_PACKAGES" == TRUE ]; then flutter update-packages; fi
-    - flutter doctor -v
-    - date
-    - which flutter
-  on_failure:
-    failure_script:
-      - date
-      - which flutter
-  matrix:
-    # TODO(ianh): Enable Web tests on macOS.
-
-    - name: deploy_gallery-macos # linux- and macos- only
-      # Do not add more tasks here. Nothing is currently deployed from master branch, so it is safe to run
-      # even if a test has failed. The behavior of failing dependencies is non-ideal for infra health.
-      # See also: https://github.com/flutter/flutter/pull/49454
-      depends_on:
-        - analyze-linux
-      script:
-        - ulimit -S -n 2048 # https://github.com/flutter/flutter/issues/2976
-        - ./dev/bots/deploy_gallery.sh
-
-    - name: verify_binaries_codesigned-macos # macos-only
-      # TODO(fujino): remove this `only_if` after https://github.com/flutter/flutter/issues/44372
-      # Only run pre/post submit for release branches
-      only_if: "$CIRRUS_BASE_BRANCH == 'dev' || $CIRRUS_BRANCH == 'dev' || $CIRRUS_BASE_BRANCH == 'beta' || $CIRRUS_BRANCH == 'beta' || $CIRRUS_BASE_BRANCH == 'stable' || $CIRRUS_BRANCH == 'stable'"
-      depends_on:
-        - analyze-linux
-      script:
-        - ulimit -S -n 2048 # https://github.com/flutter/flutter/issues/2976
-        - dart --enable-asserts ./dev/bots/codesign.dart
diff --git a/dev/prod_builders.json b/dev/prod_builders.json
index 43bf77396f..a7d9ab65a8 100644
--- a/dev/prod_builders.json
+++ b/dev/prod_builders.json
@@ -24,6 +24,12 @@
          "task_name": "linux_docs",
          "flaky": false
       },
+      {
+         "name": "Linux build_gallery",
+         "repo": "flutter",
+         "task_name": "linux_build_gallery",
+         "flaky": false
+      },
       {
          "name": "Linux build_tests",
          "repo": "flutter",
@@ -168,6 +174,12 @@
          "task_name": "mac_build_tests",
          "flaky": false
       },
+      {
+         "name": "Mac build_gallery",
+         "repo": "flutter",
+         "task_name": "mac_build_gallery",
+         "flaky": false
+      },
       {
          "name": "Mac customer_testing",
          "repo": "flutter",
diff --git a/dev/try_builders.json b/dev/try_builders.json
index 26ecd38715..f61f851f8b 100644
--- a/dev/try_builders.json
+++ b/dev/try_builders.json
@@ -32,6 +32,12 @@
          "enabled":true,
          "run_if":["dev/", "packages/flutter/", "packages/flutter_test/", "packages/flutter_drive/", "packages/flutter_localizations/", "bin/"]
       },
+      {
+         "name":"Linux build_gallery",
+         "repo":"flutter",
+         "task_name":"linux_build_gallery",
+         "enabled":true
+      },
       {
          "name":"Linux framework_tests",
          "repo":"flutter",
@@ -200,6 +206,12 @@
          "task_name":"mac_customer_testing",
          "enabled":true
       },
+      {
+         "name":"Mac build_gallery",
+         "repo":"flutter",
+         "task_name":"mac_build_gallery",
+         "enabled":true
+      },
       {
          "name":"Mac framework_tests",
          "repo":"flutter",