Revert of lightweight builds archiving for mac and win64

Revert of lightweight builds archiving for mac and win64 (patchset #8 id:140001 of https://codereview.chromium.org/2279953002/ )

Reason for revert:
Ran into an error. 

Original issue's description:
> lightweight builds archiving for mac and win64.
> Changing perf buildbot to add a step 'repackage
> for bisect' to Win64/Mac. 
> 
> 
> mac,win,win64 support
> 
> BUG=604452
> R=dimu
> 
> Committed: https://chromium.googlesource.com/chromium/tools/build/+/9c526af4f649b33e3a1351dd9c9bbe6fdb7122da

TBR=dimu@google.com,dtu@chromium.org,stip@chromium.org,mmoss@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=604452
Committed: https://chromium.googlesource.com/chromium/tools/build/+/f835a9107ae607130e9c658067a23c7334b22f83

[miimnk, 2016-08-31 21:00:14]

The CQ bit was checked by miimnk@google.com

[miimnk, 2016-08-31 21:00:14]

Created Revert of lightweight builds archiving for mac and win64

[commit-bot: I haz the power, 2016-08-31 21:00:26]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-08-31 21:00:27]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-08-31 21:00:28]

No L-G-T-M from a valid reviewer yet. 
CQ run can only be started by full committers or once the patch has
received an L-G-T-M from a full committer.
Even if an L-G-T-M may have been provided, it was from a non-committer,
_not_ a full super star committer.
Committers are members of the group "project-infra-committers".
Note that this has nothing to do with OWNERS files.

[Michael Moss, 2016-08-31 21:01:37]

LGTM.

Any link or more detail about the error?

[chromium-reviews, 2016-08-31 21:04:05]

Yes. I accidentally forgot to change a flag name in one of the files.

Should I go ahead and fix the change and resubmit?

zip_build.py: error: no such option: --not-include-extra
@@@STEP_CURSOR@package build for bisect@@@
step returned non-zero exit code: 2
@@@STEP_EXCEPTION@@@




On Wed, Aug 31, 2016 at 2:01 PM, <mmoss@chromium.org> wrote:

> LGTM.
>
> Any link or more detail about the error?
>
> https://codereview.chromium.org/2303433002/
>

-- 
You received this message because you are subscribed to the Google Groups
"Chromium-reviews" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to chromium-reviews+unsubscribe@chromium.org.

[Michael Moss, 2016-08-31 21:16:10]

On 2016/08/31 21:04:05, chromium-reviews wrote:
> Yes. I accidentally forgot to change a flag name in one of the files.
> 
> Should I go ahead and fix the change and resubmit?

Yeah, seems pretty straightforward.

[miimnk, 2016-08-31 21:28:59]

The CQ bit was checked by miimnk@google.com to run a CQ dry run

[commit-bot: I haz the power, 2016-08-31 21:29:01]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-08-31 21:29:04]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-08-31 21:29:05]

Dry run: This issue passed the CQ dry run.

[miimnk, 2016-08-31 21:31:13]

The CQ bit was checked by miimnk@google.com

[miimnk, 2016-08-31 21:31:13]

The patchset sent to the CQ was uploaded after l-g-t-m from mmoss@chromium.org
Link to the patchset: https://codereview.chromium.org/2303433002/#ps170001
(title: "fixed bug with previous land")

[commit-bot: I haz the power, 2016-08-31 21:31:22]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-08-31 21:31:29]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-08-31 21:31:30]

Failed to apply patch for scripts/slave/recipe_modules/archive/api.py:
While running git apply --index -3 -p1;
  <stdin>:20: trailing whitespace.
        update_properties=None, store_by_hash=True, 
  error: patch failed: scripts/slave/recipe_modules/archive/api.py:3
  Falling back to three-way merge...
  Applied patch to 'scripts/slave/recipe_modules/archive/api.py' with conflicts.
  U scripts/slave/recipe_modules/archive/api.py
  warning: 1 line adds whitespace errors.

Patch:       scripts/slave/recipe_modules/archive/api.py
Index: scripts/slave/recipe_modules/archive/api.py
diff --git a/scripts/slave/recipe_modules/archive/api.py
b/scripts/slave/recipe_modules/archive/api.py
index
bdf1c40b33f73b139539bc815ed134901697354d..fc1bde7aa6957200d4039be3c09666846b8c2a6d
100644
--- a/scripts/slave/recipe_modules/archive/api.py
+++ b/scripts/slave/recipe_modules/archive/api.py
@@ -3,6 +3,8 @@
 # found in the LICENSE file.
 
 import re
