From 8d49b2717655d41bb4191ff624d69ebc86ed19d9 Mon Sep 17 00:00:00 2001 From: Godofredo Contreras Date: Thu, 18 Mar 2021 18:50:30 -0700 Subject: [PATCH 1/3] Use flutter gcp project for linux tasks. Bug: https://github.com/flutter/flutter/issues/77624 --- .cirrus.yml | 48 +++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 45 insertions(+), 3 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index c2bbd35e15e7..edc5899a57cb 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -1,7 +1,8 @@ +gcp_credentials: ENCRYPTED[ec898795b6f1b54f9cc2ab4104909f1053651f65fcab96397cfdc33dae6df5fd0fa972e29ba19f4f95125de844ab1641] + # Don't run on release tags since it creates O(n^2) tasks where n is the # number of plugins only_if: $CIRRUS_TAG == '' -use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true' && $CIRRUS_PR == '' env: INTEGRATION_TEST_PATH: "./packages/integration_test" CHANNEL: "master" # Default to master when not explicitly set by a task. @@ -32,8 +33,13 @@ macos_template: &MACOS_TEMPLATE # concurrency limits. task: << : *FLUTTER_UPGRADE_TEMPLATE - container: + gke_container: dockerfile: .ci/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 matrix: ### Platform-agnostic tasks ### - name: plugin_tools_tests @@ -110,6 +116,37 @@ task: build_script: - flutter config --enable-linux-desktop - ./script/incremental_build.sh build-examples --linux + - xvfb-run ./script/incremental_build.sh drive-examples --linux + +# Legacy Dockerfile configuration for web integration tests. +# https://github.com/flutter/web_installers doesn't yet support the current +# stable version of Chrome, so newly-generated Docker images don't work. +# TODO: Merge this task into the "Web tasks" section of the "Light-workload +# tasks" block above once web_installers has been updated to support Chrome 89 +# (which is what the current image generated from .ci/Dockerfile has). +task: + << : *FLUTTER_UPGRADE_TEMPLATE + gke_container: + dockerfile: .ci/Dockerfile-LegacyChrome + builder_image_name: docker-builder # gce vm image + builder_image_project: flutter-cirrus + cluster_name: build-32-cluster + zone: us-central1-a + namespace: default + matrix: + - name: integration_web_smoke_test + env: + matrix: + CHANNEL: "master" + CHANNEL: "stable" + # Tests integration example test in web. + only_if: "changesInclude('.cirrus.yml', 'packages/integration_test/**') || $CIRRUS_PR == ''" + install_script: + - git clone https://github.com/flutter/web_installers.git + - cd web_installers/packages/web_drivers/ + - pub get + - dart lib/web_driver_installer.dart chromedriver --install-only + - ./chromedriver/chromedriver --port=4444 & test_script: - xvfb-run ./script/incremental_build.sh drive-examples --linux @@ -118,8 +155,13 @@ task: # for non-credit runs. task: << : *FLUTTER_UPGRADE_TEMPLATE - container: + gke_container: dockerfile: .ci/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: 4 memory: 12G matrix: From 3d255377c2e8ca191236ff73e4771612d50866b0 Mon Sep 17 00:00:00 2001 From: Godofredo Contreras Date: Tue, 23 Mar 2021 12:27:53 -0700 Subject: [PATCH 2/3] Merge upstream changes and change cluster. --- .cirrus.yml | 36 ++---------------------------------- 1 file changed, 2 insertions(+), 34 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index edc5899a57cb..2b830f5df252 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -37,7 +37,7 @@ task: dockerfile: .ci/Dockerfile builder_image_name: docker-builder # gce vm image builder_image_project: flutter-cirrus - cluster_name: build-32-cluster + cluster_name: test-cluster zone: us-central1-a namespace: default matrix: @@ -118,38 +118,6 @@ task: - ./script/incremental_build.sh build-examples --linux - xvfb-run ./script/incremental_build.sh drive-examples --linux -# Legacy Dockerfile configuration for web integration tests. -# https://github.com/flutter/web_installers doesn't yet support the current -# stable version of Chrome, so newly-generated Docker images don't work. -# TODO: Merge this task into the "Web tasks" section of the "Light-workload -# tasks" block above once web_installers has been updated to support Chrome 89 -# (which is what the current image generated from .ci/Dockerfile has). -task: - << : *FLUTTER_UPGRADE_TEMPLATE - gke_container: - dockerfile: .ci/Dockerfile-LegacyChrome - builder_image_name: docker-builder # gce vm image - builder_image_project: flutter-cirrus - cluster_name: build-32-cluster - zone: us-central1-a - namespace: default - matrix: - - name: integration_web_smoke_test - env: - matrix: - CHANNEL: "master" - CHANNEL: "stable" - # Tests integration example test in web. - only_if: "changesInclude('.cirrus.yml', 'packages/integration_test/**') || $CIRRUS_PR == ''" - install_script: - - git clone https://github.com/flutter/web_installers.git - - cd web_installers/packages/web_drivers/ - - pub get - - dart lib/web_driver_installer.dart chromedriver --install-only - - ./chromedriver/chromedriver --port=4444 & - test_script: - - xvfb-run ./script/incremental_build.sh drive-examples --linux - # Heavy-workload Linux tasks. # These use machines with more CPUs and memory, so will reduce parallelization # for non-credit runs. @@ -159,7 +127,7 @@ task: dockerfile: .ci/Dockerfile builder_image_name: docker-builder # gce vm image builder_image_project: flutter-cirrus - cluster_name: build-32-cluster + cluster_name: test-cluster zone: us-central1-a namespace: default cpu: 4 From 6a78c4f4ca2fd73a231301e54cc79854f4509987 Mon Sep 17 00:00:00 2001 From: Godofredo Contreras Date: Tue, 23 Mar 2021 12:56:02 -0700 Subject: [PATCH 3/3] Add test_script back. --- .cirrus.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.cirrus.yml b/.cirrus.yml index 2b830f5df252..e9db1b7b6bf8 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -116,6 +116,7 @@ task: build_script: - flutter config --enable-linux-desktop - ./script/incremental_build.sh build-examples --linux + test_script: - xvfb-run ./script/incremental_build.sh drive-examples --linux # Heavy-workload Linux tasks.