Merge m-c to fx-team a=merge CLOSED TREE

2024-10-29 21:25:35 +00:00 · 2015-04-29 13:10:20 -07:00 · 2015-04-29 13:10:20 -07:00 · e82e7e797d
commit e82e7e797d
parent ad496cd32d 084492738a
20 changed files with 7 additions and 20 deletions
--- a/testing/taskcluster/tasks/build.yml
+++ b/testing/taskcluster/tasks/build.yml
@ -14,7 +14,7 @@ task:
    createdForUser: {{owner}}

  workerType: b2gbuild
-  provisionerId: aws-provisioner
+  provisionerId: aws-provisioner-v1
  schedulerId: task-graph-scheduler

  routes:
--- a/testing/taskcluster/tasks/builds/b2g_emulator_ics_debug.yml
+++ b/testing/taskcluster/tasks/builds/b2g_emulator_ics_debug.yml
@ -5,7 +5,6 @@ $inherits:
    build_type: 'debug'
 task:
  workerType: emulator-ics-debug
-  provisionerId: aws-provisioner-v1
  scopes:
    - 'docker-worker:cache:workspace-emulator-ics-debug'
  metadata:
--- a/testing/taskcluster/tasks/builds/b2g_emulator_ics_opt.yml
+++ b/testing/taskcluster/tasks/builds/b2g_emulator_ics_opt.yml
@ -5,7 +5,6 @@ $inherits:
    build_name: 'emulator-ics'
 task:
  workerType: emulator-ics
-  provisionerId: aws-provisioner-v1
  routes:
    - 'index.buildbot.branches.{{project}}.emulator-ics'
    - 'index.buildbot.revisions.{{head_rev}}.{{project}}.emulator-ics'
--- a/testing/taskcluster/tasks/builds/b2g_emulator_x86_kk_opt.yml
+++ b/testing/taskcluster/tasks/builds/b2g_emulator_x86_kk_opt.yml
@ -5,7 +5,6 @@ $inherits:
    build_type: 'opt'
 task:
  workerType: emualtor-x86-kk
-  provisionerId: aws-provisioner-v1
  scopes:
    - 'docker-worker:cache:workspace-emulator-kk-x86-opt'
  metadata:
--- a/testing/taskcluster/tasks/decision/branch.yml
+++ b/testing/taskcluster/tasks/decision/branch.yml
@ -32,7 +32,7 @@ tasks:
        createdForUser: {{owner}}

      workerType: "gecko-decision"
-      provisionerId: "aws-provisioner"
+      provisionerId: "aws-provisioner-v1"

      scopes:
        - "docker-worker:cache:tc-vcs-public-sources"
--- a/testing/taskcluster/tasks/decision/periodic_alder.yml
+++ b/testing/taskcluster/tasks/decision/periodic_alder.yml
@ -10,7 +10,7 @@ task:
      Decision task for testing purposes for alder.

  workerType: gecko-decision
-  provisionerId: aws-provisioner
+  provisionerId: aws-provisioner-v1

  scopes:
    - 'docker-worker:cache:tc-vcs-public-sources'
--- a/testing/taskcluster/tasks/decision/try.yml
+++ b/testing/taskcluster/tasks/decision/try.yml
@ -28,7 +28,7 @@ tasks:
          get built.

      workerType: "gecko-decision"
-      provisionerId: "aws-provisioner"
+      provisionerId: "aws-provisioner-v1"

      tags:
        createdForUser: {{owner}}
--- a/testing/taskcluster/tasks/phone_build.yml
+++ b/testing/taskcluster/tasks/phone_build.yml
@ -14,7 +14,7 @@ task:
    createdForUser: {{owner}}

  workerType: b2gbuild
-  provisionerId: aws-provisioner
+  provisionerId: aws-provisioner-v1
  schedulerId: task-graph-scheduler

  routes:
--- a/testing/taskcluster/tasks/phone_test.yml
+++ b/testing/taskcluster/tasks/phone_test.yml
@ -8,7 +8,7 @@ task:
  tags:
    createdForUser: {{owner}}
  workerType: b2gtest
-  provisionerId: aws-provisioner
+  provisionerId: aws-provisioner-v1
  schedulerId: task-graph-scheduler

  scopes:
