bug 1156816 - Fix scopes for aws-provisioner. Switch nightly builds to production balrog. r=garndt
authorAus Lacroix <aus@mozilla.com>
Thu, 07 May 2015 16:02:29 -0700
changeset 260148 d8d74976aa497c1d9a8151efd873c8d123671b5b
parent 260147 fd962b9ed5705fdaf618a3f4a24d02580548c771
child 260149 0d7cdc093008b262d4560c9338e6fa69d270f81c
push id4830
push userjlund@mozilla.com
push dateMon, 29 Jun 2015 20:18:48 +0000
treeherdermozilla-esr52@4c2175bb0420 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgarndt
bugs1156816
milestone40.0a1
bug 1156816 - Fix scopes for aws-provisioner. Switch nightly builds to production balrog. r=garndt
testing/taskcluster/mach_commands.py
testing/taskcluster/scripts/phone-builder/build-lightsaber-nightly.sh
testing/taskcluster/scripts/phone-builder/build-phone-nightly.sh
testing/taskcluster/tasks/builds/b2g_aries_lightsaber_nightly_base.yml
testing/taskcluster/tasks/builds/b2g_flame_kk_nightly.yml
--- a/testing/taskcluster/mach_commands.py
+++ b/testing/taskcluster/mach_commands.py
@@ -30,17 +30,17 @@ ROOT = os.path.dirname(os.path.realpath(
 GECKO = os.path.realpath(os.path.join(ROOT, '..', '..'))
 DOCKER_ROOT = os.path.join(ROOT, '..', 'docker')
 MOZHARNESS_CONFIG = os.path.join(GECKO, 'testing', 'mozharness', 'mozharness.json')
 
 # XXX: If/when we have the taskcluster queue use construct url instead
 ARTIFACT_URL = 'https://queue.taskcluster.net/v1/task/{}/artifacts/{}'
 REGISTRY = open(os.path.join(DOCKER_ROOT, 'REGISTRY')).read().strip()
 
-DEFINE_TASK = 'queue:define-task:aws-provisioner/{}'
+DEFINE_TASK = 'queue:define-task:aws-provisioner-v1/{}'
 
 TREEHERDER_ROUTE_PREFIX = 'tc-treeherder-stage'
 TREEHERDER_ROUTES = {
     'staging': 'tc-treeherder-stage',
     'production': 'tc-treeherder'
 }
 
 DEFAULT_TRY = 'try: -b do -p all -u all'
--- a/testing/taskcluster/scripts/phone-builder/build-lightsaber-nightly.sh
+++ b/testing/taskcluster/scripts/phone-builder/build-lightsaber-nightly.sh
@@ -21,17 +21,17 @@ mar_file=b2g-${TARGET%%-*}-gecko-update.
 if [ $VARIANT == "user" ]; then
   PLATFORM=$TARGET
 else
   PLATFORM=$TARGET-$VARIANT
 fi
 
 ./mozharness/scripts/b2g_lightsaber.py \
   --config b2g/taskcluster-lightsaber-nightly.py \
-  --config balrog/staging.py \
+  --config balrog/docker-worker.py \
   "$debug_flag" \
   --disable-mock \
   --variant=$VARIANT \
   --work-dir=$WORKSPACE/B2G \
   --gaia-languages-file locales/languages_all.json \
   --log-level=debug \
   --target=$TARGET \
   --b2g-config-dir=$TARGET \
--- a/testing/taskcluster/scripts/phone-builder/build-phone-nightly.sh
+++ b/testing/taskcluster/scripts/phone-builder/build-phone-nightly.sh
@@ -9,17 +9,17 @@ fi
 if [ ! -d $HOME/.ssh ]; then
     mkdir $HOME/.ssh
 fi
 
 aws s3 cp s3://b2g-nightly-credentials/balrog_credentials .
 
 ./mozharness/scripts/b2g_build.py \
   --config b2g/taskcluster-phone-nightly.py \
-  --config balrog/staging.py \
+  --config balrog/docker-worker.py \
   "$debug_flag" \
   --disable-mock \
   --variant=$VARIANT \
   --work-dir=$WORKSPACE/B2G \
   --gaia-languages-file locales/languages_all.json \
   --log-level=debug \
   --target=$TARGET \
   --b2g-config-dir=$TARGET \
--- a/testing/taskcluster/tasks/builds/b2g_aries_lightsaber_nightly_base.yml
+++ b/testing/taskcluster/tasks/builds/b2g_aries_lightsaber_nightly_base.yml
@@ -1,14 +1,18 @@
 $inherits:
   from: 'tasks/builds/b2g_phone_base.yml'
 task:
-  workerType: flame-kk
+  workerType: balrog
+  scopes:
+    - 'docker-worker:feature:balrogVPNProxy'
 
   payload:
+    features:
+      balrogVPNProxy: true
     env:
       TARGET: 'aries'
       DEBUG: 0
     command:
       - >
         checkout-gecko workspace &&
         cd ./workspace/gecko/testing/taskcluster/scripts/phone-builder &&
         buildbot_step 'Build' ./build-lightsaber-nightly.sh $HOME/workspace
--- a/testing/taskcluster/tasks/builds/b2g_flame_kk_nightly.yml
+++ b/testing/taskcluster/tasks/builds/b2g_flame_kk_nightly.yml
@@ -1,21 +1,24 @@
 $inherits:
   from: 'tasks/builds/b2g_phone_base.yml'
   variables:
     build_name: 'flame-kk-nightly'
     build_type: 'opt'
 task:
-  workerType: flame-kk
+  workerType: balrog
   scopes:
     - 'docker-worker:cache:build-flame-kk-nightly'
+    - 'docker-worker:feature:balrogVPNProxy'
   metadata:
     name: '[TC] B2G Flame KK Nightly'
 
   payload:
+    features:
+      balrogVPNProxy: true
     cache:
       build-flame-kk-nightly: /home/worker/object-folder
     env:
       TARGET: 'flame-kk'
       DEBUG: 0
     command:
       - >
         checkout-gecko workspace &&