Bug 1383257 - DO NOT LAND - changes applied only to date branch draft
authorJustin Wood <Callek@gmail.com>
Tue, 20 Jun 2017 13:24:48 -0400
changeset 615926 30897850ed9db8313da18c05c0e8c70a5e0ff04e
parent 615925 c0c8ca528392649e0b2c32196e176fca9b65067d
child 639322 884b67c252027c4c2f4daf4adbaf06e3dae5b6b5
push id70526
push userCallek@gmail.com
push dateWed, 26 Jul 2017 14:50:52 +0000
bugs1383257
milestone56.0a1
Bug 1383257 - DO NOT LAND - changes applied only to date branch MozReview-Commit-ID: 7SL5RZv4Y3X
browser/branding/nightly/branding.nsi
browser/config/mozconfigs/macosx64/debug
browser/config/mozconfigs/macosx64/debug-asan
browser/config/mozconfigs/macosx64/devedition
browser/config/mozconfigs/macosx64/l10n-mozconfig
browser/config/mozconfigs/macosx64/l10n-mozconfig-devedition
browser/config/mozconfigs/macosx64/nightly
browser/config/mozconfigs/macosx64/nightly-asan
browser/confvars.sh
mobile/android/branding/nightly/configure.sh
security/manager/ssl/StaticHPKPins.h
taskcluster/ci/build/android.yml
taskcluster/ci/nightly-l10n/kind.yml
taskcluster/ci/push-apk-breakpoint/kind.yml
taskcluster/ci/push-apk/kind.yml
taskcluster/ci/test/tests.yml
taskcluster/taskgraph/util/scriptworker.py
toolkit/mozapps/update/updater/moz.build
--- a/browser/branding/nightly/branding.nsi
+++ b/browser/branding/nightly/branding.nsi
@@ -8,18 +8,18 @@
 
 # BrandFullNameInternal is used for some registry and file system values
 # instead of BrandFullName and typically should not be modified.
 !define BrandFullNameInternal "Nightly"
 !define CompanyName           "mozilla.org"
 !define URLInfoAbout          "https://www.mozilla.org"
 !define HelpLink              "https://support.mozilla.org"
 
-!define URLStubDownload32 "http://download.mozilla.org/?os=win&lang=${AB_CD}&product=firefox-nightly-latest"
-!define URLStubDownload64 "http://download.mozilla.org/?os=win64&lang=${AB_CD}&product=firefox-nightly-latest"
+!define URLStubDownload32 "http://download.mozilla.org/?os=win&lang=${AB_CD}&product=firefox-date-nightly-latest"
+!define URLStubDownload64 "http://download.mozilla.org/?os=win64&lang=${AB_CD}&product=firefox-date-nightly-latest"
 !define URLManualDownload "https://www.mozilla.org/${AB_CD}/firefox/installer-help/?channel=nightly&installer_lang=${AB_CD}"
 !define URLSystemRequirements "https://www.mozilla.org/firefox/system-requirements/"
 !define Channel "nightly"
 
 # The installer's certificate name and issuer expected by the stub installer
 !define CertNameDownload   "Mozilla Corporation"
 !define CertIssuerDownload "DigiCert SHA2 Assured ID Code Signing CA"
 
--- a/browser/config/mozconfigs/macosx64/debug
+++ b/browser/config/mozconfigs/macosx64/debug
@@ -8,15 +8,18 @@ ac_add_options --enable-verify-mar
 export MOZILLA_OFFICIAL=1
 
 # Enable Telemetry
 export MOZ_TELEMETRY_REPORTING=1
 
 if test "${MOZ_UPDATE_CHANNEL}" = "nightly"; then
 ac_add_options --with-macbundlename-prefix=Firefox
 fi
+if test "${MOZ_UPDATE_CHANNEL}" = "nightly-date"; then
+ac_add_options --with-macbundlename-prefix=Firefox
+fi
 
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1
 
 ac_add_options --with-branding=browser/branding/nightly
 
 . "$topsrcdir/build/mozconfig.common.override"
--- a/browser/config/mozconfigs/macosx64/debug-asan
+++ b/browser/config/mozconfigs/macosx64/debug-asan
@@ -7,16 +7,19 @@ ac_add_options --enable-optimize="-O1"
 . $topsrcdir/build/unix/mozconfig.asan
 
 # Enable Telemetry
 export MOZ_TELEMETRY_REPORTING=1
 
 if test "${MOZ_UPDATE_CHANNEL}" = "nightly"; then
 ac_add_options --with-macbundlename-prefix=Firefox
 fi
