From f156168ea0ab74bc5722152f93aacfc58a0679dd Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Thu, 15 Jun 2023 15:22:34 -0400 Subject: [PATCH 1/2] [ci] Introduce LUCI versions of Linux desktop tests Adds scripts and LUCI targets for the Linux desktop build-all and platform test tasks, corresponding to the Cirrus linux-build_all_packages and linux-platform_test tasks. Part of https://github.com/flutter/flutter/issues/114373 --- .ci.yaml | 52 ++++++++++++++++++++++- .ci/targets/linux_build_all_packages.yaml | 11 +++++ .ci/targets/linux_platform_tests.yaml | 12 ++++++ 3 files changed, 74 insertions(+), 1 deletion(-) create mode 100644 .ci/targets/linux_build_all_packages.yaml create mode 100644 .ci/targets/linux_platform_tests.yaml diff --git a/.ci.yaml b/.ci.yaml index e44c1479c26..a07085222f6 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -12,6 +12,18 @@ platform_properties: linux: properties: os: Linux + linux_desktop: + properties: + os: Ubuntu + cores: "8" + device_type: none + dependencies: >- + [ + {"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"}, + {"dependency": "cmake", "version": "build_id:8787856497187628321"}, + {"dependency": "ninja", "version": "version:1.9.0"}, + {"dependency": "curl", "version": "version:7.64.0"} + ] windows: properties: dependencies: > @@ -48,7 +60,7 @@ platform_properties: } targets: - ### Linux tasks ### + ### Linux-host tasks ### - name: Linux repo_tools_tests recipe: packages/packages timeout: 30 @@ -58,6 +70,44 @@ targets: channel: master version_file: flutter_master.version + ### Linux desktop tasks + - name: Linux_desktop build_all_packages master + bringup: true # New target + recipe: packages/packages + timeout: 30 + properties: + version_file: flutter_master.version + target_file: linux_build_all_packages.yaml + channel: master + + - name: Linux_desktop build_all_packages stable + bringup: true # New target + recipe: packages/packages + timeout: 30 + properties: + version_file: flutter_stable.version + target_file: linux_build_all_packages.yaml + channel: stable + + - name: Linux_desktop platform_tests master + bringup: true # New target + recipe: packages/packages + timeout: 30 + properties: + version_file: flutter_master.version + target_file: linux_platform_tests.yaml + channel: master + + - name: Linux_desktop platform_tests stable + bringup: true # New target + recipe: packages/packages + presubmit: false + timeout: 30 + properties: + version_file: flutter_stable.version + target_file: linux_platform_tests.yaml + channel: stable + ### iOS+macOS tasks ### # TODO(stuartmorgan): Move this to ARM once google_maps_flutter has ARM # support. `pod lint` makes a synthetic target that doesn't respect the diff --git a/.ci/targets/linux_build_all_packages.yaml b/.ci/targets/linux_build_all_packages.yaml new file mode 100644 index 00000000000..b54f7b1e56c --- /dev/null +++ b/.ci/targets/linux_build_all_packages.yaml @@ -0,0 +1,11 @@ +tasks: + - name: prepare tool + script: .ci/scripts/prepare_tool.sh + - name: create all_packages app + script: .ci/scripts/create_all_packages_app.sh + - name: build all_packages for Linux debug + script: .ci/scripts/build_all_packages_app.sh + args: ["linux", "debug"] + - name: build all_packages for Linux release + script: .ci/scripts/build_all_packages_app.sh + args: ["linux", "release"] diff --git a/.ci/targets/linux_platform_tests.yaml b/.ci/targets/linux_platform_tests.yaml new file mode 100644 index 00000000000..e17c3814e33 --- /dev/null +++ b/.ci/targets/linux_platform_tests.yaml @@ -0,0 +1,12 @@ +tasks: + - name: prepare tool + script: .ci/scripts/prepare_tool.sh + - name: build examples + script: script/tool_runner.sh + args: ["build-examples", "--linux"] + - name: native test + script: script/tool_runner.sh + args: ["native-test", "--linux"] + - name: drive examples + script: script/tool_runner.sh + args: ["drive-examples", "--linux", "--exclude=script/configs/exclude_integration_linux.yaml"] From 17c4dcd6aa6faa75c07d7ad895624c38eac7b26b Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Fri, 16 Jun 2023 10:06:22 -0400 Subject: [PATCH 2/2] Revert platform tests --- .ci.yaml | 19 ------------------- .ci/targets/linux_platform_tests.yaml | 12 ------------ 2 files changed, 31 deletions(-) delete mode 100644 .ci/targets/linux_platform_tests.yaml diff --git a/.ci.yaml b/.ci.yaml index a07085222f6..359b515013e 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -89,25 +89,6 @@ targets: target_file: linux_build_all_packages.yaml channel: stable - - name: Linux_desktop platform_tests master - bringup: true # New target - recipe: packages/packages - timeout: 30 - properties: - version_file: flutter_master.version - target_file: linux_platform_tests.yaml - channel: master - - - name: Linux_desktop platform_tests stable - bringup: true # New target - recipe: packages/packages - presubmit: false - timeout: 30 - properties: - version_file: flutter_stable.version - target_file: linux_platform_tests.yaml - channel: stable - ### iOS+macOS tasks ### # TODO(stuartmorgan): Move this to ARM once google_maps_flutter has ARM # support. `pod lint` makes a synthetic target that doesn't respect the diff --git a/.ci/targets/linux_platform_tests.yaml b/.ci/targets/linux_platform_tests.yaml deleted file mode 100644 index e17c3814e33..00000000000 --- a/.ci/targets/linux_platform_tests.yaml +++ /dev/null @@ -1,12 +0,0 @@ -tasks: - - name: prepare tool - script: .ci/scripts/prepare_tool.sh - - name: build examples - script: script/tool_runner.sh - args: ["build-examples", "--linux"] - - name: native test - script: script/tool_runner.sh - args: ["native-test", "--linux"] - - name: drive examples - script: script/tool_runner.sh - args: ["drive-examples", "--linux", "--exclude=script/configs/exclude_integration_linux.yaml"]