Bug 1244893 - disable Disable F/OTA updates to balrog. r=wcosta
authornhirata <nhirata.bugzilla@gmail.com>
Thu, 18 Feb 2016 15:12:00 +0100
changeset 322788 a3837ca1b1c992f64abdcd79730cfb8ef8005d31
parent 322787 ee9285c872a549e4fce255c28df6e3438a858d09
child 322789 52f996dacd8cc8c0465d52b30d3c67f7d667c73b
push id5913
push userjlund@mozilla.com
push dateMon, 25 Apr 2016 16:57:49 +0000
treeherdermozilla-beta@dcaf0a6fa115 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerswcosta
bugs1244893
milestone47.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 1244893 - disable Disable F/OTA updates to balrog. r=wcosta
testing/mozharness/configs/b2g/releng-fota-updates.py
testing/mozharness/configs/b2g/taskcluster-spark-ota-balrog.py
testing/mozharness/configs/b2g/taskcluster-spark-ota.py
testing/taskcluster/scripts/phone-builder/build-phone-ota.sh
testing/taskcluster/tasks/builds/b2g_aries_spark_ota_balrog_debug.yml
testing/taskcluster/tasks/builds/b2g_aries_spark_ota_balrog_opt.yml
testing/taskcluster/tasks/builds/b2g_aries_spark_ota_base.yml
testing/taskcluster/tasks/builds/b2g_flame_kk_ota_base.yml
testing/taskcluster/tasks/builds/b2g_nexus_4_kk_ota_debug.yml
testing/taskcluster/tasks/builds/b2g_nexus_5l_ota_debug.yml
--- a/testing/mozharness/configs/b2g/releng-fota-updates.py
+++ b/testing/mozharness/configs/b2g/releng-fota-updates.py
@@ -9,17 +9,17 @@ config = {
         'build',
         'build-symbols',
         'make-updates',
         'prep-upload',
         'upload',
         # bug 1222227 - temporarily disable for S3 migration
         # 'make-socorro-json',
         # 'upload-source-manifest',
-        'submit-to-balrog',
+        # 'submit-to-balrog',
     ],
     "upload": {
         "default": {
             "ssh_key": os.path.expanduser("~/.ssh/b2gbld_dsa"),
             "ssh_user": "b2gbld",
             "upload_remote_host": "pvtbuilds.pvt.build.mozilla.org",
             "upload_remote_path": "/pvt/mozilla.org/b2gotoro/tinderbox-builds/%(branch)s-%(target)s/%(buildid)s",
             "upload_remote_symlink": "/pvt/mozilla.org/b2gotoro/tinderbox-builds/%(branch)s-%(target)s/latest",
--- a/testing/mozharness/configs/b2g/taskcluster-spark-ota-balrog.py
+++ b/testing/mozharness/configs/b2g/taskcluster-spark-ota-balrog.py
@@ -3,17 +3,17 @@ import os.path
 config = {
     "default_vcs": "tc-vcs",
     "default_actions": [
         'checkout-sources',
         'build',
         'build-symbols',
         'make-updates',
         'prep-upload',
-        'submit-to-balrog'
+        #'submit-to-balrog'
     ],
     "balrog_credentials_file": "balrog_credentials",
     "nightly_build": True,
     "env": {
         "GAIA_OPTIMIZE": "1",
         "B2G_UPDATER": "1",
         "LIGHTSABER": "1",
         "BOWER_FLAGS": "--allow-root",
--- a/testing/mozharness/configs/b2g/taskcluster-spark-ota.py
+++ b/testing/mozharness/configs/b2g/taskcluster-spark-ota.py
@@ -4,17 +4,16 @@ config = {
     "default_vcs": "tc-vcs",
     "default_actions": [
         'checkout-sources',
         'build',
         'build-symbols',
         'make-updates',
         'prep-upload'
     ],
-    "balrog_credentials_file": "balrog_credentials",
     "nightly_build": True,
     "env": {
         "GAIA_OPTIMIZE": "1",
         "B2G_UPDATER": "1",
         "LIGHTSABER": "1",
         "BOWER_FLAGS": "--allow-root",
         "B2G_PATH": "%(work_dir)s",
         "GAIA_DISTRIBUTION_DIR": "%(work_dir)s/gaia/distros/spark",
--- a/testing/taskcluster/scripts/phone-builder/build-phone-ota.sh
+++ b/testing/taskcluster/scripts/phone-builder/build-phone-ota.sh
@@ -5,34 +5,30 @@
 if [ $TARGET == "aries" -o $TARGET == "shinano" ]; then
   # caching objects might be dangerous for some devices (aka aries)
   rm -rf $gecko_objdir
   rm -rf $WORKSPACE/B2G/out
 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.
 if [ 0$DOGFOOD -ne 1 -a $VARIANT != "user" ]; then
   PLATFORM=$PLATFORM-$VARIANT
 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 \
   --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_spark_ota_balrog_debug.yml
+++ b/testing/taskcluster/tasks/builds/b2g_aries_spark_ota_balrog_debug.yml
@@ -1,11 +1,6 @@
 $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
-
--- a/testing/taskcluster/tasks/builds/b2g_aries_spark_ota_balrog_opt.yml
+++ b/testing/taskcluster/tasks/builds/b2g_aries_spark_ota_balrog_opt.yml
@@ -1,10 +1,6 @@
 $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
--- a/testing/taskcluster/tasks/builds/b2g_aries_spark_ota_base.yml
+++ b/testing/taskcluster/tasks/builds/b2g_aries_spark_ota_base.yml
@@ -1,12 +1,12 @@
 $inherits:
   from: 'tasks/builds/b2g_phone_base.yml'
 task:
-  workerType: balrog
+  workerType: flame-kk
 
   payload:
     env:
       TARGET: 'aries'
       DEBUG: 0
       MOZHARNESS_CONFIG: b2g/taskcluster-spark-ota.py
       B2G_UPDATE_CHANNEL: '{{b2g_update_channel}}'
     command:
--- a/testing/taskcluster/tasks/builds/b2g_flame_kk_ota_base.yml
+++ b/testing/taskcluster/tasks/builds/b2g_flame_kk_ota_base.yml
@@ -1,12 +1,12 @@
 $inherits:
   from: 'tasks/builds/b2g_phone_base.yml'
 task:
-  workerType: balrog
+  workerType: flame-kk
   payload:
     env:
       TARGET: 'flame-kk'
       DEBUG: 0
     command:
       - >
         checkout-gecko workspace &&
         cd ./workspace/gecko/testing/taskcluster/scripts/phone-builder &&
--- a/testing/taskcluster/tasks/builds/b2g_nexus_4_kk_ota_debug.yml
+++ b/testing/taskcluster/tasks/builds/b2g_nexus_4_kk_ota_debug.yml
@@ -1,25 +1,23 @@
 $inherits:
   from: 'tasks/builds/b2g_phone_base.yml'
   variables:
     build_name: 'nexus-4-kk-ota'
     build_type: 'debug'
 task:
-  workerType: balrog
+  workerType: flame-kk
   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
     env:
       VARIANT: userdebug
       B2G_DEBUG: 0
       TARGET: 'nexus-4-kk'
       DEBUG: 0
--- a/testing/taskcluster/tasks/builds/b2g_nexus_5l_ota_debug.yml
+++ b/testing/taskcluster/tasks/builds/b2g_nexus_5l_ota_debug.yml
@@ -1,25 +1,23 @@
 $inherits:
   from: 'tasks/builds/b2g_phone_base.yml'
   variables:
     build_name: 'nexus-5-l-ota'
     build_type: 'debug'
 task:
-  workerType: balrog
+  workerType: flame-kk
   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
     env:
       VARIANT: userdebug
       B2G_DEBUG: 0
       TARGET: 'nexus-5-l'
       DEBUG: 0