+if test "${MOZ_UPDATE_CHANNEL}" = "nightly-date"; then
+ac_add_options --with-macbundlename-prefix=Firefox
+fi
 
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1
 
 # Need this to prevent name conflicts with the normal nightly build packages
 # Before mozconfig.common so we can test for asan builds there
 export MOZ_PKG_SPECIAL=asan
 
--- a/browser/config/mozconfigs/macosx64/devedition
+++ b/browser/config/mozconfigs/macosx64/devedition
@@ -16,12 +16,15 @@ ac_add_options --enable-instruments
 # Cross-compiled builds fail when dtrace is enabled
 if test `uname -s` != Linux; then
   ac_add_options --enable-dtrace
 fi
 
 if test "${MOZ_UPDATE_CHANNEL}" = "nightly"; then
 ac_add_options --with-macbundlename-prefix=Firefox
 fi
+if test "${MOZ_UPDATE_CHANNEL}" = "nightly-date"; then
+ac_add_options --with-macbundlename-prefix=Firefox
+fi
 
 ac_add_options --with-branding=browser/branding/aurora
 
 . "$topsrcdir/build/mozconfig.common.override"
--- a/browser/config/mozconfigs/macosx64/l10n-mozconfig
+++ b/browser/config/mozconfigs/macosx64/l10n-mozconfig
@@ -11,16 +11,19 @@ fi
 
 ac_add_options --with-l10n-base=../../l10n
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --with-branding=browser/branding/nightly
 
 if test "${MOZ_UPDATE_CHANNEL}" = "nightly"; then
 ac_add_options --with-macbundlename-prefix=Firefox
 fi
+if test "${MOZ_UPDATE_CHANNEL}" = "nightly-date"; then
+ac_add_options --with-macbundlename-prefix=Firefox
+fi
 
 export MOZILLA_OFFICIAL=1
 
 # Enable Telemetry
 export MOZ_TELEMETRY_REPORTING=1
 
 # Don't autoclobber l10n, as this can lead to missing binaries and broken builds
 # Bug 1283438
--- a/browser/config/mozconfigs/macosx64/l10n-mozconfig-devedition
+++ b/browser/config/mozconfigs/macosx64/l10n-mozconfig-devedition
@@ -11,16 +11,19 @@ fi
 
 ac_add_options --with-l10n-base=../../l10n
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --with-branding=browser/branding/aurora
 
 if test "${MOZ_UPDATE_CHANNEL}" = "nightly"; then
 ac_add_options --with-macbundlename-prefix=Firefox
 fi
+if test "${MOZ_UPDATE_CHANNEL}" = "nightly-date"; then
+ac_add_options --with-macbundlename-prefix=Firefox
+fi
 
 export MOZILLA_OFFICIAL=1
 
 # Enable Telemetry
 export MOZ_TELEMETRY_REPORTING=1
 
 # Don't autoclobber l10n, as this can lead to missing binaries and broken builds
 # Bug 1283438
--- a/browser/config/mozconfigs/macosx64/nightly
+++ b/browser/config/mozconfigs/macosx64/nightly
@@ -8,12 +8,15 @@ ac_add_options --enable-instruments
 # Cross-compiled builds fail when dtrace is enabled
 if test `uname -s` != Linux; then
   ac_add_options --enable-dtrace
 fi
 
 if test "${MOZ_UPDATE_CHANNEL}" = "nightly"; then
 ac_add_options --with-macbundlename-prefix=Firefox
 fi
+if test "${MOZ_UPDATE_CHANNEL}" = "nightly-date"; then
+ac_add_options --with-macbundlename-prefix=Firefox
+fi
 
 ac_add_options --with-branding=browser/branding/nightly
 
 . "$topsrcdir/build/mozconfig.common.override"
--- a/browser/config/mozconfigs/macosx64/nightly-asan
+++ b/browser/config/mozconfigs/macosx64/nightly-asan
@@ -6,16 +6,19 @@ ac_add_options --enable-optimize="-O2"
 . $topsrcdir/build/unix/mozconfig.asan
 
 # Enable Telemetry
 export MOZ_TELEMETRY_REPORTING=1
 
 if test "${MOZ_UPDATE_CHANNEL}" = "nightly"; then
 ac_add_options --with-macbundlename-prefix=Firefox
 fi
+if test "${MOZ_UPDATE_CHANNEL}" = "nightly-date"; then
+ac_add_options --with-macbundlename-prefix=Firefox
+fi
 
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1
 
 # Need this to prevent name conflicts with the normal nightly build packages
 # Before mozconfig.common so we can test for asan builds there
 export MOZ_PKG_SPECIAL=asan
 
