Bug 1168612: disable signing and platform_supports_post_upload_to_latest via mozharness configuration files; r=mrrrgn
authorDustin J. Mitchell <dustin@mozilla.com>
Thu, 28 May 2015 17:59:17 -0400
changeset 247021 479de45e9179eb441d067e6054dc11b9b08641c2
parent 247020 8f7f87515ebb2a209027e89b8f2669954177426a
child 247022 d9707252997de48b577ba539c9027574c3bb37ba
push id28848
push userryanvm@gmail.com
push dateWed, 03 Jun 2015 20:00:13 +0000
treeherdermozilla-central@0920f2325a6d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmrrrgn
bugs1168612
milestone41.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 1168612: disable signing and platform_supports_post_upload_to_latest via mozharness configuration files; r=mrrrgn
testing/docker/desktop-build/bin/build.sh
testing/docker/desktop-build/configs/disable_sendchange.py
testing/docker/desktop-build/configs/disable_signing.py
testing/docker/desktop-build/configs/platform_supports_post_upload_to_latest.py
testing/taskcluster/tasks/builds/android_api_11.yml
--- a/testing/docker/desktop-build/bin/build.sh
+++ b/testing/docker/desktop-build/bin/build.sh
@@ -40,19 +40,16 @@ set -x -e
 : RELENGAPI_TOKEN               ${RELENGAPI_TOKEN+HIDDEN}
 
 : NEED_XVFB                     ${NEED_XVFB:=false}
 
 : MH_CUSTOM_BUILD_VARIANT_CFG   ${MH_CUSTOM_BUILD_VARIANT_CFG}
 : MH_BRANCH                     ${MH_BRANCH:=mozilla-central}
 : MH_BUILD_POOL                 ${MH_BUILD_POOL:=staging}
 
-: MOZ_SIGNING_SERVERS           ${MOZ_SIGNING_SERVERS}
-: MOZ_SIGN_CMD                  ${MOZ_SIGN_CMD}
-
 : WORKSPACE                     ${WORKSPACE:=/home/worker/workspace}
 
 set -v
 
 # Don't run the upload step; this is passed through mozharness to mach.  Once
 # the mozharness scripts are not run in Buildbot anymore, this can be moved to
 # Mozharness (or the upload step removed from mach entirely)
 export MOZ_AUTOMATION_UPLOAD=0
rename from testing/docker/desktop-build/configs/disable_sendchange.py
rename to testing/docker/desktop-build/configs/disable_signing.py
--- a/testing/docker/desktop-build/configs/disable_sendchange.py
+++ b/testing/docker/desktop-build/configs/disable_signing.py
@@ -1,6 +1,3 @@
 config = {
-    'platform_supports_post_upload_to_latest': False,
     'enable_signing': False,
-    'enable_talos_sendchange': False,
-    'enable_unittest_sendchange': False,
 }
copy from testing/docker/desktop-build/configs/disable_sendchange.py
copy to testing/docker/desktop-build/configs/platform_supports_post_upload_to_latest.py
--- a/testing/docker/desktop-build/configs/disable_sendchange.py
+++ b/testing/docker/desktop-build/configs/platform_supports_post_upload_to_latest.py
@@ -1,6 +1,3 @@
 config = {
     'platform_supports_post_upload_to_latest': False,
-    'enable_signing': False,
-    'enable_talos_sendchange': False,
-    'enable_unittest_sendchange': False,
 }
--- a/testing/taskcluster/tasks/builds/android_api_11.yml
+++ b/testing/taskcluster/tasks/builds/android_api_11.yml
@@ -22,17 +22,21 @@ task:
     image: '{{#docker_image}}desktop-build{{/docker_image}}'
     cache:
       build-android-api-11-workspace: '/home/worker/workspace'
       tooltool-cache: '/home/worker/tooltool-cache'
 
     env:
       # inputs to mozharness
       MOZHARNESS_SCRIPT: 'mozharness/scripts/fx_desktop_build.py'
-      MOZHARNESS_CONFIG: builds/releng_base_android_64_builds.py
+      # TODO: make these additional configuration files go away
+      MOZHARNESS_CONFIG: >
+          builds/releng_base_android_64_builds.py
+          disable_signing.py
+          platform_supports_post_upload_to_latest.py
       MH_CUSTOM_BUILD_VARIANT_CFG: api-11
       MH_BRANCH: {{project}}
       MH_BUILD_POOL: taskcluster
 
       # image paths
       TOOLTOOL_CACHE: '/home/worker/tooltool-cache'
 
       # authentication