Commit ff0f1ae8 authored by Dustin J. Mitchell's avatar Dustin J. Mitchell
Browse files

Bug 1205241: enable linux64 opt/dbg and MacOSX64 builds on m-i and m-c; r=ted.mielczarek 

Properly splitting clobber (try) and non-clobber builds

--HG--
rename : testing/taskcluster/tasks/builds/dbg_macosx64.yml => testing/taskcluster/tasks/builds/dbg_macosx64_clobber.yml
rename : testing/taskcluster/tasks/builds/opt_macosx64.yml => testing/taskcluster/tasks/builds/opt_macosx64_clobber.yml
extra : commitid : 8rc1ZSq1hkA
extra : rebase_source : 01c0decaeef5737430f2f8b30d4780800accd447
parent 7479d7b3

testing/taskcluster/tasks/branches/base_jobs.yml

+14 −0
Original line number Diff line number Diff line
@@ -110,6 +110,20 @@ builds: 
    types:

      opt:

        task: tasks/builds/b2g_nexus_5l_eng.yml

  linux64:

    platforms:

      - Linux64

    types:

      opt:

        task: tasks/builds/opt_linux64.yml

      debug:

        task: tasks/builds/dbg_linux64.yml

  macosx64:

    platforms:

      - MacOSX64

    types:

      debug:

        task: tasks/builds/dbg_macosx64.yml



tests:

  cppunit:

testing/taskcluster/tasks/branches/mozilla-central/job_flags.yml

+0 −8
Original line number Diff line number Diff line
@@ -34,11 +34,3 @@ builds: 
        task: tasks/builds/b2g_flame_kk_ota_opt.yml

      debug:

        task: tasks/builds/b2g_flame_kk_ota_debug.yml
 
  linux64:

    platforms:

      - Linux64

    types:

      opt:

        task: tasks/builds/opt_linux64.yml

      debug:

        task: tasks/builds/dbg_linux64.yml

testing/taskcluster/tasks/branches/try/job_flags.yml

+14 −14
Original line number Diff line number Diff line
@@ -129,20 +129,6 @@ builds: 
    types:

      opt:

        task: tasks/builds/android_api_11.yml

  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
@@ -189,6 +175,20 @@ builds: 
        task: tasks/builds/sm_warnaserr.yml

      debug:

        task: tasks/builds/sm_warnaserrdebug.yml

  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_clobber.yml



post-build:

  upload-symbols:

testing/taskcluster/tasks/builds/dbg_macosx64_clobber.yml

0 → 100644
+22 −0
Original line number Diff line number Diff line 
$inherits:

  from: 'tasks/builds/opt_macosx64_clobber.yml'

  variables:

    build_name: 'macosx64'

    build_type: 'dbg'

task:

  metadata:

      name: '[TC] MacOSX64 Dbg'

      description: 'MacOSX64 Dbg'



  workerType: dbg-macosx64



  payload:

    env:

      MH_CUSTOM_BUILD_VARIANT_CFG: 'cross-debug'

  extra:

    treeherder:

      groupSymbol: tc

      groupName: Submitted by taskcluster

      symbol: B

      collection:

        debug: true

testing/taskcluster/tasks/builds/opt_macosx64.yml

+3 −50
Original line number Diff line number Diff line 
$inherits:

  from: 'tasks/builds/firefox_base.yml'

  variables:

    build_name: 'macosx64'

    build_type: 'opt'

  from: 'tasks/builds/opt_macosx64_clobber.yml'

task:

  metadata:

      name: '[TC] MacOSX64 Opt'

      description: 'MacOSX64 Opt'



  workerType: opt-macosx64



  routes:

    - 'index.buildbot.branches.{{project}}.macosx64'

    - 'index.buildbot.revisions.{{head_rev}}.{{project}}.macosx64'



  # same as clobber, but with a cached workspace

  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_64_cross_builds.py balrog/production.py'

      MH_BRANCH: {{project}}

      MH_BUILD_POOL: taskcluster

      # image paths

      TOOLTOOL_CACHE: '/home/worker/tooltool-cache'



    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: 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.dmg'

      tests: 'public/build/target.tests.zip'
 
      build-macosx64-workspace: '/home/worker/workspace'