--- a/browser/confvars.sh
+++ b/browser/confvars.sh
@@ -12,16 +12,17 @@ if test "$OS_ARCH" = "WINNT" -o \
         "$OS_ARCH" = "Linux"; then
   MOZ_BUNDLED_FONTS=1
 fi
 
 if test "$OS_ARCH" = "WINNT"; then
   MOZ_MAINTENANCE_SERVICE=1
   if ! test "$HAVE_64BIT_BUILD"; then
     if test "$MOZ_UPDATE_CHANNEL" = "nightly" -o \
+            "$MOZ_UPDATE_CHANNEL" = "nightly-date" -o \
             "$MOZ_UPDATE_CHANNEL" = "aurora" -o \
             "$MOZ_UPDATE_CHANNEL" = "aurora-dev" -o \
             "$MOZ_UPDATE_CHANNEL" = "beta" -o \
             "$MOZ_UPDATE_CHANNEL" = "beta-dev" -o \
             "$MOZ_UPDATE_CHANNEL" = "release" -o \
             "$MOZ_UPDATE_CHANNEL" = "release-dev"; then
       if ! test "$MOZ_DEBUG"; then
         MOZ_STUB_INSTALLER=1
--- a/mobile/android/branding/nightly/configure.sh
+++ b/mobile/android/branding/nightly/configure.sh
@@ -1,9 +1,9 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MOZ_APP_DISPLAYNAME="Firefox Nightly"
+MOZ_APP_DISPLAYNAME="Date Nightly"
 MOZ_UPDATER=1
 MOZ_ANDROID_ANR_REPORTER=1
 MOZ_ANDROID_SHARED_ID=org.mozilla.fennec.sharedID
 MOZ_ANDROID_GCM_SENDERID=965234145045
--- a/security/manager/ssl/StaticHPKPins.h
+++ b/security/manager/ssl/StaticHPKPins.h
@@ -675,16 +675,17 @@ static const TransportSecurityPreload kP
   { "api.twitter.com", true, false, false, -1, &kPinset_twitterCDN },
   { "apis.google.com", true, false, false, -1, &kPinset_google_root_pems },
   { "appengine.google.com", true, false, false, -1, &kPinset_google_root_pems },
   { "apps.facebook.com", true, false, false, -1, &kPinset_facebook },
   { "appspot.com", true, false, false, -1, &kPinset_google_root_pems },
   { "at.search.yahoo.com", false, true, false, -1, &kPinset_yahoo },
   { "au.search.yahoo.com", false, true, false, -1, &kPinset_yahoo },
   { "aus4.mozilla.org", true, true, true, 3, &kPinset_mozilla_services },
+  { "aus4.stage.mozaws.net", true, true, true, -1, &kPinset_mozilla_services },
   { "aus5.mozilla.org", true, true, true, 7, &kPinset_mozilla_services },
   { "az.search.yahoo.com", false, true, false, -1, &kPinset_yahoo },
   { "be.search.yahoo.com", false, true, false, -1, &kPinset_yahoo },
   { "bi.search.yahoo.com", false, true, false, -1, &kPinset_yahoo },
   { "blog.torproject.org", true, false, false, -1, &kPinset_tor },
   { "blogger.com", true, false, false, -1, &kPinset_google_root_pems },
   { "blogspot.com", true, false, false, -1, &kPinset_google_root_pems },
   { "br.search.yahoo.com", false, true, false, -1, &kPinset_yahoo },
--- a/taskcluster/ci/build/android.yml
+++ b/taskcluster/ci/build/android.yml
@@ -150,17 +150,17 @@ android-x86-old-id/opt:
         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: x86-old-id
         tooltool-downloads: internal
-    run-on-projects: [ 'mozilla-central' ]
+    run-on-projects: [ 'mozilla-central', 'date' ]
 
 android-x86-old-id-nightly/opt:
     description: "Android 4.2 x86 OldId Nightly"
     attributes:
         nightly: true
     index:
         product: mobile
         job-name: android-x86-old-id-opt
@@ -180,17 +180,17 @@ android-x86-old-id-nightly/opt:
             - builds/releng_base_android_64_builds.py
             - disable_signing.py
             - platform_supports_post_upload_to_latest.py
             - taskcluster_nightly.py
         script: "mozharness/scripts/fx_desktop_build.py"
         secrets: true
         custom-build-variant-cfg: x86-old-id
         tooltool-downloads: internal
