Backed out changeset 88735739af7a (bug 1244893) for causing failing Initial decision task for mozilla-central

testing/mozharness/configs/b2g/releng-fota-updates.py

@@ -14,7 +14,7 @@ config = {
         # bug 1222227 - temporarily disable for S3 migration
         # 'make-socorro-json',
         # 'upload-source-manifest',
-        # 'submit-to-balrog',
+        'submit-to-balrog',
     ],
     "upload": {
         "default": {

testing/mozharness/configs/b2g/taskcluster-spark-ota-balrog.py

@@ -8,7 +8,7 @@ config = {
         'build-symbols',
         'make-updates',
         'prep-upload',
-        #'submit-to-balrog'
+        'submit-to-balrog'
     ],
     "balrog_credentials_file": "balrog_credentials",
     "nightly_build": True,

testing/mozharness/configs/b2g/taskcluster-spark-ota.py

@@ -9,6 +9,7 @@ config = {
         'make-updates',
         'prep-upload'
     ],
+    "balrog_credentials_file": "balrog_credentials",
     "nightly_build": True,
     "env": {
         "GAIA_OPTIMIZE": "1",

testing/taskcluster/scripts/phone-builder/build-phone-ota.sh

@@ -10,6 +10,8 @@ fi
 
 PLATFORM=${TARGET%%-*}
 
+aws s3 cp s3://b2g-nightly-credentials/balrog_credentials .
+
 # We need different platform names for each variant (user, userdebug and
 # eng). We do not append variant suffix for "user" to keep compability with
 # verions already installed in the phones.
@@ -18,12 +20,14 @@ if [ 0$DOGFOOD -ne 1 -a $VARIANT != "user" ]; then
 fi
 
 MOZHARNESS_CONFIG=${MOZHARNESS_CONFIG:=b2g/taskcluster-phone-ota.py}
+BALROG_SERVER_CONFIG=${BALROG_SERVER_CONFIG:=balrog/docker-worker.py}
 
 rm -rf $WORKSPACE/B2G/upload-public/
 rm -rf $WORKSPACE/B2G/upload/
 
 $WORKSPACE/gecko/testing/mozharness/scripts/b2g_build.py \
   --config $MOZHARNESS_CONFIG \
+  --config $BALROG_SERVER_CONFIG \
   "$debug_flag" \
   --disable-mock \
   --variant=$VARIANT \

testing/taskcluster/tasks/builds/b2g_aries_spark_ota_balrog_debug.yml

@@ -2,8 +2,10 @@ $inherits:
   from: 'tasks/builds/b2g_aries_spark_ota_debug.yml'
 task:
   scopes:
+    - 'docker-worker:feature:balrogVPNProxy'
   payload:
     features:
+      balrogVPNProxy: true
     env:
       MOZHARNESS_CONFIG: b2g/taskcluster-spark-ota-balrog.py
 

testing/taskcluster/tasks/builds/b2g_aries_spark_ota_balrog_opt.yml

@@ -2,7 +2,9 @@ $inherits:
   from: 'tasks/builds/b2g_aries_spark_ota_opt.yml'
 task:
   scopes:
+    - 'docker-worker:feature:balrogVPNProxy'
   payload:
     features:
+      balrogVPNProxy: true
     env:
       MOZHARNESS_CONFIG: b2g/taskcluster-spark-ota-balrog.py

testing/taskcluster/tasks/builds/b2g_aries_spark_ota_base.yml

@@ -1,7 +1,7 @@
 $inherits:
   from: 'tasks/builds/b2g_phone_base.yml'
 task:
-  workerType: flame-kk
+  workerType: balrog
 
   payload:
     env:

testing/taskcluster/tasks/builds/b2g_flame_kk_ota_base.yml

@@ -1,7 +1,7 @@
 $inherits:
   from: 'tasks/builds/b2g_phone_base.yml'
 task:
-  workerType: flame-kk
+  workerType: balrog
   payload:
     env:
       TARGET: 'flame-kk'

testing/taskcluster/tasks/builds/b2g_nexus_4_kk_ota_debug.yml

@@ -4,15 +4,17 @@ $inherits:
     build_name: 'nexus-4-kk-ota'
     build_type: 'debug'
 task:
-  workerType: flame-kk
+  workerType: balrog
   metadata:
     name: '[TC] B2G Nexus 4 KK OTA (userdebug)'
   scopes:
     - 'docker-worker:cache:level-{{level}}-{{project}}-build-nexus-4-kk-ota-debug'
     - 'docker-worker:cache:level-{{level}}-{{project}}-build-nexus-4-kk-ota-debug-objdir-gecko'
+    - 'docker-worker:feature:balrogVPNProxy'
 
   payload:
     features:
+      balrogVPNProxy: true
     cache:
       level-{{level}}-{{project}}-build-nexus-4-kk-ota-debug: /home/worker/workspace
       level-{{level}}-{{project}}-build-nexus-4-kk-ota-debug-objdir-gecko: /home/worker/objdir-gecko

testing/taskcluster/tasks/builds/b2g_nexus_5l_ota_debug.yml

@@ -4,15 +4,17 @@ $inherits:
     build_name: 'nexus-5-l-ota'
     build_type: 'debug'
 task:
-  workerType: flame-kk
+  workerType: balrog
   metadata:
     name: '[TC] B2G Nexus 5L OTA (userdebug)'
   scopes:
     - 'docker-worker:cache:level-{{level}}-{{project}}-build-nexus-5l-ota-debug'
     - 'docker-worker:cache:level-{{level}}-{{project}}-build-nexus-5l-ota-debug-objdir-gecko'
+    - 'docker-worker:feature:balrogVPNProxy'
 
   payload:
     features:
+      balrogVPNProxy: true
     cache:
       level-{{level}}-{{project}}-build-nexus-5l-ota-debug: /home/worker/workspace
       level-{{level}}-{{project}}-build-nexus-5l-ota-debug-objdir-gecko: /home/worker/objdir-gecko