Backed out changeset 656d4714e803 (bug 1324922) for breaking fennec nightlys
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Wed, 10 May 2017 14:05:46 +0200
changeset 391623 f8d40e7fe132b7c73a8f610484b790e6063006e3
parent 391576 120d8562d4a53e4f78bd86c6f5076f6db265e5a3
child 391680 8ad5338081026c48029d72f1e6c1668a58489bec
push id53
push userfmarier@mozilla.com
push dateMon, 15 May 2017 17:28:28 +0000
bugs1324922
milestone55.0a1
backs out656d4714e8031d95fdf4d57b997215c1ced3364f
Backed out changeset 656d4714e803 (bug 1324922) for breaking fennec nightlys
taskcluster/ci/build/android.yml
testing/mozharness/configs/builds/releng_base_linux_32_builds.py
testing/mozharness/configs/builds/releng_base_linux_64_builds.py
testing/mozharness/configs/builds/releng_base_mac_64_builds.py
testing/mozharness/configs/builds/releng_base_mac_64_cross_builds.py
testing/mozharness/configs/builds/releng_base_windows_32_builds.py
testing/mozharness/configs/builds/releng_base_windows_64_builds.py
testing/mozharness/mozharness/mozilla/building/buildbase.py
testing/mozharness/scripts/fx_desktop_build.py
--- a/taskcluster/ci/build/android.yml
+++ b/taskcluster/ci/build/android.yml
@@ -83,17 +83,17 @@ android-api-15/opt:
         platform: android-4-0-armv7-api15/opt
         symbol: tc(B)
     worker-type: aws-provisioner-v1/gecko-{level}-b-android
     worker:
         implementation: docker-worker
         max-run-time: 7200
     run:
         using: mozharness
-        actions: [get-secrets build generate-build-stats multi-l10n generate-balrog-properties update]
+        actions: [get-secrets build generate-build-stats multi-l10n update]
         config:
             - builds/releng_base_android_64_builds.py
             - disable_signing.py
             - platform_supports_post_upload_to_latest.py
         script: "mozharness/scripts/fx_desktop_build.py"
         secrets: true
         custom-build-variant-cfg: api-15
         tooltool-downloads: internal
--- a/testing/mozharness/configs/builds/releng_base_linux_32_builds.py
+++ b/testing/mozharness/configs/builds/releng_base_linux_32_builds.py
@@ -14,18 +14,17 @@ config = {
         'clone-tools',
         'checkout-sources',
         'setup-mock',
         'build',
         'generate-build-stats',
         'upload-files',
         'sendchange',
         'check-test',
-        'generate-balrog-properties',
-        # 'update',  # decided by query_is_nightly()
+        'update',  # decided by query_is_nightly()
     ],
     "buildbot_json_path": "buildprops.json",
     'exes': {
         "buildbot": "/tools/buildbot/bin/buildbot",
     },
     'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
     # decides whether we want to use moz_sign_cmd in env
     'enable_signing': True,
--- a/testing/mozharness/configs/builds/releng_base_linux_64_builds.py
+++ b/testing/mozharness/configs/builds/releng_base_linux_64_builds.py
@@ -13,18 +13,17 @@ config = {
         'clone-tools',
         'checkout-sources',
         'setup-mock',
         'build',
         'generate-build-stats',
         'upload-files',
         'sendchange',
         'check-test',
-        'generate-balrog-properties',
-        # 'update',  # decided by query_is_nightly()
+        'update',  # decided by query_is_nightly()
     ],
     "buildbot_json_path": "buildprops.json",
     'exes': {
         "buildbot": "/tools/buildbot/bin/buildbot",
     },
     'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
     # decides whether we want to use moz_sign_cmd in env
     'enable_signing': True,
--- a/testing/mozharness/configs/builds/releng_base_mac_64_builds.py
+++ b/testing/mozharness/configs/builds/releng_base_mac_64_builds.py
@@ -10,18 +10,17 @@ config = {
         'clone-tools',
         # 'setup-mock',
         'checkout-sources',
         'build',
         'generate-build-stats',
         'upload-files',
         'sendchange',
         'check-test',
-        'generate-balrog-properties',
-        # 'update',  # decided by query_is_nightly()
+        'update',  # decided by query_is_nightly()
     ],
     "buildbot_json_path": "buildprops.json",
     'exes': {
         'python2.7': sys.executable,
         "buildbot": "/tools/buildbot/bin/buildbot",
     },
     'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
     # decides whether we want to use moz_sign_cmd in env
