From b3c5ef5456e656564d1744dace0f15acbe4839b9 Mon Sep 17 00:00:00 2001
From: Ted Mielczarek <ted@mielczarek.org>
Date: Mon, 24 Aug 2015 13:54:03 -0400
Subject: [PATCH] bug 1197154 - Hook up cross-mac taskcluster builds on try.
 r=dustin

Also tweak some things in the task definition, and rename the mozharness
config file to make mozharness happy.

--HG--
rename : testing/mozharness/configs/builds/releng_base_mac_cross_builds.py => testing/mozharness/configs/builds/releng_base_mac_64_cross_builds.py
extra : commitid : JCbwc6Wh9Oo
extra : rebase_source : 9b99fa75e225e8e2e10817155e481ba0493ee2fd
---
 ...ilds.py => releng_base_mac_64_cross_builds.py} |  0
 .../taskcluster/tasks/branches/base_job_flags.yml |  1 +
 .../taskcluster/tasks/branches/try/job_flags.yml  |  6 ++++++
 testing/taskcluster/tasks/builds/opt_macosx64.yml | 15 +++++++++------
 4 files changed, 16 insertions(+), 6 deletions(-)
 rename testing/mozharness/configs/builds/{releng_base_mac_cross_builds.py => releng_base_mac_64_cross_builds.py} (100%)

diff --git a/testing/mozharness/configs/builds/releng_base_mac_cross_builds.py b/testing/mozharness/configs/builds/releng_base_mac_64_cross_builds.py
similarity index 100%
rename from testing/mozharness/configs/builds/releng_base_mac_cross_builds.py
rename to testing/mozharness/configs/builds/releng_base_mac_64_cross_builds.py
diff --git a/testing/taskcluster/tasks/branches/base_job_flags.yml b/testing/taskcluster/tasks/branches/base_job_flags.yml
index 36a0d8df780c..b9b86f04f6c7 100644
--- a/testing/taskcluster/tasks/branches/base_job_flags.yml
+++ b/testing/taskcluster/tasks/branches/base_job_flags.yml
@@ -30,6 +30,7 @@ flags:
     - aries-dogfood
     - android-api-11
     - linux64
+    - macosx64
 
   tests:
     - cppunit
diff --git a/testing/taskcluster/tasks/branches/try/job_flags.yml b/testing/taskcluster/tasks/branches/try/job_flags.yml
index e950f90af2c0..95ba61a590be 100644
--- a/testing/taskcluster/tasks/branches/try/job_flags.yml
+++ b/testing/taskcluster/tasks/branches/try/job_flags.yml
@@ -137,6 +137,12 @@ builds:
         task: tasks/builds/opt_linux64_clobber.yml
       debug:
         task: tasks/builds/dbg_linux64_clobber.yml
+  macosx64:
+    platforms:
+      - MacOSX64
+    types:
+      debug:
+        task: tasks/builds/dbg_macosx64.yml
   sm-plain:
     platforms:
       - Linux64
diff --git a/testing/taskcluster/tasks/builds/opt_macosx64.yml b/testing/taskcluster/tasks/builds/opt_macosx64.yml
index 52d993685a62..c12c4ac9a230 100644
--- a/testing/taskcluster/tasks/builds/opt_macosx64.yml
+++ b/testing/taskcluster/tasks/builds/opt_macosx64.yml
@@ -1,5 +1,5 @@
 $inherits:
-  from: 'tasks/build.yml'
+  from: 'tasks/builds/firefox_base.yml'
   variables:
     build_name: 'macosx64'
     build_type: 'opt'
@@ -17,18 +17,21 @@ task:
   scopes:
     - 'docker-worker:cache:build-macosx64-workspace'
     - 'docker-worker:cache:tooltool-cache'
+    - 'docker-worker:relengapi-proxy:tooltool.download.internal'
+    - 'docker-worker:relengapi-proxy:tooltool.download.public'
 
   payload:
     image: '{{#docker_image}}desktop-build{{/docker_image}}'
     cache:
       build-macosx64-c6-workspace: '/home/worker/workspace'
       tooltool-cache: '/home/worker/tooltool-cache'
+
     features:
       relengAPIProxy: true
 
     env:
       MOZHARNESS_SCRIPT: 'mozharness/scripts/fx_desktop_build.py'
-      MOZHARNESS_CONFIG: 'builds/releng_base_mac_cross_builds.py balrog/production.py'
+      MOZHARNESS_CONFIG: 'builds/releng_base_mac_64_cross_builds.py balrog/production.py'
       MH_BRANCH: {{project}}
       MH_BUILD_POOL: taskcluster
       #TODO: bug 1164617 - remove Docker image hacks
@@ -36,8 +39,8 @@ task:
       CPLUS_INCLUDE_PATH: ""
       # image paths
       TOOLTOOL_CACHE: '/home/worker/tooltool-cache'
-      DIST_UPLOADS: 'jsshell-mac.zip'
-      DIST_TARGET_UPLOADS: 'x-test.mac.tar.bz2 mac.dmg mac.json tests.zip crashreporter-symbols.zip'
+      DIST_UPLOADS: 'jsshell-mac64.zip'
+      DIST_TARGET_UPLOADS: 'mac64.dmg mac64.json tests.zip crashreporter-symbols.zip'
 
     maxRunTime: 36000
 
@@ -50,10 +53,10 @@ task:
     treeherder:
       machine:
         # see https://github.com/mozilla/treeherder/blob/master/ui/js/values.js
-        platform: macosx64
+        platform: osx-10-7
     # Rather then enforcing particular conventions we require that all build
     # tasks provide the "build" extra field to specify where the build and tests
     # files are located.
     locations:
-      build: 'public/build/target.mac.dmg'
+      build: 'public/build/target.mac64.dmg'
       tests: 'public/build/target.tests.zip'