Remove Cirrus support for Gold (#67468)

.cirrus.yml

@@ -89,7 +89,6 @@ task:
         # We use 3 CPUs because that's the minimum required to get framework_tests-widgets-linux
         # running fast enough that it is not the long pole, as of October 2019.
         CPU: 3
-        GOLD_SERVICE_ACCOUNT: ENCRYPTED[3afeea5ac7201151c3d0dc9648862f0462b5e4f55dc600ca8b692319622f7c3eda3d577b1b16cc2ef0311b7314c1c095]
       script:
         - dart --enable-asserts ./dev/bots/test.dart
 
@@ -100,7 +99,6 @@ task:
         # framework_tests-libraries-linux shard running fast enough that it is not the long pole, as
         # of October 2019.
         CPU: 3
-        GOLD_SERVICE_ACCOUNT: ENCRYPTED[3afeea5ac7201151c3d0dc9648862f0462b5e4f55dc600ca8b692319622f7c3eda3d577b1b16cc2ef0311b7314c1c095]
       script:
         - dart --enable-asserts ./dev/bots/test.dart
 
@@ -150,7 +148,6 @@ task:
         CPU: 2
         MEMORY: 8G
         CHROME_NO_SANDBOX: true
-        GOLD_SERVICE_ACCOUNT: ENCRYPTED[3afeea5ac7201151c3d0dc9648862f0462b5e4f55dc600ca8b692319622f7c3eda3d577b1b16cc2ef0311b7314c1c095]
       script:
         - dart --enable-asserts ./dev/bots/test.dart
 

dev/bots/download_goldctl.ps1

-# Copyright 2014 The Flutter Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-$url= "https://storage.googleapis.com/chrome-infra/depot_tools.zip"
-$zipPath = "C:\Windows\Temp\depot_tools.zip"
-$path = "C:\Windows\Temp\depot_tools"
-$gclient = "C:\Windows\Temp\depot_tools\gclient.bat"
-$cipd = "C:\Windows\Temp\depot_tools\cipd.bat"
-$ensureFile = "C:\Windows\Temp\depot_tools\ensure.txt"
-$text = "# Ensure File`n`$ServiceURL https://chrome-infra-packages.appspot.com`n`n# Skia Gold Client goldctl`nskia/tools/goldctl/`${platform} git_revision:b57f561ad4ad624bd399b8b7b500aa1955276d41"
-
-(New-Object System.Net.WebClient).DownloadFile($url, $zipPath)
-Expand-Archive -LiteralPath $zipPath -DestinationPath $path
-cd $path
-cmd.exe /C "$gclient"
-$text | Out-File -filePath $ensureFile -encoding ascii
-cmd.exe /C "$cipd ensure -ensure-file $ensureFile -root $path"

dev/bots/download_goldctl.sh

-#!/usr/bin/env bash
-# Copyright 2014 The Flutter Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-git clone --depth 1 https://chromium.googlesource.com/chromium/tools/depot_tools.git ./depot_tools
-cd depot_tools
-echo -e '# Ensure File\n$ServiceURL https://chrome-infra-packages.appspot.com\n\n# Skia Gold Client goldctl\nskia/tools/goldctl/${platform} git_revision:b57f561ad4ad624bd399b8b7b500aa1955276d41' > ensure.txt
-./cipd ensure -ensure-file ./ensure.txt -root .

dev/ci/docker_linux/Dockerfile

@@ -123,8 +123,3 @@ COPY ci/docker_linux/Gemfile.lock /Gemfile.lock
 
 RUN bundle config set system 'true' && \
   bundle install --system
-
-# Install goldctl, for Golden testing
-COPY bots/download_goldctl.sh /download_goldctl.sh
-ENV GOLDCTL '/depot_tools/goldctl'
-RUN /download_goldctl.sh

packages/flutter/test/widgets/basic_test.dart

@@ -443,7 +443,7 @@ void main() {
     // golden file can be approved at any time.
     await tester.pumpWidget(RepaintBoundary(
       child: Container(
-        color: const Color(0xFF42A5F5),
+        color: const Color(0xABCDABCD),
       ),
     ));
 

packages/flutter_goldens/test/json_templates.dart

@@ -16,37 +16,6 @@ String authTemplate({
   ''';
 }
 
-/// Json response template for Skia Gold ignore request:
-/// https://flutter-gold.skia.org/json/v1/ignores
-String ignoreResponseTemplate({
-  String pullRequestNumber = '0000',
-  String testName = 'flutter.golden_test.1',
-  String otherTestName = 'flutter.golden_test.1',
-  String expires = '2019-09-06T21:28:18.815336Z',
-  String otherExpires = '2019-09-06T21:28:18.815336Z',
-}) {
-  return '''
-    [
-      {
-        "id": "7579425228619212078",
-        "name": "contributor@getMail.com",
-        "updatedBy": "contributor@getMail.com",
-        "expires": "$expires",
-        "query": "ext=png&name=$testName",
-        "note": "https://github.com/flutter/flutter/pull/$pullRequestNumber"
-      },
-      {
-        "id": "7579425228619212078",
-        "name": "contributor@getMail.com",
-        "updatedBy": "contributor@getMail.com",
-        "expires": "$otherExpires",
-        "query": "ext=png&name=$otherTestName",
-        "note": "https://github.com/flutter/flutter/pull/99999"
-      }
-    ]
-  ''';
-}
-
 /// Json response template for Skia Gold image request:
 /// https://flutter-gold.skia.org/img/images/[imageHash].png
 List<List<int>> imageResponseTemplate() {

packages/flutter_goldens_client/lib/skia_client.dart

@@ -17,16 +17,8 @@ import 'package:process/process.dart';
 
 const String _kFlutterRootKey = 'FLUTTER_ROOT';
 const String _kGoldctlKey = 'GOLDCTL';
-const String _kServiceAccountKey = 'GOLD_SERVICE_ACCOUNT';
 const String _kTestBrowserKey = 'FLUTTER_TEST_BROWSER';
 
-/// Enum representing the supported CI environments used by flutter/flutter.
-enum ContinuousIntegrationEnvironment {
-  luci,
-  cirrus,
-  none,
-}
-
 /// A client for uploading image tests and making baseline requests to the
 /// Flutter Gold Dashboard.
 class SkiaGoldClient {
@@ -35,7 +27,6 @@ class SkiaGoldClient {
     this.fs = const LocalFileSystem(),
     this.process = const LocalProcessManager(),
     this.platform = const LocalPlatform(),
-    required this.ci,
     io.HttpClient? httpClient,
   }) : httpClient = httpClient ?? io.HttpClient();
 
@@ -58,9 +49,6 @@ class SkiaGoldClient {
   /// sub-processes.
   final ProcessManager process;
 
-  /// What testing environment we may be in, like Cirrus or Luci.
-  final ContinuousIntegrationEnvironment ci;
-
   /// A client for making Http requests to the Flutter Gold dashboard.
   final io.HttpClient httpClient;
 
@@ -82,12 +70,6 @@ class SkiaGoldClient {
   /// Uses the [platform] environment in this implementation.
   String get _goldctl => platform.environment[_kGoldctlKey]!;
 
-  /// The path to the local [Directory] where the service account key is
-  /// hosted.
-  ///
-  /// Uses the [platform] environment in this implementation.
-  String get _serviceAccount => platform.environment[_kServiceAccountKey]!;
-
   /// Prepares the local work space for golden file testing and calls the
   /// goldctl `auth` command.
   ///
@@ -101,81 +83,12 @@ class SkiaGoldClient {
   Future<void> auth() async {
     if (await clientIsAuthorized())
       return;
-
-    List<String> authArguments;
-    String failureContext;
-
-    switch (ci) {
-      case ContinuousIntegrationEnvironment.luci:
-        authArguments = <String>[
-          'auth',
-          '--work-dir', workDirectory
-            .childDirectory('temp')
-            .path,
-          '--luci',
-        ];
-        failureContext =
-        'Luci environments authenticate using the file provided '
-          'by LUCI_CONTEXT. There may be an error with this file or Gold '
-          'authentication.';
-        break;
-      case ContinuousIntegrationEnvironment.cirrus:
-        if (_serviceAccount.isEmpty) {
-          final StringBuffer buf = StringBuffer()
-            ..writeln('The Gold service account is unavailable.')..writeln(
-              'Without a service account, Gold can not be authorized.')..writeln(
-              'Please check your user permissions and current comparator.');
-          throw Exception(buf.toString());
-        }
-
-        final File authorization = workDirectory.childFile('serviceAccount.json');
-        await authorization.writeAsString(_serviceAccount);
-        authArguments = <String>[
-          'auth',
-          '--service-account', authorization.path,
-          '--work-dir', workDirectory
-            .childDirectory('temp')
-            .path,
-        ];
-        failureContext = 'This could be caused by incorrect user permissions on '
-          'Cirrus, if the debug information below contains ENCRYPTED, the wrong '
-          'comparator was chosen for the test case.';
-        break;
-      case ContinuousIntegrationEnvironment.none:
-        return;
-    }
-
-    final io.ProcessResult result = await io.Process.run(
-      _goldctl,
-      authArguments,
-    );
-
-    if (result.exitCode != 0) {
-      final StringBuffer buf = StringBuffer()
-        ..writeln('Skia Gold authorization failed.')
-        ..writeln(failureContext)
-        ..writeln('Debug information for Gold:')
-        ..writeln('stdout: ${result.stdout}')
-        ..writeln('stderr: ${result.stderr}');
-      throw Exception(buf.toString());
-    }
-  }
-
-  /// Prepares the local work space for an unauthorized client to lookup golden
-  /// file expectations using [imgtestCheck].
-  ///
-  /// It will only be called once for each instance of an
-  /// [_UnauthorizedFlutterPreSubmitComparator].
-  Future<void> emptyAuth() async {
-    // We only use emptyAuth when the service account cannot be decrypted on
-    // Cirrus.
-    assert(ci == ContinuousIntegrationEnvironment.cirrus);
-
     final List<String> authArguments = <String>[
       'auth',
       '--work-dir', workDirectory
         .childDirectory('temp')
         .path,
+      '--luci',
     ];
 
     final io.ProcessResult result = await io.Process.run(
@@ -185,8 +98,10 @@ class SkiaGoldClient {
 
     if (result.exitCode != 0) {
       final StringBuffer buf = StringBuffer()
-        ..writeln('Skia Gold emptyAuth failed.')
-        ..writeln()
+        ..writeln('Skia Gold authorization failed.')
+        ..writeln('Luci environments authenticate using the file provided '
+          'by LUCI_CONTEXT. There may be an error with this file or Gold '
+          'authentication.')
         ..writeln('Debug information for Gold:')
         ..writeln('stdout: ${result.stdout}')
         ..writeln('stderr: ${result.stderr}');
@@ -306,10 +221,9 @@ class SkiaGoldClient {
       '--passfail',
       '--crs', 'github',
       '--patchset_id', commitHash,
+      ...getCIArguments(),
     ];
 
-    imgtestInitArguments.addAll(getCIArguments());
-
     if (imgtestInitArguments.contains(null)) {
       final StringBuffer buf = StringBuffer()
         ..writeln('A null argument was provided for Skia Gold tryjob init.')
@@ -558,10 +472,12 @@ class SkiaGoldClient {
   String _getKeysJSON() {
     final Map<String, dynamic> keys = <String, dynamic>{
       'Platform' : platform.operatingSystem,
-      'CI' : ci.toString().split('.').last,
+      'CI' : 'luci',
     };
-    if (platform.environment[_kTestBrowserKey] != null)
+    if (platform.environment[_kTestBrowserKey] != null) {
       keys['Browser'] = platform.environment[_kTestBrowserKey];
+      keys['Platform'] = keys['Platform'] + '-browser';
+    }
     return json.encode(keys);
   }
 
@@ -590,29 +506,13 @@ class SkiaGoldClient {
   /// Returns a list of arguments for initializing a tryjob based on the testing
   /// environment.
   List<String> getCIArguments() {
-    String pullRequest;
-    String jobId;
-    String cis;
-
-    switch (ci) {
-      case ContinuousIntegrationEnvironment.luci:
-        jobId = platform.environment['LOGDOG_STREAM_PREFIX']!.split('/').last;
-        final List<String> refs = platform.environment['GOLD_TRYJOB']!.split('/');
-        pullRequest = refs[refs.length - 2];
-        cis = 'buildbucket';
-        break;
-      case ContinuousIntegrationEnvironment.cirrus:
-        pullRequest = platform.environment['CIRRUS_PR']!;
-        jobId = platform.environment['CIRRUS_TASK_ID']!;
-        cis = 'cirrus';
-        break;
-      case ContinuousIntegrationEnvironment.none:
-        return <String>[];
-    }
+    final String jobId = platform.environment['LOGDOG_STREAM_PREFIX']!.split('/').last;
+    final List<String> refs = platform.environment['GOLD_TRYJOB']!.split('/');
+    final String pullRequest = refs[refs.length - 2];
 
     return <String>[
       '--changelist', pullRequest,
-      '--cis', cis,
+      '--cis', 'buildbucket',
       '--jobid', jobId,
     ];
   }
@@ -627,14 +527,12 @@ class SkiaGoldClient {
   /// Example TraceID for Flutter Gold:
   ///   ',CI=cirrus,Platform=linux,name=cupertino.activityIndicator.inprogress.1.0,source_type=flutter,'
   String getTraceID(String testName) {
-    // If we are not in a CI environment, fallback on luci.
     return '${platform.environment[_kTestBrowserKey] == null ? ',' : ',Browser=${platform.environment[_kTestBrowserKey]},'}'
-      'CI=${ci == ContinuousIntegrationEnvironment.none ? 'luci' : ci.toString().split('.').last},'
+      'CI=luci,'
       'Platform=${platform.operatingSystem},'
       'name=$testName,'
       'source_type=flutter,';
   }
-
 }
 
 /// Used to make HttpRequests during testing.