Bug 1385629 - Use correct tooltool cache directory for Marionette and Firefox-UI tests on osx. r=whimboo, a=test-only
authorGeoff Brown <gbrown@mozilla.com>
Tue, 08 Aug 2017 09:31:57 -0600
changeset 423447 276cdb43ab4afbc45efafee02a83187252e1f227
parent 423446 4961fa4cb99cc50a2903e8ed673a0cdac489f642
child 423448 0aed982018af1ee322be7d30e723732c34a379b7
push id1517
push userjlorenzo@mozilla.com
push dateThu, 14 Sep 2017 16:50:54 +0000
treeherdermozilla-release@3b41fd564418 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerswhimboo, test-only
bugs1385629
milestone56.0
Bug 1385629 - Use correct tooltool cache directory for Marionette and Firefox-UI tests on osx. r=whimboo, a=test-only
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
@@ -131,16 +131,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:
@@ -153,16 +154,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:
@@ -356,16 +358,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)
@@ -391,16 +394,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",
+}