| 1 |
commit: 91b8e50411c464e6026d37d5e0b2bba577e539c8 |
| 2 |
Author: Magnus Granberg <zorry <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Nov 6 17:54:20 2021 +0000 |
| 4 |
Commit: Magnus Granberg <zorry <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Nov 6 17:54:20 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/tinderbox-cluster.git/commit/?id=91b8e504 |
| 7 |
|
| 8 |
Add environment to the build step |
| 9 |
|
| 10 |
Signed-off-by: Magnus Granberg <zorry <AT> gentoo.org> |
| 11 |
|
| 12 |
buildbot_gentoo_ci/steps/builders.py | 22 ++++++++++++++++++++++ |
| 13 |
gentooci.cfg | 4 ---- |
| 14 |
2 files changed, 22 insertions(+), 4 deletions(-) |
| 15 |
|
| 16 |
diff --git a/buildbot_gentoo_ci/steps/builders.py b/buildbot_gentoo_ci/steps/builders.py |
| 17 |
index 93e3529..4c9444a 100644 |
| 18 |
--- a/buildbot_gentoo_ci/steps/builders.py |
| 19 |
+++ b/buildbot_gentoo_ci/steps/builders.py |
| 20 |
@@ -352,6 +352,7 @@ class RunEmerge(BuildStep): |
| 21 |
self.step = step |
| 22 |
super().__init__(**kwargs) |
| 23 |
self.descriptionSuffix = self.step |
| 24 |
+ self.build_env = {} |
| 25 |
|
| 26 |
@defer.inlineCallbacks |
| 27 |
def run(self): |
| 28 |
@@ -363,6 +364,26 @@ class RunEmerge(BuildStep): |
| 29 |
'-v' |
| 30 |
] |
| 31 |
aftersteps_list = [] |
| 32 |
+ # set env |
| 33 |
+ # https://bugs.gentoo.org/683118 |
| 34 |
+ # export TERM=linux |
| 35 |
+ # export TERMINFO=/etc/terminfo |
| 36 |
+ self.build_env['TERM'] = 'linux' |
| 37 |
+ self.build_env['TERMINFO'] = '/etc/terminfo' |
| 38 |
+ # Lang |
| 39 |
+ self.build_env['LANG'] = 'C.utf8' |
| 40 |
+ self.build_env['LC_MESSAGES'] = 'C' |
| 41 |
+ # no color |
| 42 |
+ self.build_env['CARGO_TERM_COLOR'] = 'never' |
| 43 |
+ self.build_env['GCC_COLORS'] = '0' |
| 44 |
+ self.build_env['OCAML_COLOR'] = 'never' |
| 45 |
+ self.build_env['PY_FORCE_COLOR'] = '0' |
| 46 |
+ self.build_env['PYTEST_ADDOPTS'] = '--color=no' |
| 47 |
+ self.build_env['NO_COLOR'] = '1' |
| 48 |
+ # not all terms support urls |
| 49 |
+ self.build_env['GCC_URLS'] = 'no' |
| 50 |
+ self.build_env['TERM_URLS'] = 'no' |
| 51 |
+ |
| 52 |
if self.step == 'pre-update': |
| 53 |
shell_commad_list.append('-uDN') |
| 54 |
shell_commad_list.append('--changed-deps') |
| 55 |
@@ -522,6 +543,7 @@ class RunEmerge(BuildStep): |
| 56 |
strip=True, |
| 57 |
extract_fn=PersOutputOfEmerge, |
| 58 |
workdir='/', |
| 59 |
+ env=self.build_env, |
| 60 |
timeout=None |
| 61 |
)) |
| 62 |
aftersteps_list.append(CheckEmergeLogs('build')) |
| 63 |
|
| 64 |
diff --git a/gentooci.cfg b/gentooci.cfg |
| 65 |
index 3701878..ca3afe3 100644 |
| 66 |
--- a/gentooci.cfg |
| 67 |
+++ b/gentooci.cfg |
| 68 |
@@ -16,12 +16,8 @@ c = BuildmasterConfig = {} |
| 69 |
c['db_url'] = "postgresql://buildbot:password@ip/gentoo-ci" |
| 70 |
|
| 71 |
makeconf_list = [] |
| 72 |
-makeconf_list.append('LC_MESSAGES=C') |
| 73 |
-makeconf_list.append('NOCOLOR="true"') |
| 74 |
-makeconf_list.append('GCC_COLORS=""') |
| 75 |
makeconf_list.append('PORTAGE_TMPFS="/dev/shm"') |
| 76 |
makeconf_list.append('CLEAN_DELAY=0') |
| 77 |
-makeconf_list.append('NOCOLOR=true') |
| 78 |
makeconf_list.append('PORT_LOGDIR="/var/cache/portage/logs"') |
| 79 |
makeconf_list.append('PKGDIR="/var/cache/portage/packages"') |
| 80 |
makeconf_list.append('DISTDIR="/var/cache/portage/distfiles"') |
Archives