[gentoo-commits] proj/tinderbox-cluster:master commit in: buildbot_gentoo_ci/steps/, /

[Magnus Granberg]

commit:     91b8e50411c464e6026d37d5e0b2bba577e539c8
Author:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
AuthorDate: Sat Nov  6 17:54:20 2021 +0000
Commit:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
CommitDate: Sat Nov  6 17:54:20 2021 +0000
URL:        
https://gitweb.gentoo.org/proj/tinderbox-cluster.git/commit/?id=91b8e504

Add environment to the build step

Signed-off-by: Magnus Granberg <zorry <AT> gentoo.org>

 buildbot_gentoo_ci/steps/builders.py | 22 ++++++++++++++++++++++
 gentooci.cfg                         |  4 ----
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/buildbot_gentoo_ci/steps/builders.py 
b/buildbot_gentoo_ci/steps/builders.py
index 93e3529..4c9444a 100644
--- a/buildbot_gentoo_ci/steps/builders.py
+++ b/buildbot_gentoo_ci/steps/builders.py
@@ -352,6 +352,7 @@ class RunEmerge(BuildStep):
         self.step = step
         super().__init__(**kwargs)
         self.descriptionSuffix = self.step
+        self.build_env = {}
 
     @defer.inlineCallbacks
     def run(self):
@@ -363,6 +364,26 @@ class RunEmerge(BuildStep):
                     '-v'
                     ]
         aftersteps_list = []
+        # set env
+        # https://bugs.gentoo.org/683118
+        # export TERM=linux
+        # export TERMINFO=/etc/terminfo
+        self.build_env['TERM'] = 'linux'
+        self.build_env['TERMINFO'] = '/etc/terminfo'
+        # Lang
+        self.build_env['LANG'] = 'C.utf8'
+        self.build_env['LC_MESSAGES'] = 'C'
+        # no color
+        self.build_env['CARGO_TERM_COLOR'] = 'never'
+        self.build_env['GCC_COLORS'] = '0'
+        self.build_env['OCAML_COLOR'] = 'never'
+        self.build_env['PY_FORCE_COLOR'] = '0'
+        self.build_env['PYTEST_ADDOPTS'] = '--color=no'
+        self.build_env['NO_COLOR'] = '1'
+        # not all terms support urls
+        self.build_env['GCC_URLS'] = 'no'
+        self.build_env['TERM_URLS'] = 'no'
+
         if self.step == 'pre-update':
             shell_commad_list.append('-uDN')
             shell_commad_list.append('--changed-deps')
@@ -522,6 +543,7 @@ class RunEmerge(BuildStep):
                         strip=True,
                         extract_fn=PersOutputOfEmerge,
                         workdir='/',
+                        env=self.build_env,
                         timeout=None
                 ))
             aftersteps_list.append(CheckEmergeLogs('build'))

diff --git a/gentooci.cfg b/gentooci.cfg
index 3701878..ca3afe3 100644
--- a/gentooci.cfg
+++ b/gentooci.cfg
@@ -16,12 +16,8 @@ c = BuildmasterConfig = {}
 c['db_url'] = "postgresql://buildbot:password@ip/gentoo-ci"
 
 makeconf_list = []
-makeconf_list.append('LC_MESSAGES=C')
-makeconf_list.append('NOCOLOR="true"')
-makeconf_list.append('GCC_COLORS=""')
 makeconf_list.append('PORTAGE_TMPFS="/dev/shm"')
 makeconf_list.append('CLEAN_DELAY=0')
-makeconf_list.append('NOCOLOR=true')
 makeconf_list.append('PORT_LOGDIR="/var/cache/portage/logs"')
 makeconf_list.append('PKGDIR="/var/cache/portage/packages"')
 makeconf_list.append('DISTDIR="/var/cache/portage/distfiles"')