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 476732 7f3fae01f674017a57e2adf170559ba8a6f879fa
parent 476731 44293a5e78c31fae14157e4bd78ceb79ff63c0c1
child 476733 2c6b2020a456eb6656af39fcafced18727d2afc4
child 478654 91220226ad2054a9e578cb9921fb14fe93133c9c
child 478692 59a7055861e32cb954b5cbd457f0e24700dffbc4
push id71861
push userdmitchell@mozilla.com
push dateFri, 29 May 2015 17:06:05 +0000
treeherdertry@31719712564c [default view] [failures only]
reviewersmrrrgn
bugs1168612
milestone41.0a1
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/tools/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