Bug 1393344: Restore virtualenv paths for thunderbird buildbot builds on linux. draft
authorTom Prince <mozilla@hocat.ca>
Wed, 20 Sep 2017 11:02:22 -0600
changeset 667693 8d1d1b68381d767a0640d525f5b6ccdb2e462133
parent 667637 0c49ebf4195ce51072b24aacf01eaaffdcff9be6
child 732487 48d823483a2d152e0b39a8304d0466ccaa6422b4
push id80822
push userbmo:mozilla@hocat.ca
push dateWed, 20 Sep 2017 17:02:45 +0000
bugs1393344
milestone57.0a1
Bug 1393344: Restore virtualenv paths for thunderbird buildbot builds on linux. MozReview-Commit-ID: 7ueYyanbQz6
testing/mozharness/configs/unittests/thunderbird_buildbot.py
--- a/testing/mozharness/configs/unittests/thunderbird_buildbot.py
+++ b/testing/mozharness/configs/unittests/thunderbird_buildbot.py
@@ -1,9 +1,22 @@
+import platform
+
 # Specify tooltool directory for thunderbird buildbot tests explicitly.
 # The default configuration in `linux_unittest.py` specifies a
 # taskcluster-specific location. Override that here until thunderbird is being
 # built on taskcluster.
 # See https://bugzilla.mozilla.org/show_bug.cgi?id=1356520
 # and https://bugzilla.mozilla.org/show_bug.cgi?id=1371734
 config = {
     "tooltool_cache": "/builds/tooltool_cache",
 }
+
+# Specify virtualenv directory for thunderbird buildbot tests explicitly.
+# The default configuration in `linux_unittest.py` specifies a path that
+# doesn't exist on buildbot. We need to specify the other paths here too, since
+# config entries are overriden wholesale.
+if platform.system() == "Linux":
+    config["exes"] = {
+        "python": "/tools/buildbot/bin/python",
+        "virtualenv": ["/tools/buildbot/bin/python", "/tools/misc-python/virtualenv.py"],
+        "tooltool.py": "/tools/tooltool.py",
+    }