From c2afa4146b7e2115c31d08f6df87c93a2d4b7e17 Mon Sep 17 00:00:00 2001 From: Erik Ernst Date: Wed, 5 Jul 2017 16:20:39 +0200 Subject: [PATCH] Updated various gardening data, and ignoring gardening/temp. R=floitsch@google.com Review-Url: https://codereview.chromium.org/2973653002 . --- tools/gardening/.gitignore | 1 + ...ard_groups.dart => create_shard_data.dart} | 0 tools/gardening/bin/summary.dart | 6 +++ tools/gardening/lib/src/buildbot_data.dart | 53 +++++++++++++------ tools/gardening/lib/src/shard_data.dart | 18 ++++--- 5 files changed, 56 insertions(+), 22 deletions(-) rename tools/gardening/bin/{create_shard_groups.dart => create_shard_data.dart} (100%) diff --git a/tools/gardening/.gitignore b/tools/gardening/.gitignore index 16a17247aa4..d888d4cfb8e 100644 --- a/tools/gardening/.gitignore +++ b/tools/gardening/.gitignore @@ -1 +1,2 @@ .packages +temp diff --git a/tools/gardening/bin/create_shard_groups.dart b/tools/gardening/bin/create_shard_data.dart similarity index 100% rename from tools/gardening/bin/create_shard_groups.dart rename to tools/gardening/bin/create_shard_data.dart diff --git a/tools/gardening/bin/summary.dart b/tools/gardening/bin/summary.dart index 6622d488cb6..ac4d9b063b1 100644 --- a/tools/gardening/bin/summary.dart +++ b/tools/gardening/bin/summary.dart @@ -17,6 +17,12 @@ main(List args) async { ArgParser argParser = createArgParser(); ArgResults argResults = argParser.parse(args); processArgResults(argResults); + if (argResults.rest.length == 0 || argResults['help']) { + help(argParser); + if (argResults['help']) return; + exit(1); + } + var bot = new Bot(logdog: argResults['logdog']); var recentUris = bot.mostRecentUris; var results = await bot.readResults(recentUris); diff --git a/tools/gardening/lib/src/buildbot_data.dart b/tools/gardening/lib/src/buildbot_data.dart index a061ab1fe2e..60d31a7e19d 100644 --- a/tools/gardening/lib/src/buildbot_data.dart +++ b/tools/gardening/lib/src/buildbot_data.dart @@ -151,6 +151,18 @@ const List buildGroups = const [ 'front-end tests', 'vm tests', ]), + const BuildSubgroup(shardNames: const [ + 'vm-kernel-mac-release-x64-be', + ], testSteps: const [ + 'front-end tests', + 'vm tests', + ]), + const BuildSubgroup(shardNames: const [ + 'vm-kernel-mac-debug-x64-be', + ], testSteps: const [ + 'front-end tests', + 'vm tests', + ]), ], ), const BuildGroup( @@ -163,7 +175,7 @@ const List buildGroups = const [ 'checked vm tests', ]), const BuildSubgroup(shardNames: const [ - 'cross-arm-vm-linux-release-be', + 'cross-arm64-vm-linux-release-be', ], testSteps: const [ '', // This subgroup triggers other tests. ]), @@ -191,6 +203,12 @@ const List buildGroups = const [ 'vm tests', 'checked vm tests', ]), + const BuildSubgroup(shardNames: const [ + 'target-arm64-vm-linux-release-be', + ], testSteps: const [ + 'vm tests', + 'checked vm tests', + ]), // TODO(dmitryas): add data for this subgroup // const BuildSubgroup(shardNames: const [ // '', @@ -299,11 +317,11 @@ const List buildGroups = const [ groupName: 'dart2js-d8-hostchecked', subgroups: const [ const BuildSubgroup(shardNames: const [ - 'dart2js-linux-d8-hostchecked-1-5-be', - 'dart2js-linux-d8-hostchecked-2-5-be', - 'dart2js-linux-d8-hostchecked-3-5-be', - 'dart2js-linux-d8-hostchecked-4-5-be', - 'dart2js-linux-d8-hostchecked-5-5-be', + 'dart2js-linux-d8-hostchecked-unittest-1-5-be', + 'dart2js-linux-d8-hostchecked-unittest-2-5-be', + 'dart2js-linux-d8-hostchecked-unittest-3-5-be', + 'dart2js-linux-d8-hostchecked-unittest-4-5-be', + 'dart2js-linux-d8-hostchecked-unittest-5-5-be', ], testSteps: const [ 'dart2js d8 tests', 'dart2js d8 package tests', @@ -379,12 +397,15 @@ const List buildGroups = const [ 'dart2js-dump-info-be', ], testSteps: const [ 'annotated_steps', - ]) + ], isActive: false), ], ), const BuildGroup( groupName: 'analyzer', subgroups: const [ + const BuildSubgroup(shardNames: const [ + 'analyze-linux-be', + ], testSteps: const []), const BuildSubgroup(shardNames: const [ 'analyzer-mac10.11-release-be', ], testSteps: const [ @@ -600,7 +621,7 @@ const List buildGroups = const [ 'dart2js ie10 co19 tests', 'dart2js ie10 fast-startup tests', 'dart2js ie10 co19 fast-startup tests', - ]), + ], isActive: false), const BuildSubgroup(shardNames: const [ 'dart2js-win8-ie11-be' ], testSteps: const [ @@ -608,7 +629,7 @@ const List buildGroups = const [ 'dart2js ie11 co19 tests', 'dart2js ie11 fast-startup tests', 'dart2js ie11 co19 fast-startup tests', - ]), + ], isActive: false), ], ), const BuildGroup( @@ -688,12 +709,12 @@ const List buildGroups = const [ 'pub-mac-be', ], testSteps: const [ 'annotated_steps', - ]), + ], isActive: false), const BuildSubgroup(shardNames: const [ 'pub-linux-be', ], testSteps: const [ 'annotated_steps', - ]), + ], isActive: false), const BuildSubgroup(shardNames: const [ 'pkg-mac10.11-release-be', ], testSteps: const [ @@ -738,12 +759,12 @@ const List buildGroups = const [ groupName: 'misc', subgroups: const [ const BuildSubgroup(shardNames: const [ - 'version-checker-be', + 'versionchecker-linux-be', ], testSteps: const [ 'annotated_steps', ]), const BuildSubgroup(shardNames: const [ - 'linux-distribution-support-debian_wheezy-be', + 'debianpackage-linux-be', ], testSteps: const [ 'annotated_steps', ]), @@ -756,17 +777,17 @@ const List buildGroups = const [ 'app-linux-debug-x64-dev', ], testSteps: const [ 'vm tests', - ]), + ], isActive: false), const BuildSubgroup(shardNames: const [ 'app-linux-release-x64-dev', ], testSteps: const [ 'vm tests', - ]), + ], isActive: false), const BuildSubgroup(shardNames: const [ 'app-linux-product-x64-dev', ], testSteps: const [ 'vm tests', - ]), + ], isActive: false), ], ), ]; diff --git a/tools/gardening/lib/src/shard_data.dart b/tools/gardening/lib/src/shard_data.dart index 5553b941ee1..f9ea3b8d6fd 100644 --- a/tools/gardening/lib/src/shard_data.dart +++ b/tools/gardening/lib/src/shard_data.dart @@ -34,15 +34,17 @@ const Map> shardGroups = const { 'vm-kernel': const [ 'vm-kernel-linux-release-x64-be', 'vm-kernel-linux-debug-x64-be', + 'vm-kernel-mac-release-x64-be', + 'vm-kernel-mac-debug-x64-be', ], 'vm-misc': const [ 'vm-win-debug-ia32-russian-be', - 'cross-arm-vm-linux-release-be', + 'cross-arm64-vm-linux-release-be', 'vm-linux-release-ia32-asan-be', 'vm-linux-release-x64-asan-be', 'vm-linux-release-ia32-optcounter-threshold-be', 'vm-linux-release-x64-optcounter-threshold-be', - 'target-arm-vm-linux-release-be', + 'target-arm64-vm-linux-release-be', ], 'vm-precomp': const [ 'vm-noopt-simarm64-mac-be', @@ -180,15 +182,17 @@ const Map> shardGroups = const { 'vm-kernel-dev': const [ 'vm-kernel-linux-release-x64-dev', 'vm-kernel-linux-debug-x64-dev', + 'vm-kernel-mac-release-x64-dev', + 'vm-kernel-mac-debug-x64-dev', ], 'vm-misc-dev': const [ 'vm-win-debug-ia32-russian-dev', - 'cross-arm-vm-linux-release-dev', + 'cross-arm64-vm-linux-release-dev', 'vm-linux-release-ia32-asan-dev', 'vm-linux-release-x64-asan-dev', 'vm-linux-release-ia32-optcounter-threshold-dev', 'vm-linux-release-x64-optcounter-threshold-dev', - 'target-arm-vm-linux-release-dev', + 'target-arm64-vm-linux-release-dev', ], 'vm-precomp-dev': const [ 'vm-noopt-simarm64-mac-dev', @@ -302,15 +306,17 @@ const Map> shardGroups = const { 'vm-kernel-stable': const [ 'vm-kernel-linux-release-x64-stable', 'vm-kernel-linux-debug-x64-stable', + 'vm-kernel-mac-release-x64-stable', + 'vm-kernel-mac-debug-x64-stable', ], 'vm-misc-stable': const [ 'vm-win-debug-ia32-russian-stable', - 'cross-arm-vm-linux-release-stable', + 'cross-arm64-vm-linux-release-stable', 'vm-linux-release-ia32-asan-stable', 'vm-linux-release-x64-asan-stable', 'vm-linux-release-ia32-optcounter-threshold-stable', 'vm-linux-release-x64-optcounter-threshold-stable', - 'target-arm-vm-linux-release-stable', + 'target-arm64-vm-linux-release-stable', ], 'vm-precomp-stable': const [ 'vm-noopt-simarm64-mac-stable',