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>
(cherry picked from commit 86fe4d7379aa3d3168b653e186ad058a9b86a9a3)
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/1825685
Tested-by: Mike Nichols <mikenichols@chromium.org>
Reviewed-by: Bernie Thompson <bhthompson@chromium.org>
Commit-Queue: Mike Nichols <mikenichols@chromium.org>
diff --git a/scripts/parallel_emerge.py b/scripts/parallel_emerge.py
index 12a35a0..288e73a 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
-_USE_NEW = os.environ.get('USE_NEW_PARALLEL_EMERGE', '1') == '1'
+# 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'
# 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.