-    run-on-projects: [ 'mozilla-central' ]
+    run-on-projects: [ 'mozilla-central', 'date' ]
 
 android-api-15-old-id/opt:
     description: "Android 4.0 API15+ Opt OldId"
     index:
         product: mobile
         job-name: android-api-15-old-id-opt
     treeherder:
         platform: android-4-0-armv7-api15-old-id/opt
@@ -206,17 +206,17 @@ android-api-15-old-id/opt:
         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-old-id
         tooltool-downloads: internal
-    run-on-projects: [ 'mozilla-central' ]
+    run-on-projects: [ 'mozilla-central', 'date' ]
 
 android-api-15-old-id-nightly/opt:
     description: "Android 4.0 API15+ OldId Nightly"
     attributes:
         nightly: true
     index:
         product: mobile
         job-name: android-api-15-old-id-opt
@@ -236,17 +236,17 @@ android-api-15-old-id-nightly/opt:
             - builds/releng_base_android_64_builds.py
             - disable_signing.py
             - platform_supports_post_upload_to_latest.py
             - taskcluster_nightly.py
         script: "mozharness/scripts/fx_desktop_build.py"
         secrets: true
         custom-build-variant-cfg: api-15-old-id
         tooltool-downloads: internal
-    run-on-projects: [ 'mozilla-central' ]
+    run-on-projects: [ 'mozilla-central', 'date' ]
 
 android-api-15-gradle/opt:
     description: "Android 4.0 API15+ (Gradle) Opt"
     index:
         product: mobile
         job-name: android-api-15-gradle-opt
     treeherder:
         platform: android-api-15-gradle/opt
--- a/taskcluster/ci/nightly-l10n/kind.yml
+++ b/taskcluster/ci/nightly-l10n/kind.yml
@@ -29,17 +29,17 @@ job-template:
       by-build-platform:
          default: browser/locales/all-locales
          android-api-15-nightly: mobile/locales/l10n-changesets.json
    chunks:
       by-build-platform:
          macosx64-nightly: 8
          win.*: 10
          default: 6
-   run-on-projects: ['mozilla-central', 'mozilla-beta']
+   run-on-projects: ['mozilla-central', 'mozilla-beta', 'date']
    ignore-locales:
       by-build-platform:
          # OSX has a special locale for japanese
          macosx64.*: [ja]
          default: [ja-JP-mac]
    run-time:
       by-build-platform:
          default: 36000
--- a/taskcluster/ci/push-apk-breakpoint/kind.yml
+++ b/taskcluster/ci/push-apk-breakpoint/kind.yml
@@ -20,10 +20,10 @@ jobs:
         worker-type: # see transforms
         worker:
             implementation: push-apk-breakpoint
         treeherder:
             symbol: pub(Br)
             platform: Android/opt
             tier: 2
             kind: other
-        run-on-projects: ['mozilla-central', 'mozilla-beta', 'mozilla-release']
+        run-on-projects: ['mozilla-central', 'mozilla-beta', 'mozilla-release', 'date']
         deadline-after: 5 days
--- a/taskcluster/ci/push-apk/kind.yml
+++ b/taskcluster/ci/push-apk/kind.yml
@@ -25,10 +25,10 @@ jobs:
             implementation: push-apk
             dry-run: # see transforms
         scopes: # see transforms
         treeherder:
             symbol: pub(gp)
             platform: Android/opt
             tier: 2
             kind: other
-        run-on-projects: ['mozilla-central', 'mozilla-beta', 'mozilla-release']
+        run-on-projects: ['mozilla-central', 'mozilla-beta', 'mozilla-release', 'date']
         deadline-after: 5 days
--- a/taskcluster/ci/test/tests.yml
+++ b/taskcluster/ci/test/tests.yml
@@ -1382,16 +1382,17 @@ talos-g3:
     suite: talos
     try-name: g3
     treeherder-symbol: tc-T(g3)
     virtualization: hardware
     run-on-projects:
         by-test-platform:
             linux64-stylo-sequential/.*: ['mozilla-central','try']
             linux64-stylo/.*: ['mozilla-central', 'try']
+            windows.*: ['mozilla-beta','mozilla-central', 'mozilla-inbound', 'autoland', 'try', 'date']
             default: ['mozilla-beta','mozilla-central', 'mozilla-inbound', 'autoland', 'try']
     max-run-time: 3600
     e10s: true
     mozharness:
         script: talos_script.py
         no-read-buildbot-config: true
         config:
             by-test-platform:
--- a/taskcluster/taskgraph/util/scriptworker.py
+++ b/taskcluster/taskgraph/util/scriptworker.py
@@ -35,16 +35,17 @@ nuance so certain m-b and m-r tasks use 
 release sign when we have a signed-off set of candidate builds.  This current
 approach works for now, though.
 
 This is a list of list-pairs, for ordering.
 """
 SIGNING_SCOPE_ALIAS_TO_PROJECT = [[
     'all-nightly-branches', set([
         'mozilla-central',
+        'date',
     ])
 ], [
     'all-release-branches', set([
         'mozilla-beta',
         'mozilla-release',
     ])
 ]]
 
@@ -69,16 +70,17 @@ DEVEDITION_SIGNING_CERT_SCOPES = {
 
 """Map beetmover scope aliases to sets of projects.
 """
 BEETMOVER_SCOPE_ALIAS_TO_PROJECT = [[
     'all-nightly-branches', set([
         'mozilla-central',
         'mozilla-beta',
         'mozilla-release',
+        'date',
     ])
 ], [
     'all-release-branches', set([
         'mozilla-beta',
         'mozilla-release',
     ])
 ]]
 
@@ -97,16 +99,17 @@ This is a list of list-pairs, for orderi
 BEETMOVER_SCOPE_ALIAS_TO_TARGET_TASK = [[
     'all-nightly-tasks', set([
         'nightly_fennec',
         'nightly_linux',
         'nightly_macosx',
         'nightly_win',
         'mozilla_beta_tasks',
         'mozilla_release_tasks',
+        'date_tasks',
     ])
 ], [
     'all-release-tasks', BEETMOVER_RELEASE_TARGET_TASKS
 ]]
 
 """Map the beetmover scope aliases to the actual scopes.
 """
 BEETMOVER_BUCKET_SCOPES = {
@@ -129,16 +132,17 @@ BEETMOVER_ACTION_SCOPES = {
 
 """Map balrog scope aliases to sets of projects.
 
 This is a list of list-pairs, for ordering.
 """
 BALROG_SCOPE_ALIAS_TO_PROJECT = [[
     'nightly', set([
         'mozilla-central',
+        'date'
     ])
 ], [
     'beta', set([
         'mozilla-beta',
     ])
 ], [
     'release', set([
         'mozilla-release',
@@ -201,16 +205,17 @@ BALROG_CHANNEL_SCOPES = {
         'project:releng:balrog:channel:esr-cdntest'
     ]
 }
 
 
 PUSH_APK_SCOPE_ALIAS_TO_PROJECT = [[
     'central', set([
         'mozilla-central',
+        'date',
     ])
 ], [
     'beta', set([
         'mozilla-beta',
     ])
 ], [
     'release', set([
         'mozilla-release',
@@ -230,16 +235,17 @@ PUSH_APK_GOOGLE_PLAY_TRACT = {
     'central': 'beta',
     'beta': 'rollout',
     'release': 'rollout',
     'default': 'invalid',
 }
 
 PUSH_APK_BREAKPOINT_WORKER_TYPE = {
     'central': 'aws-provisioner-v1/taskcluster-generic',
+    'date': 'aws-provisioner-v1/taskcluster-generic',
     'beta': 'null-provisioner/human-breakpoint',
     'release': 'null-provisioner/human-breakpoint',
     'default': 'invalid/invalid',
 }
 
 PUSH_APK_DRY_RUN_OPTION = {
     'central': False,
     'beta': False,
--- a/toolkit/mozapps/update/updater/moz.build
+++ b/toolkit/mozapps/update/updater/moz.build
@@ -44,17 +44,17 @@ primary_cert.script = 'gen_cert_header.p
 secondary_cert.script = 'gen_cert_header.py:create_header'
 xpcshell_cert.script = 'gen_cert_header.py:create_header'
 
 if CONFIG['MOZ_UPDATE_CHANNEL'] in ('beta', 'release', 'esr'):
     primary_cert.inputs += ['release_primary.der']
     secondary_cert.inputs += ['release_secondary.der']
 elif CONFIG['MOZ_UPDATE_CHANNEL'] in ('nightly', 'aurora', 'nightly-elm',
                                       'nightly-profiling', 'nightly-oak',
-                                      'nightly-ux'):
+                                      'nightly-ux', 'nightly-date'):
     primary_cert.inputs += ['nightly_aurora_level3_primary.der']
     secondary_cert.inputs += ['nightly_aurora_level3_secondary.der']
 else:
     primary_cert.inputs += ['dep1.der']
     secondary_cert.inputs += ['dep2.der']
 
 xpcshell_cert.inputs += ['xpcshellCertificate.der']