Bug 1237182: get rid of oauth.txt r=mtabara

Differential Revision: https://phabricator.services.mozilla.com/D1444 --HG-- extra : rebase_source : dad4f2102dc1e74b681a765169eae691724f8b61
2018-05-25 17:43:15 -04:00 · 2018-05-25 17:43:15 -04:00 · 600b5b46ac
commit 600b5b46ac
parent 8e5587759f
40 changed files with 1 additions and 106 deletions
--- a/build/mozconfig.cache
+++ b/build/mozconfig.cache
@ -4,40 +4,7 @@

 # Setup for build cache

-# Avoid duplication if the file happens to be included twice.
-if test -z "$bucket" -a -z "$NO_CACHE"; then
-
-bucket=
-if test -z "$SCCACHE_DISABLE"; then
-    case "${branch}" in
-    try)
-        case "${master}" in
-        *scl1.mozilla.com*|*.scl3.mozilla.com*)
-            bucket=mozilla-releng-s3-cache-us-west-1-try
-            ;;
-        *use1.mozilla.com*)
-            bucket=mozilla-releng-s3-cache-us-east-1-try
-            ;;
-        *usw2.mozilla.com*)
-            bucket=mozilla-releng-s3-cache-us-west-2-try
-            ;;
-        esac
-        ;;
-    autoland|mozilla-inbound)
-        case "${master}" in
-        *use1.mozilla.com*)
-            bucket=mozilla-releng-s3-cache-us-east-1-prod
-            ;;
-        *usw2.mozilla.com*)
-            bucket=mozilla-releng-s3-cache-us-west-2-prod
-            ;;
-        esac
-        ;;
-    esac
-fi
-fi
-
-# builds where buildprops didn't have the data (eg: taskcluster or non-buildbot) and without sccache disabled:
+# builds where buildprops didn't have the data (eg: taskcluster) and without sccache disabled:
 if test -z "$bucket" -a -z "$SCCACHE_DISABLE"; then

    # prevent rerun if az is set, or wget is not available
@ -125,5 +92,3 @@ if test -n "$bucket"; then
        ;;
    esac
 fi
-
-fi
--- a/taskcluster/docker/android-build/Dockerfile
+++ b/taskcluster/docker/android-build/Dockerfile
@ -41,13 +41,6 @@ RUN apt-get update && \
 # %include taskcluster/docker/recipes/xvfb.sh
 COPY topsrcdir/taskcluster/docker/recipes/xvfb.sh /builds/worker/scripts/xvfb.sh

-# Stubbed out credentials; mozharness looks for this file an issues a WARNING
-# if it's not found, which causes the build to fail.  Note that this needs to
-# be in the parent of the workspace directory and in the directory where
-# mozharness is run (not its --work-dir).  See Bug 1169652.
-# %include taskcluster/docker/recipes/oauth.txt
-COPY topsrcdir/taskcluster/docker/recipes/oauth.txt /builds/worker/
-
 # Reset user/workdir from parent image so we can install software.
 WORKDIR /
 USER root
--- a/taskcluster/docker/debian7-build/Dockerfile
+++ b/taskcluster/docker/debian7-build/Dockerfile
@ -60,10 +60,3 @@ RUN apt-get update && \
 # Add wrapper scripts for xvfb allowing tasks to easily retry starting up xvfb
 # %include taskcluster/docker/recipes/xvfb.sh
 COPY topsrcdir/taskcluster/docker/recipes/xvfb.sh /builds/worker/scripts/xvfb.sh
-
-# Stubbed out credentials; mozharness looks for this file an issues a WARNING
-# if it's not found, which causes the build to fail.  Note that this needs to
-# be in the parent of the workspace directory and in the directory where
-# mozharness is run (not its --work-dir).  See Bug 1169652.
-# %include taskcluster/docker/recipes/oauth.txt
-COPY topsrcdir/taskcluster/docker/recipes/oauth.txt /builds/worker/
--- a/taskcluster/docker/mingw32-build/Dockerfile
+++ b/taskcluster/docker/mingw32-build/Dockerfile
@ -39,10 +39,3 @@ RUN apt-get update && \
      zlib1g-dev \
      libfreetype6-dev:i386 \
      libx11-dev:i386
