Unverified Commit 0d7270ba authored by Casey Hillers's avatar Casey Hillers Committed by GitHub

Revert "[devicelab] LUCI builder flag (#70464)" (#70496)

parent 97468963
...@@ -30,12 +30,6 @@ String localEngine; ...@@ -30,12 +30,6 @@ String localEngine;
/// The path to the engine "src/" directory. /// The path to the engine "src/" directory.
String localEngineSrcPath; String localEngineSrcPath;
/// Name of the LUCI builder this test is currently running on.
///
/// This is only passed on CI runs for Cocoon to be able to uniquely identify
/// this test run.
String luciBuilder;
/// Whether to exit on first test failure. /// Whether to exit on first test failure.
bool exitOnFirstTestFailure; bool exitOnFirstTestFailure;
...@@ -87,10 +81,9 @@ Future<void> main(List<String> rawArgs) async { ...@@ -87,10 +81,9 @@ Future<void> main(List<String> rawArgs) async {
} }
deviceId = args['device-id'] as String; deviceId = args['device-id'] as String;
exitOnFirstTestFailure = args['exit'] as bool;
localEngine = args['local-engine'] as String; localEngine = args['local-engine'] as String;
localEngineSrcPath = args['local-engine-src-path'] as String; localEngineSrcPath = args['local-engine-src-path'] as String;
luciBuilder = args['luci-builder'] as String; exitOnFirstTestFailure = args['exit'] as bool;
serviceAccountTokenFile = args['service-account-token-file'] as String; serviceAccountTokenFile = args['service-account-token-file'] as String;
silent = args['silent'] as bool; silent = args['silent'] as bool;
...@@ -118,9 +111,7 @@ Future<void> _runTasks() async { ...@@ -118,9 +111,7 @@ Future<void> _runTasks() async {
if (serviceAccountTokenFile != null) { if (serviceAccountTokenFile != null) {
final Cocoon cocoon = Cocoon(serviceAccountTokenPath: serviceAccountTokenFile); final Cocoon cocoon = Cocoon(serviceAccountTokenPath: serviceAccountTokenFile);
/// Cocoon's definition of a task is more specific than [taskName], and to await cocoon.sendTaskResult(taskName: taskName, result: result);
/// upload we instead send the [luciBuilder] this is running on.
await cocoon.sendTaskResult(taskName: luciBuilder, result: result);
} }
if (!result.succeeded) { if (!result.succeeded) {
...@@ -347,10 +338,6 @@ final ArgParser _argParser = ArgParser() ...@@ -347,10 +338,6 @@ final ArgParser _argParser = ArgParser()
'locally. Defaults to \$FLUTTER_ENGINE if set, or tries to guess at\n' 'locally. Defaults to \$FLUTTER_ENGINE if set, or tries to guess at\n'
'the location based on the value of the --flutter-root option.', 'the location based on the value of the --flutter-root option.',
) )
..addOption(
'luci-builder',
help: '[Flutter infrastructure] Name of the LUCI builder being run on.'
)
..addFlag( ..addFlag(
'match-host-platform', 'match-host-platform',
defaultsTo: true, defaultsTo: true,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment