Use flutter-cirrus gke cluster for framework tasks. (flutter#77982)

andrewkolos · Mar 19, 2021 · eb1868b · eb1868b
1 parent b948bc0
commit eb1868b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -2,15 +2,12 @@
 # https://cirrus-ci.org/guide/writing-tasks/
 
 # YAML anchors used to share fields between tasks.
-# See https://confluence.atlassian.com/bitbucket/yaml-anchors-960154027.html
+# See  https://confluence.atlassian.com/bitbucket/yaml-anchors-960154027.html
 
 
-use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true'
-
 environment:
   # For details about environment variables used in Cirrus, including how encrypted variables work,
   # see https://cirrus-ci.org/guide/writing-tasks/#environment-variables
-  GCLOUD_SERVICE_ACCOUNT_KEY: ENCRYPTED[f12abe60f5045d619ef4c79b83dd1e0722a0b0b13dbea95fbe334e2db7fffbcd841a5a92da8824848b539a19afe0c9fb]
   # We change Flutter's directory to include a space in its name (see $CIRRUS_WORKING_DIR) so that
   # we constantly test path names with spaces in them. The FLUTTER_SDK_PATH_WITH_SPACE variable must
   # therefore have a space in it.
@@ -24,11 +21,19 @@ environment:
   CIRRUS_CHANGE_MESSAGE: ""
   CIRRUS_COMMIT_MESSAGE: ""
 
+
+gcp_credentials: ENCRYPTED[1917385f09764ac58515f6fee14ed58688afc808849b244969d41d0b082061eecd0a4c8ba801f00833877a12b51f8bb5]
+
+
 # LINUX SHARDS
 task:
-  container:
-    # https://cirrus-ci.org/guide/docker-builder-vm/#dockerfile-as-a-ci-environment
+  gke_container:
     dockerfile: "dev/ci/docker_linux/Dockerfile"
+    builder_image_name: docker-builder # gce vm image
+    builder_image_project: flutter-cirrus
+    cluster_name: build-32-cluster
+    zone: us-central1-a
+    namespace: default
     cpu: $CPU
     memory: $MEMORY
     use_in_memory_disk: $USE_IN_MEMORY_DISK

diff --git a/dev/ci/docker_linux/Dockerfile b/dev/ci/docker_linux/Dockerfile
@@ -110,7 +110,7 @@ ENV PATH="${GOPATH}/bin:${PATH}"
 RUN $GOBINARY get -u github.com/technosophos/dashing
 
 # Set locale to en_US
-RUN locale-gen en_US "en_US.UTF-8" && dpkg-reconfigure locales
+RUN locale-gen en_US "en_US.UTF-8" && DEBIAN_FRONTEND=noninteractive dpkg-reconfigure locales
 ENV LANG en_US.UTF-8
 
 # Install fastlane via pinned Gemfile & Gemfile.lock