Bug 1237681: build desktop-build and desktop-test on demand; r=wcosta

Note that this does not build their predecessors (ubuntu1204-test-upd and
centos6-build-upd) -- those still come from docker hub.

testing/docker/centos6-build-upd/VERSION

@@ -1 +1 @@
-20151201141000
+0.1.3.20160122142300

testing/docker/desktop-build/Dockerfile

@@ -1,4 +1,4 @@
-FROM          taskcluster/centos6-build-upd:20151201141000
+FROM          taskcluster/centos6-build-upd:0.1.3.20160122142300
 MAINTAINER    Dustin J. Mitchell <dustin@mozilla.com>
 
 # Add build scripts; these are the entry points from the taskcluster worker, and

testing/taskcluster/tasks/builds/android_api_11.yml

@@ -21,7 +21,6 @@ task:
     - 'docker-worker:relengapi-proxy:tooltool.download.public'
 
   payload:
-    image: '{{#docker_image}}desktop-build{{/docker_image}}'
     cache:
       level-{{level}}-{{project}}-build-android-api-11-workspace: '/home/worker/workspace'
       tooltool-cache: '/home/worker/tooltool-cache'

testing/taskcluster/tasks/builds/android_api_11_b2gdroid.yml

@@ -21,7 +21,6 @@ task:
     - 'docker-worker:relengapi-proxy:tooltool.download.public'
 
   payload:
-    image: '{{#docker_image}}desktop-build{{/docker_image}}'
     cache:
       level-{{level}}-{{project}}-build-android-api-11-workspace: '/home/worker/workspace'
       tooltool-cache: '/home/worker/tooltool-cache'

testing/taskcluster/tasks/builds/android_api_11_partner_sample1.yml

@@ -21,7 +21,6 @@ task:
     - 'docker-worker:relengapi-proxy:tooltool.download.public'
 
   payload:
-    image: '{{#docker_image}}desktop-build{{/docker_image}}'
     cache:
       level-{{level}}-{{project}}-build-android-api-11-workspace: '/home/worker/workspace'
       tooltool-cache: '/home/worker/tooltool-cache'

testing/taskcluster/tasks/builds/firefox_base.yml

@@ -7,3 +7,8 @@ task:
     locations:
       mozharness: 'public/build/mozharness.zip'
       test_packages: 'public/build/test_packages.json'
+  payload:
+    image:
+      type: 'task-image'
+      path: 'public/image.tar'
+      taskId: '{{#task_id_for_image}}desktop-build{{/task_id_for_image}}'

testing/taskcluster/tasks/builds/linux32_clobber.yml

@@ -14,7 +14,6 @@ task:
     - 'docker-worker:relengapi-proxy:tooltool.download.public'
 
   payload:
-    image: '{{#docker_image}}desktop-build{{/docker_image}}'
     cache:
       # "clobber" means no workspace cache; non-clobber subclasses should add that
       tooltool-cache: '/home/worker/tooltool-cache'

testing/taskcluster/tasks/builds/linux64_clobber.yml

@@ -10,7 +10,6 @@ task:
     - 'docker-worker:relengapi-proxy:tooltool.download.public'
 
   payload:
-    image: '{{#docker_image}}desktop-build{{/docker_image}}'
     cache:
       # "clobber" means no workspace cache; non-clobber subclasses should add that
       tooltool-cache: '/home/worker/tooltool-cache'

testing/taskcluster/tasks/builds/mobile_base.yml

@@ -2,3 +2,10 @@ $inherits:
   from: 'tasks/build.yml'
   variables:
     build_product: 'mobile'
+task:
+  payload:
+    image:
+      type: 'task-image'
+      path: 'public/image.tar'
+      taskId: '{{#task_id_for_image}}desktop-build{{/task_id_for_image}}'
+

testing/taskcluster/tasks/builds/opt_macosx64_clobber.yml

@@ -16,7 +16,6 @@ task:
     - 'docker-worker:relengapi-proxy:tooltool.download.public'
 
   payload:
-    image: '{{#docker_image}}desktop-build{{/docker_image}}'
     cache:
       tooltool-cache: '/home/worker/tooltool-cache'
 

testing/taskcluster/tasks/builds/sm_base.yml

@@ -11,7 +11,6 @@ task:
     - 'docker-worker:cache:level-{{level}}-{{project}}-build-spidermonkey-workspace'
 
   payload:
-    image: '{{#docker_image}}desktop-build{{/docker_image}}'
     cache:
       level-{{level}}-{{project}}-build-spidermonkey-workspace: '/home/worker/workspace'
 

testing/taskcluster/tasks/tests/fx_test_base.yml

@@ -4,7 +4,10 @@ $inherits:
 task:
   workerType: desktop-test
   payload:
-    image: '{{#docker_image}}desktop-test{{/docker_image}}'
+    image:
+      type: 'task-image'
+      path: 'public/image.tar'
+      taskId: '{{#task_id_for_image}}desktop-test{{/task_id_for_image}}'
     env:
         NEED_WINDOW_MANAGER: true
         NEED_PULSEAUDIO: true