Bug 1385629 - Use correct tooltool cache directory for Marionette and Firefox-UI tests on osx; r=whimboo
authorGeoff Brown <gbrown@mozilla.com>
Tue, 08 Aug 2017 09:31:57 -0600
changeset 373389 8b22f1b5e9f37900341daf0c38b09fccd9b94968
parent 373388 9f2c22f4ef018075e5887125fe72118c2b48800d
child 373390 313e352e2440f091ee6832bbd5deb6e233d84654
push id93504
push usergbrown@mozilla.com
push dateTue, 08 Aug 2017 15:32:08 +0000
treeherdermozilla-inbound@8b22f1b5e9f3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerswhimboo
bugs1385629
milestone57.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1385629 - Use correct tooltool cache directory for Marionette and Firefox-UI tests on osx; r=whimboo
taskcluster/ci/test/tests.yml
testing/mozharness/configs/firefox_ui_tests/taskcluster_mac.py
testing/mozharness/configs/marionette/mac_taskcluster_config.py
--- a/taskcluster/ci/test/tests.yml
+++ b/taskcluster/ci/test/tests.yml
@@ -160,16 +160,17 @@ firefox-ui-functional-local:
     mozharness:
         script: firefox_ui_tests/functional.py
         config:
             by-test-platform:
                 windows.*:
                     - firefox_ui_tests/taskcluster_windows.py
                 macosx.*:
                     - firefox_ui_tests/taskcluster.py
+                    - firefox_ui_tests/taskcluster_mac.py
                 linux.*:
                     - firefox_ui_tests/taskcluster.py
                     - remove_executables.py
         extra-options:
             - "--tag"
             - "local"
 
 firefox-ui-functional-remote:
@@ -181,16 +182,17 @@ firefox-ui-functional-remote:
     mozharness:
         script: firefox_ui_tests/functional.py
         config:
             by-test-platform:
                 windows.*:
                     - firefox_ui_tests/taskcluster_windows.py
                 macosx.*:
                     - firefox_ui_tests/taskcluster.py
+                    - firefox_ui_tests/taskcluster_mac.py
                 linux.*:
                     - firefox_ui_tests/taskcluster.py
                     - remove_executables.py
         extra-options:
             - "--tag"
             - "remote"
 
 geckoview:
@@ -366,16 +368,17 @@ marionette:
                 script: marionette.py
                 no-read-buildbot-config: true
                 config:
                     by-test-platform:
                         windows.*:
                             - marionette/windows_taskcluster_config.py
                         macosx.*:
                             - marionette/prod_config.py
+                            - marionette/mac_taskcluster_config.py
                         default:
                             - marionette/prod_config.py
                             - remove_executables.py
 
 marionette-headless:
     description: "Marionette headless unittest run"
     suite: marionette
     treeherder-symbol: tc(MnH)
@@ -397,16 +400,17 @@ marionette-headless:
                 script: marionette.py
                 no-read-buildbot-config: true
                 config:
                     by-test-platform:
                         windows.*:
                             - marionette/windows_taskcluster_config.py
                         macosx.*:
                             - marionette/prod_config.py
+                            - marionette/mac_taskcluster_config.py
                         default:
                             - marionette/prod_config.py
                             - remove_executables.py
                 extra-options:
                     by-test-platform:
                         default:
                             - --headless
 
new file mode 100644
--- /dev/null
+++ b/testing/mozharness/configs/firefox_ui_tests/taskcluster_mac.py
@@ -0,0 +1,4 @@
+# Configuration over-rides for taskcluter.py, for osx
+config = {
+    "tooltool_cache": "/builds/tooltool_cache",
+}
new file mode 100644
--- /dev/null
+++ b/testing/mozharness/configs/marionette/mac_taskcluster_config.py
@@ -0,0 +1,4 @@
+# Configuration over-rides for prod_config.py, for osx
+config = {
+    "tooltool_cache": "/builds/tooltool_cache",
+}