Merge "import zuul job settings from project-config"
diff --git a/.mailmap b/.mailmap
index 7898e69..fc74aa9 100644
--- a/.mailmap
+++ b/.mailmap
@@ -6,8 +6,9 @@
Andrea Frittoli <andrea.frittoli@gmail.com> <andrea.frittoli@hpe.com>
Daryl Walleck <daryl.walleck@rackspace.com> <daryl.walleck@rackspace.com>
David Kranz <dkranz@redhat.com> David Kranz <david.kranz@qrclab.com>
-Ghanshyam <ghanshyam.mann@nectechnologies.in> <ghanshyam.mann@nectechnologies.in>
-Ghanshyam <ghanshyam.mann@nectechnologies.in> <ghanshyam.mann@nectechnologies.in>
+Ghanshyam Mann <gmann@ghanshyammann.com> <ghanshyam.mann@nectechnologies.in>
+Ghanshyam Mann <gmann@ghanshyammann.com> <ghanshyam.mann@india.nec.com>
+Ghanshyam Mann <gmann@ghanshyammann.com> <ghanshyammann@gmail.com>
Jay Pipes <jaypipes@gmail.com> <jpipes@librebox.gateway.2wire.net>
Joe Gordon <joe.gordon0@gmail.com> <jogo@cloudscaling.com>
Ken'ichi Ohmichi <ken-oomichi@wx.jp.nec.com> <oomichi@mxs.nes.nec.co.jp>
diff --git a/tempest/config.py b/tempest/config.py
index a8a3bc3..888f178 100644
--- a/tempest/config.py
+++ b/tempest/config.py
@@ -1229,6 +1229,11 @@
def set_config_path(self, path):
self._path = path
+ # FIXME(masayukig): bug#1783751 To pass the config file path to child
+ # processes, we need to set the environment variables here as a
+ # workaround.
+ os.environ['TEMPEST_CONFIG_DIR'] = os.path.dirname(path)
+ os.environ['TEMPEST_CONFIG'] = os.path.basename(path)
CONF = TempestConfigProxy()