+import sys
+
 import manual_bisect_files
 from recipe_engine import recipe_api
 
@@ -92,7 +94,8 @@ class ArchiveApi(recipe_api.RecipeApi):
       self, step_name, target, build_url=None, src_dir=None,
       build_revision=None, cros_board=None, package_dsym_files=False,
       exclude_files=None, exclude_perf_test_files=False,
-      update_properties=None, store_by_hash=True, **kwargs):
+      update_properties=None, store_by_hash=True, 
+      platform=None, **kwargs):
     """Returns a step invoking zip_build.py to zip up a Chromium build.
        If build_url is specified, also uploads the build."""
     if not src_dir:
@@ -121,12 +124,23 @@ class ArchiveApi(recipe_api.RecipeApi):
       args.extend(['--exclude-files', exclude_files])
     if 'gs_acl' in self.m.properties:
       args.extend(['--gs-acl', self.m.properties['gs_acl']])
-    if exclude_perf_test_files:
-      inclusions = ','.join(manual_bisect_files.CHROME_REQUIRED_FILES)
-      strip_files = ','.join(manual_bisect_files.CHROME_STRIP_LIST)
-      args.extend(['--include-files', inclusions])
-      args.extend(['--ignore-regex'])
-      args.extend(['--strip-files', strip_files])
+    if exclude_perf_test_files and platform:
+      include_bisect_file_list = (
+        manual_bisect_files.CHROME_REQUIRED_FILES.get(platform))
+      include_bisect_strip_list = (
+        manual_bisect_files.CHROME_STRIP_LIST.get(platform))
+      include_bisect_whitelist = (
+        manual_bisect_files.CHROME_WHITELIST_FILES.get(platform))
+      if include_bisect_file_list:
+        inclusions = ','.join(include_bisect_file_list)
+        args.extend(['--include-files', inclusions])
+      if include_bisect_strip_list:
+        strip_files = ','.join(include_bisect_strip_list)
+        args.extend(['--strip-files', strip_files])
+      if include_bisect_whitelist:
+        args.extend(['--whitelist', include_bisect_whitelist])
+      args.extend(['--exclude-extra'])
+
       # If update_properties is passed in and store_by_hash is False,
       # we store it with commit position number instead of a hash
       if update_properties and not store_by_hash:

[miimnk, 2016-08-31 21:33:45]

The CQ bit was checked by miimnk@google.com

[miimnk, 2016-08-31 21:33:46]

The patchset sent to the CQ was uploaded after l-g-t-m from mmoss@chromium.org
Link to the patchset: https://codereview.chromium.org/2303433002/#ps190001
(title: "fixed bug with previous land")

[commit-bot: I haz the power, 2016-08-31 21:33:51]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-08-31 21:33:56]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-08-31 21:33:57]

Failed to apply patch for scripts/slave/recipe_modules/archive/api.py:
While running git apply --index -3 -p1;
  error: patch failed: scripts/slave/recipe_modules/archive/api.py:3
  Falling back to three-way merge...
  Applied patch to 'scripts/slave/recipe_modules/archive/api.py' with conflicts.
  U scripts/slave/recipe_modules/archive/api.py

Patch:       scripts/slave/recipe_modules/archive/api.py
Index: scripts/slave/recipe_modules/archive/api.py
diff --git a/scripts/slave/recipe_modules/archive/api.py
b/scripts/slave/recipe_modules/archive/api.py
index
bdf1c40b33f73b139539bc815ed134901697354d..6ef85a7beee5dfcab058a80448613c74f82f2a05
100644
--- a/scripts/slave/recipe_modules/archive/api.py
+++ b/scripts/slave/recipe_modules/archive/api.py
@@ -3,6 +3,8 @@
 # found in the LICENSE file.
 
 import re
+import sys
+
 import manual_bisect_files
 from recipe_engine import recipe_api
 
@@ -92,7 +94,8 @@ class ArchiveApi(recipe_api.RecipeApi):
       self, step_name, target, build_url=None, src_dir=None,
       build_revision=None, cros_board=None, package_dsym_files=False,
       exclude_files=None, exclude_perf_test_files=False,