--- a/testing/mozharness/configs/builds/releng_base_mac_64_cross_builds.py
+++ b/testing/mozharness/configs/builds/releng_base_mac_64_cross_builds.py
@@ -7,18 +7,17 @@ config = {
 
     # note: overridden by MOZHARNESS_ACTIONS in TaskCluster tasks
     'default_actions': [
         'clobber',
         'clone-tools',
         'checkout-sources',
         'build',
         'generate-build-stats',
-        'generate-balrog-properties',
-        # 'update',  # decided by query_is_nightly()
+        'update',  # decided by query_is_nightly()
     ],
     "buildbot_json_path": "buildprops.json",
     'exes': {
         'python2.7': sys.executable,
         "buildbot": "/tools/buildbot/bin/buildbot",
     },
     'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
     # decides whether we want to use moz_sign_cmd in env
--- a/testing/mozharness/configs/builds/releng_base_windows_32_builds.py
+++ b/testing/mozharness/configs/builds/releng_base_windows_32_builds.py
@@ -14,18 +14,17 @@ config = {
         'clone-tools',
         'checkout-sources',
         # 'setup-mock', windows do not use mock
         'build',
         'generate-build-stats',
         'upload-files',
         'sendchange',
         'check-test',
-        'generate-balrog-properties',
-        # 'update',  # decided by query_is_nightly()
+        'update',  # decided by query_is_nightly()
     ],
     "buildbot_json_path": "buildprops.json",
     'exes': {
         'python2.7': sys.executable,
         "buildbot": [
             sys.executable,
             'c:\\mozilla-build\\buildbotve\\scripts\\buildbot'
         ],
--- a/testing/mozharness/configs/builds/releng_base_windows_64_builds.py
+++ b/testing/mozharness/configs/builds/releng_base_windows_64_builds.py
@@ -14,18 +14,17 @@ config = {
         'clone-tools',
         'checkout-sources',
         # 'setup-mock', windows do not use mock
         'build',
         'generate-build-stats',
         'upload-files',
         'sendchange',
         'check-test',
-        'generate-balrog-properties',
-        # 'update',  # decided by query_is_nightly()
+        'update',  # decided by query_is_nightly()
     ],
     "buildbot_json_path": "buildprops.json",
     'exes': {
         'python2.7': sys.executable,
         "buildbot": [
             sys.executable,
             'c:\\mozilla-build\\buildbotve\\scripts\\buildbot'
         ],
--- a/testing/mozharness/mozharness/mozilla/building/buildbase.py
+++ b/testing/mozharness/mozharness/mozilla/building/buildbase.py
@@ -2148,47 +2148,37 @@ or run without that action (ie: --no-{ac
 
             self.invoke_sendchange(downloadables=downloadables,
                                    branch=unittest_branch,
                                    sendchange_props=sendchange_props)
         else:
             self.fatal('type: "%s" is unknown for sendchange type. valid '
                        'strings are "unittest" or "talos"' % test_type)
 
-    def generate_balrog_properties(self):
-        """Generate and upload balrog properties file, if appropriate.
-
-        Wrapper around generate_balrog_props
-        """
-        # generate balrog props as artifacts
-        if not self.config.get('taskcluster_nightly'):
-            return
-
-        # grab any props available from this or previous unclobbered runs
-        self.generate_build_props(console_output=False,
-                                  halt_on_failure=False)
-
-        env = self.query_mach_build_env(multiLocale=False)
-        props_path = os.path.join(env["UPLOAD_PATH"],
-                                  'balrog_props.json')
-        self.generate_balrog_props(props_path)
-
     def update(self):
         """ submit balrog update steps. """
         if self.config.get('forced_artifact_build'):
             self.info('Skipping due to forced artifact build.')
             return
         if not self.query_is_nightly():
             self.info("Not a nightly build, skipping balrog submission.")
             return
 
         # grab any props available from this or previous unclobbered runs
         self.generate_build_props(console_output=False,
                                   halt_on_failure=False)
 
+        # generate balrog props as artifacts
+        if self.config.get('taskcluster_nightly'):
+            env = self.query_mach_build_env(multiLocale=False)
+            props_path = os.path.join(env["UPLOAD_PATH"],
+                    'balrog_props.json')
+            self.generate_balrog_props(props_path)
+            return
+
         if self.config.get('skip_balrog_uploads'):
             self.info("Funsize will submit to balrog, skipping submission here.")
             return
 
         if not self.config.get("balrog_servers"):
             self.fatal("balrog_servers not set; skipping balrog submission.")
             return
 
--- a/testing/mozharness/scripts/fx_desktop_build.py
+++ b/testing/mozharness/scripts/fx_desktop_build.py
@@ -42,17 +42,16 @@ class FxDesktopBuild(BuildScript, TryToo
                 'generate-build-stats',
                 'upload-files',  # upload from BB to TC
                 'sendchange',
                 'check-test',
                 'valgrind-test',
                 'package-source',
                 'generate-source-signing-manifest',
                 'multi-l10n',
-                'generate-balrog-properties',
                 'update',
             ],
             'require_config_file': True,
             # Default configuration
             'config': {
                 'is_automation': True,
                 "pgo_build": False,
                 "debug_build": False,