Archiving of AppRTC APK in client.webrtc waterfall

scripts/slave/recipes/webrtc/standalone.py

 # Copyright 2014 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.
 
 # Recipe for building and running tests for WebRTC stand-alone.
 
 DEPS = [
   'archive',
   'depot_tools/bot_update',
   'chromium',
   'chromium_android',
+  'commit_position',
   'depot_tools/gclient',
+  'gsutil',
   'ios',
   'recipe_engine/path',
   'recipe_engine/platform',
   'recipe_engine/properties',
   'recipe_engine/step',
   'depot_tools/tryserver',
   'webrtc',
+  'zip',
 ]
 
 
 def RunSteps(api):
   webrtc = api.webrtc
   webrtc.apply_bot_config(webrtc.BUILDERS, webrtc.RECIPE_CONFIGS)
 
   if api.platform.is_mac:
     api.ios.host_info()
   webrtc.checkout()
   webrtc.cleanup()
   if webrtc.should_build:
     api.chromium.ensure_goma()
   api.chromium.runhooks()
   webrtc.check_swarming_version()
 
   if webrtc.should_build:
     webrtc.compile()
 
     if api.chromium.c.gyp_env.GYP_DEFINES.get('syzyasan', 0) == 1:
       api.chromium.apply_syzyasan()
 
   if webrtc.should_upload_build:
     webrtc.package_build()
   if webrtc.should_download_build:
     webrtc.extract_build()
 
+  if api.properties['buildername'] in ('Android32 Builder',

[kjellander_chromium, 2016/09/18 17:33:23]

I'd like to keep builder-details like this closer to the actual builder config
in
https://cs.chromium.org/chromium/build/scripts/slave/recipe_modules/webrtc/bu...

Can you make a new custom property like 'archive_apprtc': True?

Like this:
'Android32 Builder': {
        'recipe_config': 'webrtc_android',
        'chromium_config_kwargs': {
          'BUILD_CONFIG': 'Release',
          'TARGET_PLATFORM': 'android',
          'TARGET_ARCH': 'arm',
          'TARGET_BITS': 32,
        },
        'bot_type': 'builder',
        'testing': {'platform': 'linux'},
        'triggers': [
          'Android32 Tests (L Nexus5)',
          'Android32 Tests (L Nexus7.2)',
        ],
        'archive_apprtc': True,
      },

[ehmaldonado_chromium, 2016/09/19 06:50:37]

Done.

+                                       'Android32 Builder (dbg)'
+                                       'Android64 Builder',
+                                       'Android64 Builder (dbg)'):
+    apk_root = api.chromium.c.build_dir.join(api.chromium.c.build_config_fs,
+                                             'apks')
+    zip_path = api.path['slave_build'].join('AppRTCDemo_apk.zip')
+    pkg = api.zip.make_package(apk_root, zip_path)
+    pkg.add_file(apk_root.join('AppRTCDemo.apk'))
+    pkg.zip('AppRTCDemo zip archive')
+
+    destination = '%s/AppRTCDemo_apk_%s.zip' % (
+        api.properties['buildername'].replace(' ', '_'),
+        api.commit_position.parse_revision(webrtc.revision_cp))

[kjellander_chromium, 2016/09/18 17:33:24]

Instead of this, you can use self.revision_cp if you use the approach described
in the next comment (and you'll also be able to remove the commit_position
dependency of the recipe again).

[ehmaldonado_chromium, 2016/09/19 06:50:37]

Done.

+    api.gsutil.upload(zip_path, 'chromium-webrtc', destination,

[kjellander_chromium, 2016/09/18 17:33:24]

Then we could re-use the existing package_build method and put this step in
there instead:
https://cs.chromium.org/chromium/build/scripts/slave/recipe_modules/webrtc/ap...

Like:
if self.bot_config.get('archive_apprtc', False):
  # Do the steps above, but re-use the upload_url variable that already points
to the <GS bucket>/client.webrtc/Android32 Builder (dbg) directory.

That way, the recipe stays much more readable.

[ehmaldonado_chromium, 2016/09/19 06:50:37]

Moved to the package_build method.

I didn't re-use the upload_url variable. It would have resulted in something
like this:

gs://chromium-webrtc/gs://chromium-webrtc/client.webrtc/Android32
Builder/AppRTCDemo_apk_170242.zip

Because gsutil.upload prefixes 'destination' with 'gs://chromium-webrtc/'.

[kjellander_chromium, 2016/09/19 12:14:24]

I see. Looks much better now!

+                      args=['-a', 'public-read'], unauthenticated_url=True)
+
   if webrtc.should_test:
     webrtc.runtests()
 
   webrtc.maybe_trigger()
 
 
 def _sanitize_nonalpha(text):
   return ''.join(c if c.isalnum() else '_' for c in text.lower())
 
 
@@ skipping 61 matching lines @@
   yield generate_builder(mastername, 'Android32 Builder', revision=None,
                          suffix='_forced')
 
   buildername = 'Android32 Tests (L Nexus5)'
   yield generate_builder(mastername, buildername, revision=None,
                          parent_got_revision='12345', suffix='_forced')
   yield generate_builder(mastername, buildername, revision=None,
                          suffix='_forced_invalid')
   yield generate_builder(mastername, buildername, revision='12345',
                          failing_test='tools_unittests', suffix='_failing_test')