-      update_properties=None, store_by_hash=True, **kwargs):
+      update_properties=None, store_by_hash=True,
+      platform=None, **kwargs):
     """Returns a step invoking zip_build.py to zip up a Chromium build.
        If build_url is specified, also uploads the build."""
     if not src_dir:
@@ -121,12 +124,23 @@ class ArchiveApi(recipe_api.RecipeApi):
       args.extend(['--exclude-files', exclude_files])
     if 'gs_acl' in self.m.properties:
       args.extend(['--gs-acl', self.m.properties['gs_acl']])
-    if exclude_perf_test_files:
-      inclusions = ','.join(manual_bisect_files.CHROME_REQUIRED_FILES)
-      strip_files = ','.join(manual_bisect_files.CHROME_STRIP_LIST)
-      args.extend(['--include-files', inclusions])
-      args.extend(['--ignore-regex'])
-      args.extend(['--strip-files', strip_files])
+    if exclude_perf_test_files and platform:
+      include_bisect_file_list = (
+        manual_bisect_files.CHROME_REQUIRED_FILES.get(platform))
+      include_bisect_strip_list = (
+        manual_bisect_files.CHROME_STRIP_LIST.get(platform))
+      include_bisect_whitelist = (
+        manual_bisect_files.CHROME_WHITELIST_FILES.get(platform))
+      if include_bisect_file_list:
+        inclusions = ','.join(include_bisect_file_list)
+        args.extend(['--include-files', inclusions])
+      if include_bisect_strip_list:
+        strip_files = ','.join(include_bisect_strip_list)
+        args.extend(['--strip-files', strip_files])
+      if include_bisect_whitelist:
+        args.extend(['--whitelist', include_bisect_whitelist])
+      args.extend(['--exclude-extra'])
+
       # If update_properties is passed in and store_by_hash is False,
       # we store it with commit position number instead of a hash
       if update_properties and not store_by_hash:

[miimnk, 2016-08-31 21:40:00]

The CQ bit was checked by miimnk@google.com to run a CQ dry run

[commit-bot: I haz the power, 2016-08-31 21:40:10]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-08-31 21:40:16]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-08-31 21:40:17]

Dry run: This issue passed the CQ dry run.

[miimnk, 2016-08-31 21:42:53]

The CQ bit was checked by miimnk@google.com

[miimnk, 2016-08-31 21:42:53]

The patchset sent to the CQ was uploaded after l-g-t-m from mmoss@chromium.org
Link to the patchset: https://codereview.chromium.org/2303433002/#ps210001
(title: "resolved merge conflicts")

[commit-bot: I haz the power, 2016-08-31 21:43:02]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-08-31 21:43:11]

Description was changed from

==========
Revert of lightweight builds archiving for mac and win64 (patchset #8 id:140001
of https://codereview.chromium.org/2279953002/ )

Reason for revert:
Ran into an error. 

Original issue's description:
> lightweight builds archiving for mac and win64.
> Changing perf buildbot to add a step 'repackage
> for bisect' to Win64/Mac. 
> 
> 
> mac,win,win64 support
> 
> BUG=604452
> R=dimu
> 
> Committed:
https://chromium.googlesource.com/chromium/tools/build/+/9c526af4f649b33e3a13...

TBR=dimu@google.com,dtu@chromium.org,stip@chromium.org,mmoss@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=604452
==========

to

==========
Revert of lightweight builds archiving for mac and win64 (patchset #8 id:140001
of https://codereview.chromium.org/2279953002/ )

Reason for revert:
Ran into an error. 

Original issue's description:
> lightweight builds archiving for mac and win64.
> Changing perf buildbot to add a step 'repackage
> for bisect' to Win64/Mac. 
> 
> 
> mac,win,win64 support
> 
> BUG=604452
> R=dimu
> 
> Committed:
https://chromium.googlesource.com/chromium/tools/build/+/9c526af4f649b33e3a13...

TBR=dimu@google.com,dtu@chromium.org,stip@chromium.org,mmoss@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=604452

Committed:
https://chromium.googlesource.com/chromium/tools/build/+/f835a9107ae607130e9c...
==========

[commit-bot: I haz the power, 2016-08-31 21:43:12]

Committed patchset #4 (id:210001) as
https://chromium.googlesource.com/chromium/tools/build/+/f835a9107ae607130e9c...