bug 1197154 - Hook up cross-mac taskcluster builds on try. r=dustin
authorTed Mielczarek <ted@mielczarek.org>
Mon, 24 Aug 2015 13:54:03 -0400
changeset 294485 7559b07130b1e2df27c736bc7160c02a5eeda992
parent 294484 19bd2475605038a80eac3701c1418bb48e713ef1
child 294486 af1a3e372a031412b70532c217a88cb25fd21ece
push id5245
push userraliiev@mozilla.com
push dateThu, 29 Oct 2015 11:30:51 +0000
treeherdermozilla-beta@dac831dc1bd0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdustin
bugs1197154
milestone43.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 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.
testing/mozharness/configs/builds/releng_base_mac_64_cross_builds.py
testing/mozharness/configs/builds/releng_base_mac_cross_builds.py
testing/taskcluster/tasks/branches/base_job_flags.yml
testing/taskcluster/tasks/branches/try/job_flags.yml
testing/taskcluster/tasks/builds/opt_macosx64.yml
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
--- a/testing/taskcluster/tasks/branches/base_job_flags.yml
+++ b/testing/taskcluster/tasks/branches/base_job_flags.yml
@@ -25,16 +25,17 @@ flags:
     - dolphin-512
     - dolphin-512-eng
     - aries
     - aries-ota
     - aries-eng
     - aries-dogfood
     - android-api-11
     - linux64
+    - macosx64
 
   tests:
     - cppunit
     - crashtest
     - crashtest-ipc
     - gaia-build
     - gaia-build-unit
     - gaia-js-integration
--- a/testing/taskcluster/tasks/branches/try/job_flags.yml
+++ b/testing/taskcluster/tasks/branches/try/job_flags.yml
@@ -132,16 +132,22 @@ builds:
   linux64:
     platforms:
       - Linux64
     types:
       opt:
         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
     types:
       opt:
         task: tasks/builds/sm_plain.yml
       debug:
        task: tasks/builds/sm_plaindebug.yml
--- a/testing/taskcluster/tasks/builds/opt_macosx64.yml
+++ b/testing/taskcluster/tasks/builds/opt_macosx64.yml
@@ -1,10 +1,10 @@
 $inherits:
-  from: 'tasks/build.yml'
+  from: 'tasks/builds/firefox_base.yml'
   variables:
     build_name: 'macosx64'
     build_type: 'opt'
 task:
   metadata:
       name: '[TC] MacOSX64 Opt'
       description: 'MacOSX64 Opt'
 
@@ -12,48 +12,51 @@ task:
 
   routes:
     - 'index.buildbot.branches.{{project}}.macosx64'
     - 'index.buildbot.revisions.{{head_rev}}.{{project}}.macosx64'
 
   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
       LIBRARY_PATH: ""
       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
 
     command: ["/bin/bash", "bin/build.sh"]
 
   extra:
     treeherderEnv:
       - production
       - staging
     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'