Bug 1234076 - upgrade tc-vcs to 2.3.17 r=wcosta
authorGregory Arndt <garndt@mozilla.com>
Mon, 14 Dec 2015 11:57:46 -0500
changeset 277851 4ad0371b1a072e4153972e4cc76dc773b1e001b9
parent 277850 5549ec8b85c2815c6288451653aa8d61ab56742d
child 277852 4852c0a7f5dac22cae4a61433181c728944e442e
push id69628
push usercbook@mozilla.com
push dateWed, 30 Dec 2015 11:16:09 +0000
treeherdermozilla-inbound@b493cf33851f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerswcosta
bugs1234076
milestone46.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 1234076 - upgrade tc-vcs to 2.3.17 r=wcosta
testing/docker/builder/Dockerfile
testing/docker/builder/REGISTRY
testing/docker/builder/VERSION
testing/taskcluster/tasks/build.yml
testing/taskcluster/tasks/builds/b2g_base.yml
testing/taskcluster/tasks/builds/b2g_desktop_base.yml
testing/taskcluster/tasks/post-builds/mulet_simulator.yml
--- a/testing/docker/builder/Dockerfile
+++ b/testing/docker/builder/Dockerfile
@@ -17,16 +17,16 @@ RUN hg clone http://hg.mozilla.org/build
       cd /tools/tools && \
       python setup.py install
 
 # Initialize git (makes repo happy)
 RUN git config --global user.email "mozilla@example.com" && \
     git config --global user.name "mozilla"
 
 # VCS Tools
-RUN npm install -g taskcluster-vcs@2.3.12
+RUN npm install -g taskcluster-vcs@2.3.17
 
 # TODO enable worker
 # TODO volume mount permissions will be an issue
 # USER worker
 
 COPY bin /home/worker/bin
 RUN chmod a+x /home/worker/bin/*
deleted file mode 100644
--- a/testing/docker/builder/REGISTRY
+++ /dev/null
@@ -1,2 +0,0 @@
-taskcluster
-
deleted file mode 100644
--- a/testing/docker/builder/VERSION
+++ /dev/null
@@ -1,1 +0,0 @@
-0.5.9
--- a/testing/taskcluster/tasks/build.yml
+++ b/testing/taskcluster/tasks/build.yml
@@ -21,18 +21,16 @@ task:
     - 'index.gecko.v1.{{project}}.revision.linux.{{head_rev}}.{{build_name}}.{{build_type}}'
     - 'index.gecko.v1.{{project}}.latest.linux.{{build_name}}.{{build_type}}'
   scopes:
     # Nearly all of our build tasks use tc-vcs so just include the scope across
     # the board.
     - 'docker-worker:cache:tc-vcs'
 
   payload:
-    image: '{{#docker_image}}builder{{/docker_image}}'
-
     # Two hours is long but covers edge cases (and matches bb based infra)
     maxRunTime: 7200
 
     cache:
       tc-vcs: '/home/worker/.tc-vcs'
 
     # All builds share a common artifact directory for ease of uploading.
     artifacts:
--- a/testing/taskcluster/tasks/builds/b2g_base.yml
+++ b/testing/taskcluster/tasks/builds/b2g_base.yml
@@ -1,9 +1,14 @@
 $inherits:
   from: 'tasks/build.yml'
   variables:
     build_product: 'b2g'
 task:
+  payload:
+    image:
+      type: 'task-image'
+      path: 'public/image.tar'
+      taskId: '{{#task_id_for_image}}builder{{/task_id_for_image}}'
   extra:
     locations:
       test_packages: 'public/build/test_packages.json'
       mozharness: 'public/build/mozharness.zip'
--- a/testing/taskcluster/tasks/builds/b2g_desktop_base.yml
+++ b/testing/taskcluster/tasks/builds/b2g_desktop_base.yml
@@ -6,21 +6,16 @@ task:
     description: B2G Desktop {{build_type}}
 
   workerType: b2gbuild-desktop
   payload:
     env:
       MOZCONFIG: 'b2g/config/mozconfigs/linux64_gecko/nightly'
       TOOLTOOL_MANIFEST: 'b2g/config/tooltool-manifests/linux64/releng.manifest'
 
-    image:
-      type: 'task-image'
-      path: 'public/image.tar'
-      taskId: '{{#task_id_for_image}}builder{{/task_id_for_image}}'
-
     command:
       - /bin/bash
       - -c
       - >
         checkout-gecko workspace &&
         cd ./workspace/gecko/testing/taskcluster/scripts/builder &&
         buildbot_step 'Build' ./build-b2g-desktop.sh $HOME/workspace
 
--- a/testing/taskcluster/tasks/post-builds/mulet_simulator.yml
+++ b/testing/taskcluster/tasks/post-builds/mulet_simulator.yml
@@ -19,17 +19,20 @@ task:
 
   routes:
     - 'index.gecko.v1.{{project}}.latest.simulator.{{build_type}}'
 
   scopes:
     - 'docker-worker:cache:tc-vcs'
 
   payload:
-    image: '{{#docker_image}}builder{{/docker_image}}'
+    image:
+      type: 'task-image'
+      path: 'public/image.tar'
+      taskId: '{{#task_id_for_image}}builder{{/task_id_for_image}}'
 
     maxRunTime: 600
 
     command:
       - /bin/bash
       - -exc
       - >
         tc-vcs checkout ./gecko {{base_repository}} {{head_repository}} {{head_rev}} {{head_ref}} &&