Reland "Enable new parallel_emerge impl as default"
This reverts commit 86fe4d7379aa3d3168b653e186ad058a9b86a9a3.
Reason for revert: Trying to re-land this change with the fix for the original race condition.
Original change's description:
> Revert parallel_emerge.py back to use old implementation
>
> BUG=chromium:1000374
> TEST=make sure build stage passes on all CQ builders
>
> Change-Id: Ic9ec1a8b058a00f5628b9843c42a0d6afc12351a
> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/1813404
> Reviewed-by: Chris McDonald <cjmcdonald@chromium.org>
> Tested-by: Ned Nguyen <nednguyen@google.com>
> Commit-Queue: Ned Nguyen <nednguyen@google.com>
Bug: chromium:1000374
Cq-Depend: chromium:1813038
Change-Id: Iccba1537496fb45a59956dcdee08a825a243e4ed
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/1834112
Tested-by: Chris McDonald <cjmcdonald@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Ned Nguyen <nednguyen@google.com>
Reviewed-by: Alex Klein <saklein@chromium.org>
Commit-Queue: Chris McDonald <cjmcdonald@chromium.org>
diff --git a/scripts/parallel_emerge.py b/scripts/parallel_emerge.py
index 288e73a..12a35a0 100644
--- a/scripts/parallel_emerge.py
+++ b/scripts/parallel_emerge.py
@@ -7,12 +7,12 @@
from __future__ import print_function
+import os
+
from chromite.lib import cros_logging
from chromite.scripts import parallel_emerge_new as NEW_WRAPPER
-# TODO(crbug.com/1000374): revert this once we have a proper fix for
-# ArchiveStage's race on deleting portage tmpdir.
-_USE_NEW = False # os.environ.get('USE_NEW_PARALLEL_EMERGE', '1') == '1'
+_USE_NEW = os.environ.get('USE_NEW_PARALLEL_EMERGE', '1') == '1'
# parallel_emerge_old.py runs code at import time, so only import it if we
# intend to use it. This avoids getting a mix of the old and new behaviors.