--- a/testing/taskcluster/tasks/test.yml
+++ b/testing/taskcluster/tasks/test.yml
@ -8,7 +8,7 @@ task:
  tags:
    createdForUser: {{owner}}
  workerType: b2gtest
-  provisionerId: aws-provisioner
+  provisionerId: aws-provisioner-v1
  schedulerId: task-graph-scheduler

  scopes:
--- a/testing/taskcluster/tasks/tests/b2g_emulator_cpp_unit.yml
+++ b/testing/taskcluster/tasks/tests/b2g_emulator_cpp_unit.yml
@ -7,7 +7,6 @@ task:
    description: CPP Unit Tests test run

  workerType: b2gtest-emulator
-  provisionerId: aws-provisioner-v1
  payload:
    command:
      - entrypoint
--- a/testing/taskcluster/tasks/tests/b2g_emulator_crashtest.yml
+++ b/testing/taskcluster/tasks/tests/b2g_emulator_crashtest.yml
@ -7,7 +7,6 @@ task:
    description: Crashtest test run {{chunk}}

  workerType: b2gtest-emulator
-  provisionerId: aws-provisioner-v1
  payload:
    maxRunTime: 3600
    command:
--- a/testing/taskcluster/tasks/tests/b2g_emulator_js_reftest.yml
+++ b/testing/taskcluster/tasks/tests/b2g_emulator_js_reftest.yml
@ -7,7 +7,6 @@ task:
    description: JSReftest test run {{chunk}}

  workerType: b2gtest-emulator
-  provisionerId: aws-provisioner-v1
  payload:
    command:
      - entrypoint
--- a/testing/taskcluster/tasks/tests/b2g_emulator_marionette.yml
+++ b/testing/taskcluster/tasks/tests/b2g_emulator_marionette.yml
@ -7,7 +7,6 @@ task:
    description: Marionette Framework Unit Tests test run

  workerType: b2gtest-emulator
-  provisionerId: aws-provisioner-v1
  payload:
    command:
      - entrypoint
--- a/testing/taskcluster/tasks/tests/b2g_emulator_marionette_webapi.yml
+++ b/testing/taskcluster/tasks/tests/b2g_emulator_marionette_webapi.yml
@ -7,7 +7,6 @@ task:
    description: Marionette WebAPI test run

  workerType: b2gtest-emulator
-  provisionerId: aws-provisioner-v1
  payload:
    command:
      - entrypoint
--- a/testing/taskcluster/tasks/tests/b2g_emulator_mochitest.yml
+++ b/testing/taskcluster/tasks/tests/b2g_emulator_mochitest.yml
@ -7,7 +7,6 @@ task:
    description: Mochitest test run {{chunk}}

  workerType: b2gtest-emulator
-  provisionerId: aws-provisioner-v1
  payload:
    maxRunTime: 7200
    command:
--- a/testing/taskcluster/tasks/tests/b2g_emulator_mochitest_media.yml
+++ b/testing/taskcluster/tasks/tests/b2g_emulator_mochitest_media.yml
@ -7,7 +7,6 @@ task:
    description: Mochitest Media test run

  workerType: b2gtest-emulator
-  provisionerId: aws-provisioner-v1
  payload:
    command:
      - entrypoint
--- a/testing/taskcluster/tasks/tests/b2g_emulator_reftest.yml
+++ b/testing/taskcluster/tasks/tests/b2g_emulator_reftest.yml
@ -7,7 +7,6 @@ task:
    description: Reftest test run {{chunk}}

  workerType: b2gtest-emulator
-  provisionerId: aws-provisioner-v1
  payload:
    command:
      - entrypoint
--- a/testing/taskcluster/tasks/tests/b2g_emulator_xpcshell.yml
+++ b/testing/taskcluster/tasks/tests/b2g_emulator_xpcshell.yml
@ -7,7 +7,6 @@ task:
    description: XPCShell test run

  workerType: b2gtest-emulator
-  provisionerId: aws-provisioner-v1
  payload:
    maxRunTime: 6000
    command:
--- a/testing/taskcluster/tasks/tests/b2g_emulator_xpcshell_chunked.yml
+++ b/testing/taskcluster/tasks/tests/b2g_emulator_xpcshell_chunked.yml
@ -7,7 +7,6 @@ task:
    description: XPCShell test run {{chunk}}

  workerType: b2gtest-emulator
-  provisionerId: aws-provisioner-v1
  payload:
    maxRunTime: 6000
    command: