Double Builds for Blimp Integration Test Infrastructure on FYI bot

scripts/slave/recipes/blimp/integration.py

+# Copyright 2016 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+from recipe_engine import recipe_api
+from recipe_engine.recipe_api import Property
+from recipe_engine.types import freeze
+
+DEPS = [
+  'depot_tools/bot_update',
+  'chromium',
+  'chromium_android',
+  'chromium_swarming',
+  'chromium_tests',
+  'recipe_engine/json',
+  'recipe_engine/path',
+  'recipe_engine/platform',
+  'recipe_engine/properties',
+  'recipe_engine/python',
+  'recipe_engine/step',
+  'swarming',
+  'test_results',
+  'test_utils',
+]
+
+BUILDERS = freeze({
+  'chromium.fyi': {
+    'builders':{
+      'Blimp Client Engine Integration': {
+        'client_config': {
+          'android_config': 'main_builder_rel_mb',
+          'chromium_config': 'android',
+          'chromium_config_kwargs': {
+            'BUILD_CONFIG': 'Debug',
+            'TARGET_BITS': 64,
+            'TARGET_PLATFORM': 'android',
+          },
+          'gclient_apply_config': ['android'],
+          'gclient_config': 'chromium',
+        },
+        'engine_config': {

[mikecase (-- gone --), 2016/10/10 18:15:53]

It doesnt look like these configs are being used. I could be wrong.

[Dirk Pranke, 2016/10/11 00:18:23]

Right, I don't think you can nest configs like this. Just use the client_config
values, as any android checkout can also do a linux build.

+          'chromium_apply_config': [ 'mb' ],
+          'chromium_config': 'chromium',
+          'chromium_config_kwargs': {
+            'BUILD_CONFIG': 'Debug',
+            'TARGET_BITS': 64,
+            'TARGET_PLATFORM': 'linux',
+          },
+          'gclient_config': 'chromium',
+        },
+      },
+    },
+  },
+})
+
+
+def RunSteps(api):
+  android_build = api.path['slave_build'].join('src', 'out-android', 'Debug')
+  linux_build = api.path['slave_build'].join('src', 'out-linux', 'Debug')
+  mastername = api.properties.get('mastername')
+  buildername, bot_config = api.chromium.configure_bot(BUILDERS)

[mikecase (-- gone --), 2016/10/10 18:15:53]

woah, cool. Didn't know this API existed.

+  api.chromium.ensure_goma()
+  api.chromium.runhooks()
+  api.chromium.run_mb(mastername=mastername,
+                      buildername=buildername,
+                      build_dir=linux_build,
+                      phase='engine')
+  api.chromium.compile(targets=['blimp'],
+                       out_dir=linux_build)
+  api.chromium.run_mb(mastername=mastername,
+                      buildername=buildername,
+                      build_dir=android_build,
+                      phase='client')
+  api.chromium.compile(targets=['blimp', 'chrome_public_apk'],
+                       out_dir=android_build)
+
+
+def GenTests(api):
+  sanitize = lambda s: ''.join(c if c.isalnum() else '_' for c in s)
+
+  yield (
+      api.test('%s_test_pass' % sanitize('Blimp Android Tester')) +
+      api.properties.generic(
+        buildername='Blimp Client Engine Integration',
+        mastername='chromium.fyi')
+  )