-
-# Stubbed out credentials; mozharness looks for this file an issues a WARNING
-# if it's not found, which causes the build to fail.  Note that this needs to
-# be in the parent of the workspace directory and in the directory where
-# mozharness is run (not its --work-dir).  See Bug 1169652.
-# %include taskcluster/docker/recipes/oauth.txt
-COPY topsrcdir/taskcluster/docker/recipes/oauth.txt /builds/worker/
--- a/taskcluster/docker/recipes/oauth.txt
+++ b/taskcluster/docker/recipes/oauth.txt
@ -1,2 +0,0 @@
-taskcluster_clientId = None
-taskcluster_accessToken = None
--- a/testing/mozharness/configs/awsy/linux_config.py
+++ b/testing/mozharness/configs/awsy/linux_config.py
@ -33,7 +33,6 @@ config = {
    "default_blob_upload_servers": [
        "https://blobupload.elasticbeanstalk.com",
    ],
-    "blob_uploader_auth_file": os.path.join(os.getcwd(), "oauth.txt"),
    "download_minidump_stackwalk": True,
    "minidump_stackwalk_path": MINIDUMP_STACKWALK_PATH,
    "minidump_tooltool_manifest_path": TOOLTOOL_MANIFEST_PATH,
--- a/testing/mozharness/configs/awsy/macosx_config.py
+++ b/testing/mozharness/configs/awsy/macosx_config.py
@ -26,7 +26,6 @@ config = {
    "default_blob_upload_servers": [
        "https://blobupload.elasticbeanstalk.com",
    ],
-    "blob_uploader_auth_file": os.path.join(os.getcwd(), "oauth.txt"),
    "download_minidump_stackwalk": True,
    "minidump_stackwalk_path": MINIDUMP_STACKWALK_PATH,
    "minidump_tooltool_manifest_path": TOOLTOOL_MANIFEST_PATH,
--- a/testing/mozharness/configs/marionette/prod_config.py
+++ b/testing/mozharness/configs/marionette/prod_config.py
@ -1,6 +1,4 @@
 # This is a template config file for marionette production.
-import os
-
 HG_SHARE_BASE_DIR = "/builds/hg-shared"

 config = {
@ -20,7 +18,6 @@ config = {
    "default_blob_upload_servers": [
        "https://blobupload.elasticbeanstalk.com",
    ],
-    "blob_uploader_auth_file": os.path.join(os.getcwd(), "oauth.txt"),
    "download_symbols": "ondemand",
    "download_minidump_stackwalk": True,
    "tooltool_cache": "/builds/worker/tooltool-cache",
--- a/testing/mozharness/configs/marionette/windows_config.py
+++ b/testing/mozharness/configs/marionette/windows_config.py
@ -1,6 +1,4 @@
 # This is a template config file for marionette production on Windows.
-import os
-
 config = {
    # marionette options
    "marionette_address": "localhost:2828",
@ -22,7 +20,6 @@ config = {
    "default_blob_upload_servers": [
        "https://blobupload.elasticbeanstalk.com",
    ],
-    "blob_uploader_auth_file": os.path.join(os.getcwd(), "oauth.txt"),
    "download_minidump_stackwalk": True,
    "download_symbols": "ondemand",
    "suite_definitions": {
--- a/testing/mozharness/configs/marionette/windows_taskcluster_config.py
+++ b/testing/mozharness/configs/marionette/windows_taskcluster_config.py
@ -23,7 +23,6 @@ config = {
    "default_blob_upload_servers": [
        "https://blobupload.elasticbeanstalk.com",
    ],
-    "blob_uploader_auth_file": 'C:/builds/oauth.txt',
    "download_minidump_stackwalk": True,
    "download_symbols": "ondemand",
    "suite_definitions": {
--- a/testing/mozharness/configs/raptor/linux64_config_taskcluster.py
+++ b/testing/mozharness/configs/raptor/linux64_config_taskcluster.py
@ -35,7 +35,6 @@ config = {
    "default_blob_upload_servers": [
        "https://blobupload.elasticbeanstalk.com",
    ],
-    "blob_uploader_auth_file": os.path.join(os.getcwd(), "oauth.txt"),
    "download_minidump_stackwalk": True,
    "minidump_stackwalk_path": MINIDUMP_STACKWALK_PATH,
    "minidump_tooltool_manifest_path": TOOLTOOL_MANIFEST_PATH,
--- a/testing/mozharness/configs/raptor/linux_config.py
+++ b/testing/mozharness/configs/raptor/linux_config.py
@ -31,7 +31,6 @@ config = {
    "default_blob_upload_servers": [
        "https://blobupload.elasticbeanstalk.com",
    ],
-    "blob_uploader_auth_file": os.path.join(os.getcwd(), "oauth.txt"),
    "download_minidump_stackwalk": True,
    "minidump_stackwalk_path": MINIDUMP_STACKWALK_PATH,
    "minidump_tooltool_manifest_path": TOOLTOOL_MANIFEST_PATH,
--- a/testing/mozharness/configs/raptor/mac_config.py
+++ b/testing/mozharness/configs/raptor/mac_config.py
@ -40,7 +40,6 @@ config = {
    "default_blob_upload_servers": [
        "https://blobupload.elasticbeanstalk.com",
    ],
-    "blob_uploader_auth_file": os.path.join(os.getcwd(), "oauth.txt"),
    "download_minidump_stackwalk": True,
    "minidump_stackwalk_path": "macosx64-minidump_stackwalk",
    "minidump_tooltool_manifest_path": "config/tooltool-manifests/macosx64/releng.manifest",
--- a/testing/mozharness/configs/raptor/windows_config.py
+++ b/testing/mozharness/configs/raptor/windows_config.py
@ -37,7 +37,6 @@ config = {
    "default_blob_upload_servers": [
        "https://blobupload.elasticbeanstalk.com",
    ],
-    "blob_uploader_auth_file": os.path.join(os.getcwd(), "oauth.txt"),
    "metro_harness_path_frmt": "%(metro_base_path)s/metro/metrotestharness.exe",
    "download_minidump_stackwalk": True,
    "tooltool_cache": os.path.join('c:\\', 'build', 'tooltool_cache'),
--- a/testing/mozharness/configs/raptor/windows_vm_config.py
+++ b/testing/mozharness/configs/raptor/windows_vm_config.py
@ -36,7 +36,6 @@ config = {
    "default_blob_upload_servers": [
        "https://blobupload.elasticbeanstalk.com",
    ],
-    "blob_uploader_auth_file": os.path.join(os.getcwd(), "oauth.txt"),
    "metro_harness_path_frmt": "%(metro_base_path)s/metro/metrotestharness.exe",
    "download_minidump_stackwalk": True,
    "tooltool_cache": os.path.join('c:\\', 'build', 'tooltool_cache'),
--- a/testing/mozharness/configs/single_locale/ash_android-api-16.py
+++ b/testing/mozharness/configs/single_locale/ash_android-api-16.py
@ -14,7 +14,6 @@ config = {
    "locales_dir": "mobile/android/locales",
    "ignore_locales": ["en-US"],
    "nightly_build": True,
-    'balrog_credentials_file': 'oauth.txt',
    "tools_repo": "https://hg.mozilla.org/build/tools",
    "tooltool_config": {
        "manifest": "mobile/android/config/tooltool-manifests/android/releng.manifest",
--- a/testing/mozharness/configs/single_locale/autoland_android-api-16.py
+++ b/testing/mozharness/configs/single_locale/autoland_android-api-16.py
@ -16,7 +16,6 @@ config = {
    "locales_dir": "mobile/android/locales",
    "ignore_locales": ["en-US"],
    "nightly_build": True,
-    'balrog_credentials_file': 'oauth.txt',
    "tools_repo": "https://hg.mozilla.org/build/tools",
    "tooltool_config": {
        "manifest": "mobile/android/config/tooltool-manifests/android/releng.manifest",
--- a/testing/mozharness/configs/single_locale/jamun_android-api-16.py
+++ b/testing/mozharness/configs/single_locale/jamun_android-api-16.py
@ -13,7 +13,6 @@ config = {
    "locales_dir": "mobile/android/locales",
    "ignore_locales": ["en-US"],
    "nightly_build": True,
-    'balrog_credentials_file': 'oauth.txt',
    "tools_repo": "https://hg.mozilla.org/build/tools",
    "tooltool_config": {
        "manifest": "mobile/android/config/tooltool-manifests/android/releng.manifest",
--- a/testing/mozharness/configs/single_locale/maple_android-api-16.py
+++ b/testing/mozharness/configs/single_locale/maple_android-api-16.py
@ -14,7 +14,6 @@ config = {
    "locales_dir": "mobile/android/locales",
    "ignore_locales": ["en-US"],
    "nightly_build": True,
-    'balrog_credentials_file': 'oauth.txt',
    "tools_repo": "https://hg.mozilla.org/build/tools",
    "tooltool_config": {
        "manifest": "mobile/android/config/tooltool-manifests/android/releng.manifest",
--- a/testing/mozharness/configs/single_locale/mozilla-aurora_android-api-16.py
+++ b/testing/mozharness/configs/single_locale/mozilla-aurora_android-api-16.py
@ -16,7 +16,6 @@ config = {
    "locales_dir": "mobile/android/locales",
    "ignore_locales": ["en-US"],
    "nightly_build": True,
-    'balrog_credentials_file': 'oauth.txt',
    "tools_repo": "https://hg.mozilla.org/build/tools",
    "tooltool_config": {
        "manifest": "mobile/android/config/tooltool-manifests/android/releng.manifest",
--- a/testing/mozharness/configs/single_locale/mozilla-beta_android-api-16.py
+++ b/testing/mozharness/configs/single_locale/mozilla-beta_android-api-16.py
@ -15,7 +15,6 @@ config = {
    "locales_dir": "mobile/android/locales",
    "locales_platform": "android-api-16",
    "ignore_locales": ["en-US"],
-    "balrog_credentials_file": "oauth.txt",
    "tools_repo": "https://hg.mozilla.org/build/tools",
    "platform": "android",
    "is_release_or_beta": True,
--- a/testing/mozharness/configs/single_locale/mozilla-central_android-api-16.py
+++ b/testing/mozharness/configs/single_locale/mozilla-central_android-api-16.py
@ -16,7 +16,6 @@ config = {
    "locales_dir": "mobile/android/locales",
    "ignore_locales": ["en-US"],
    "nightly_build": True,
-    'balrog_credentials_file': 'oauth.txt',
    "tools_repo": "https://hg.mozilla.org/build/tools",
    "tooltool_config": {
        "manifest": "mobile/android/config/tooltool-manifests/android/releng.manifest",
--- a/testing/mozharness/configs/single_locale/mozilla-inbound_android-api-16.py
+++ b/testing/mozharness/configs/single_locale/mozilla-inbound_android-api-16.py
@ -16,7 +16,6 @@ config = {
    "locales_dir": "mobile/android/locales",
    "ignore_locales": ["en-US"],
    "nightly_build": True,
-    'balrog_credentials_file': 'oauth.txt',
    "tools_repo": "https://hg.mozilla.org/build/tools",
    "tooltool_config": {
        "manifest": "mobile/android/config/tooltool-manifests/android/releng.manifest",
--- a/testing/mozharness/configs/single_locale/mozilla-release_android-api-16.py
+++ b/testing/mozharness/configs/single_locale/mozilla-release_android-api-16.py
@ -15,7 +15,6 @@ config = {
    "locales_dir": "mobile/android/locales",
    "locales_platform": "android-api-16",
    "ignore_locales": ["en-US"],
-    "balrog_credentials_file": "oauth.txt",
    "tools_repo": "https://hg.mozilla.org/build/tools",
    "platform": "android",
    "is_release_or_beta": True,
--- a/testing/mozharness/configs/single_locale/try_android-api-16.py
+++ b/testing/mozharness/configs/single_locale/try_android-api-16.py
@ -13,7 +13,6 @@ config = {
    "locales_file": "%s/mobile/locales/l10n-changesets.json" % MOZILLA_DIR,
    "locales_dir": "mobile/android/locales",
    "ignore_locales": ["en-US"],
-    'balrog_credentials_file': 'oauth.txt',
    "tools_repo": "https://hg.mozilla.org/build/tools",
    "tooltool_config": {
        "manifest": "mobile/android/config/tooltool-manifests/android/releng.manifest",
--- a/testing/mozharness/configs/talos/linux64_config_taskcluster.py
+++ b/testing/mozharness/configs/talos/linux64_config_taskcluster.py
@ -36,7 +36,6 @@ config = {
    "default_blob_upload_servers": [
        "https://blobupload.elasticbeanstalk.com",
    ],
-    "blob_uploader_auth_file": os.path.join(os.getcwd(), "oauth.txt"),
    "download_minidump_stackwalk": True,
    "minidump_stackwalk_path": MINIDUMP_STACKWALK_PATH,
    "minidump_tooltool_manifest_path": TOOLTOOL_MANIFEST_PATH,
--- a/testing/mozharness/configs/talos/linux_config.py
+++ b/testing/mozharness/configs/talos/linux_config.py
@ -26,7 +26,6 @@ config = {
    "default_blob_upload_servers": [
        "https://blobupload.elasticbeanstalk.com",
    ],
-    "blob_uploader_auth_file": os.path.join(os.getcwd(), "oauth.txt"),
    "download_minidump_stackwalk": True,
    "minidump_stackwalk_path": MINIDUMP_STACKWALK_PATH,
    "minidump_tooltool_manifest_path": TOOLTOOL_MANIFEST_PATH,
--- a/testing/mozharness/configs/talos/mac_config.py
+++ b/testing/mozharness/configs/talos/mac_config.py
@ -36,7 +36,6 @@ config = {
    "default_blob_upload_servers": [
        "https://blobupload.elasticbeanstalk.com",
    ],
-    "blob_uploader_auth_file": os.path.join(os.getcwd(), "oauth.txt"),
    "download_minidump_stackwalk": True,
    "minidump_stackwalk_path": "macosx64-minidump_stackwalk",
    "minidump_tooltool_manifest_path": "config/tooltool-manifests/macosx64/releng.manifest",
--- a/testing/mozharness/configs/talos/windows_config.py
+++ b/testing/mozharness/configs/talos/windows_config.py
@ -28,7 +28,6 @@ config = {
    "default_blob_upload_servers": [
        "https://blobupload.elasticbeanstalk.com",
    ],
-    "blob_uploader_auth_file": os.path.join(os.getcwd(), "oauth.txt"),
    "metro_harness_path_frmt": "%(metro_base_path)s/metro/metrotestharness.exe",
    "download_minidump_stackwalk": True,
    "tooltool_cache": os.path.join('c:\\', 'build', 'tooltool_cache'),
--- a/testing/mozharness/configs/talos/windows_taskcluster_config.py
+++ b/testing/mozharness/configs/talos/windows_taskcluster_config.py
@ -25,7 +25,6 @@ config = {
    "default_blob_upload_servers": [
        "https://blobupload.elasticbeanstalk.com",
    ],
-    "blob_uploader_auth_file": 'C:/builds/oauth.txt',
    "metro_harness_path_frmt": "%(metro_base_path)s/metro/metrotestharness.exe",
    "download_minidump_stackwalk": True,
    "tooltool_cache": os.path.join('Y:\\', 'tooltool-cache'),
--- a/testing/mozharness/configs/talos/windows_vm_config.py
+++ b/testing/mozharness/configs/talos/windows_vm_config.py
@ -27,7 +27,6 @@ config = {
    "default_blob_upload_servers": [
        "https://blobupload.elasticbeanstalk.com",
    ],
-    "blob_uploader_auth_file": os.path.join(os.getcwd(), "oauth.txt"),
    "metro_harness_path_frmt": "%(metro_base_path)s/metro/metrotestharness.exe",
    "download_minidump_stackwalk": True,
    "tooltool_cache": os.path.join('c:\\', 'build', 'tooltool_cache'),
--- a/testing/mozharness/configs/unittests/linux_unittest.py
+++ b/testing/mozharness/configs/unittests/linux_unittest.py
@ -279,7 +279,6 @@ config = {
                            "jittest": [],
                            "mozbase": [],
                            },
-    "blob_uploader_auth_file": os.path.join(os.getcwd(), "oauth.txt"),
    "download_minidump_stackwalk": True,
    "minidump_stackwalk_path": MINIDUMP_STACKWALK_PATH,
    "minidump_tooltool_manifest_path": TOOLTOOL_MANIFEST_PATH,
--- a/testing/mozharness/configs/unittests/mac_unittest.py
+++ b/testing/mozharness/configs/unittests/mac_unittest.py
@ -228,7 +228,6 @@ config = {
                            "jittest": [],
                            "mozbase": [],
                            },
-    "blob_uploader_auth_file": os.path.join(os.getcwd(), "oauth.txt"),
    "download_minidump_stackwalk": True,
    "minidump_stackwalk_path": "macosx64-minidump_stackwalk",
    "minidump_tooltool_manifest_path": "config/tooltool-manifests/macosx64/releng.manifest",
--- a/testing/mozharness/configs/unittests/win_taskcluster_unittest.py
+++ b/testing/mozharness/configs/unittests/win_taskcluster_unittest.py
@ -297,7 +297,6 @@ config = {
        "https://blobupload.elasticbeanstalk.com",
    ],
    "structured_suites": ["reftest"],
-    'blob_uploader_auth_file': 'C:/builds/oauth.txt',
    "download_minidump_stackwalk": True,
    "minidump_stackwalk_path": "win32-minidump_stackwalk.exe",
    "minidump_tooltool_manifest_path": "config/tooltool-manifests/win32/releng.manifest",
--- a/testing/mozharness/configs/unittests/win_unittest.py
+++ b/testing/mozharness/configs/unittests/win_unittest.py
@ -255,7 +255,6 @@ config = {
                            "jittest": [],
                            "mozbase": [],
                            },
-    "blob_uploader_auth_file": os.path.join(os.getcwd(), "oauth.txt"),
    "download_minidump_stackwalk": True,
    "minidump_stackwalk_path": "win32-minidump_stackwalk.exe",
    "minidump_tooltool_manifest_path": "config/tooltool-manifests/win32/releng.manifest",
--- a/testing/mozharness/configs/web_platform_tests/prod_config.py
+++ b/testing/mozharness/configs/web_platform_tests/prod_config.py
@ -3,8 +3,6 @@
 # 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/.
 # ***** END LICENSE BLOCK *****
-import os
-
 config = {
    "options": [
        "--prefs-root=%(test_path)s/prefs",
@ -20,8 +18,6 @@ config = {
         "https://blobupload.elasticbeanstalk.com",
    ],

-    "blob_uploader_auth_file" : os.path.join(os.getcwd(), "oauth.txt"),
-
    "download_minidump_stackwalk": True,

    # this would normally be in "exes", but "exes" is clobbered by remove_executables
--- a/testing/mozharness/configs/web_platform_tests/prod_config_windows.py
+++ b/testing/mozharness/configs/web_platform_tests/prod_config_windows.py
@ -6,7 +6,6 @@

 # This is a template config file for web-platform-tests test.

-import os
 import sys

 config = {
@ -29,8 +28,6 @@ config = {
         "https://blobupload.elasticbeanstalk.com",
    ],

-    "blob_uploader_auth_file" : os.path.join(os.getcwd(), "oauth.txt"),
-
    "download_minidump_stackwalk": True,

    "per_test_category": "web-platform",
--- a/testing/mozharness/configs/web_platform_tests/prod_config_windows_taskcluster.py
+++ b/testing/mozharness/configs/web_platform_tests/prod_config_windows_taskcluster.py
@ -54,8 +54,6 @@ config = {
        }
    ],

-    "blob_uploader_auth_file" : 'C:/builds/oauth.txt',
-
    "download_minidump_stackwalk": True,

    "per_test_category": "web-platform",
--- a/testing/mozharness/scripts/fx_desktop_build.py
+++ b/testing/mozharness/scripts/fx_desktop_build.py
@ -53,7 +53,6 @@ class FxDesktopBuild(BuildScript, TryToolsMixin, object):
                "pgo_platforms": ['linux', 'linux64', 'win32', 'win64'],
                # nightly stuff
                "nightly_build": False,
-                'balrog_credentials_file': 'oauth.txt',
                # hg tool stuff
                "tools_repo": "https://hg.mozilla.org/build/tools",
                # Seed all clones with mozilla-unified. This ensures subsequent
--- a/testing/mozharness/scripts/release/updates.py
+++ b/testing/mozharness/scripts/release/updates.py
@ -76,9 +76,6 @@ class UpdatesBumper(MercurialScript, AutomationMixin,
                'push',
                'submit-to-balrog',
            ],
-            config={
-                'credentials_file': 'oauth.txt',
-            },
            require_config_file=require_config_file
        )