cbuildbot: Disable 'separatedebug' in all stages
This FEATURE leads to flakes in the CQ due to missing debug symbols with
a yet unknown cause. We disabled this FEATURE in the Build API already,
so disable this in cbuildbot as well.
BUG=chromium:1115549, chromium:947294
TEST=`run_pytest`
Change-Id: I7f64ca9372be8da1503fde00bc199e75698c1b94
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/2353229
Tested-by: Chris McDonald <cjmcdonald@chromium.org>
Reviewed-by: Manoj Gupta <manojgupta@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Commit-Queue: Chris McDonald <cjmcdonald@chromium.org>
diff --git a/cbuildbot/stages/branch_archive_stages_unittest.py b/cbuildbot/stages/branch_archive_stages_unittest.py
index 9ce3c09..eb4a414 100644
--- a/cbuildbot/stages/branch_archive_stages_unittest.py
+++ b/cbuildbot/stages/branch_archive_stages_unittest.py
@@ -260,7 +260,6 @@
self.workspace,
'board',
extra_env={
- 'FEATURES': 'separatedebug',
'USE': '-cros-debug chrome_internal',
}),
])
@@ -374,7 +373,6 @@
self.workspace,
'board',
extra_env={
- 'FEATURES': 'separatedebug',
'USE': '-cros-debug chrome_internal',
}),
])
diff --git a/cbuildbot/stages/generic_stages.py b/cbuildbot/stages/generic_stages.py
index 3fe55f6..65503b9 100644
--- a/cbuildbot/stages/generic_stages.py
+++ b/cbuildbot/stages/generic_stages.py
@@ -149,8 +149,10 @@
if useflags:
self._portage_extra_env['USE'] = ' '.join(useflags)
- if self._run.config.separate_debug_symbols:
- self._portage_extra_env['FEATURES'] = 'separatedebug'
+ # TODO(crbug.com/947294): `separatedebug` needs to be disabled as it leads
+ # to CQ flakes.
+ # if self._run.config.separate_debug_symbols:
+ # self._portage_extra_env['FEATURES'] = 'separatedebug'
# Note: BuildStartStage is a special case: Since it is created before we
# have a valid |build_id|, it is not logged in cidb.
diff --git a/cbuildbot/stages/workspace_stages_unittest.py b/cbuildbot/stages/workspace_stages_unittest.py
index e262639..7148699 100644
--- a/cbuildbot/stages/workspace_stages_unittest.py
+++ b/cbuildbot/stages/workspace_stages_unittest.py
@@ -422,7 +422,6 @@
],
extra_env={
'USE': '-cros-debug chrome_internal chromeless_tty',
- 'FEATURES': 'separatedebug',
},
cwd=self.workspace,
)
@@ -446,7 +445,6 @@
],
extra_env={
'USE': '-cros-debug chrome_internal chromeless_tty',
- 'FEATURES': 'separatedebug',
'CHROME_ORIGIN': 'LOCAL_SOURCE',
},
cwd=self.workspace,
@@ -476,7 +474,7 @@
chroot_args=['--cache-dir', '/cache'],
extra_env={
'USE': '-cros-debug chrome_internal chromeless_tty',
- 'FEATURES': 'separatedebug -separatedebug splitdebug',
+ 'FEATURES': ' -separatedebug splitdebug',
},
cwd=self.workspace,
)
@@ -497,7 +495,7 @@
chroot_args=['--cache-dir', '/cache'],
extra_env={
'CHROME_ORIGIN': 'LOCAL_SOURCE',
- 'FEATURES': 'separatedebug -separatedebug splitdebug',
+ 'FEATURES': ' -separatedebug splitdebug',
'USE': '-cros-debug chrome_internal chromeless_tty',
},
cwd=self.workspace,
@@ -540,7 +538,6 @@
chroot_args=['--cache-dir', '/cache'],
extra_env={
'USE': '-cros-debug chrome_internal chromeless_tty',
- 'FEATURES': 'separatedebug',
},
cwd=self.workspace,
)
@@ -567,7 +564,6 @@
chroot_args=['--cache-dir', '/cache'],
extra_env={
'USE': '-cros-debug chrome_internal chromeless_tty',
- 'FEATURES': 'separatedebug',
},
cwd=self.workspace,
)
@@ -594,7 +590,6 @@
chroot_args=['--cache-dir', '/cache', '--chrome_root', '/chrome'],
extra_env={
'USE': '-cros-debug chrome_internal chromeless_tty',
- 'FEATURES': 'separatedebug',
'CHROME_ORIGIN': 'LOCAL_SOURCE',
},
cwd=self.workspace,
@@ -622,7 +617,6 @@
chroot_args=['--cache-dir', '/cache', '--chrome_root', '/chrome'],
extra_env={
'USE': '-cros-debug chrome_internal chromeless_tty',
- 'FEATURES': 'separatedebug',
'CHROME_ORIGIN': 'LOCAL_SOURCE',
},
cwd=self.workspace,
@@ -659,7 +653,6 @@
chroot_args=['--cache-dir', '/cache'],
extra_env={
'USE': u'-cros-debug chrome_internal chromeless_tty',
- 'FEATURES': 'separatedebug',
},
cwd=self.workspace,
)
@@ -690,7 +683,6 @@
chroot_args=['--cache-dir', '/cache'],
extra_env={
'USE': u'-cros-debug chrome_internal chromeless_tty',
- 'FEATURES': 'separatedebug',
},
cwd=self.workspace,
)
@@ -723,7 +715,6 @@
chroot_args=['--cache-dir', '/cache', '--chrome_root', '/chrome'],
extra_env={
'USE': u'-cros-debug chrome_internal',
- 'FEATURES': 'separatedebug',
'CHROME_ORIGIN': 'LOCAL_SOURCE',
},
cwd=self.workspace,
@@ -805,7 +796,6 @@
chroot_args=['--cache-dir', '/cache'],
extra_env={
'USE': '-cros-debug chrome_internal',
- 'FEATURES': 'separatedebug',
},
cwd=self.workspace,
)
@@ -836,7 +826,6 @@
chroot_args=['--cache-dir', '/cache'],
extra_env={
'USE': '-cros-debug chrome_internal',
- 'FEATURES': 'separatedebug',
},
cwd=self.workspace,
)
@@ -882,7 +871,6 @@
chroot_args=['--cache-dir', '/cache'],
extra_env={
'USE': '-cros-debug chrome_internal',
- 'FEATURES': 'separatedebug',
},
cwd=self.workspace)
