Bug 1444948 [wpt PR 9977] - Remove the rest of Sauce support for stab…

…ility runs (including JWT), a=testonly Automatic update from web-platform-testsRemove the rest of Sauce support for stability runs (including JWT) (#9977) Fixes web-platform-tests/wpt#9903. wpt-commits: 18ce941a0840daaa8a17fbe54449c6acc092b442 wpt-pr: 9977 wpt-commits: 18ce941a0840daaa8a17fbe54449c6acc092b442 wpt-pr: 9977 UltraBlame original commit: 3582e94198299a6c64414d17a79d9b6343fd1849
marco-c · Oct 2, 2019 · ccedb76 · ccedb76
1 parent 74e4ed9
commit ccedb76
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 25 deletions.
diff --git a/testing/web-platform/meta/MANIFEST.json b/testing/web-platform/meta/MANIFEST.json
@@ -390962,7 +390962,7 @@
    "support"
   ],
   "./.travis.yml": [
-   "916102006e70f31e4739438a8b2f86bf068642fc",
+   "db5838d29eefceadbb7f088f7de75d765dbaa58c",
    "support"
   ],
   "./CONTRIBUTING.md": [

diff --git a/testing/web-platform/tests/.travis.yml b/testing/web-platform/tests/.travis.yml
@@ -12,8 +12,6 @@ addons:
     - www2.web-platform.test
     - xn--n8j6ds53lwwkrqhv28a.web-platform.test
     - xn--lve-6lad.web-platform.test
-  jwt:
-    secure: N9lvgkqUPtFlz6Vpa6qTPFhymEsDCsbaCsT64/hj3vlHRxK94r5+ugVJ3zm99zC0q2j1ish8yJC7mN/W4wRfBE4sAwmdxrlowxF1DDGCkaLE9i/GWW92s0fBVGJmXLh8kwNkQ31hMOsaGfHIMpeLFS7Se741te7YqsHIzmBCdQs=
 before_install:
   # This needs be sourced as it sets various env vars
   - . ./tools/ci/before_install.sh

diff --git a/testing/web-platform/tests/tools/ci/check_stability.py b/testing/web-platform/tests/tools/ci/check_stability.py
@@ -172,22 +172,6 @@ def get_parser():
     return parser
 
 
-def set_default_args(kwargs):
-    kwargs.set_if_none("sauce_platform",
-                       os.environ.get("PLATFORM"))
-    kwargs.set_if_none("sauce_build",
-                       os.environ.get("TRAVIS_BUILD_NUMBER"))
-    python_version = os.environ.get("TRAVIS_PYTHON_VERSION")
-    kwargs.set_if_none("sauce_tags",
-                       [python_version] if python_version else [])
-    kwargs.set_if_none("sauce_tunnel_id",
-                       os.environ.get("TRAVIS_JOB_NUMBER"))
-    kwargs.set_if_none("sauce_user",
-                       os.environ.get("SAUCE_USERNAME"))
-    kwargs.set_if_none("sauce_key",
-                       os.environ.get("SAUCE_ACCESS_KEY"))
-
-
 def pr():
     pr = os.environ.get("TRAVIS_PULL_REQUEST", "false")
     return pr if pr != "false" else None
@@ -301,10 +285,6 @@ def run(venv, wpt_args, **kwargs):
 
     browser_name = wpt_args.product.split(":")[0]
 
-    if browser_name == "sauce" and not wpt_args.sauce_key:
-        logger.warning("Cannot run tests on Sauce Labs. No access key.")
-        return retcode
-
     pr_number = pr()
 
     with TravisFold("browser_setup"):
@@ -338,8 +318,6 @@ def run(venv, wpt_args, **kwargs):
 
             wpt_kwargs["test_list"] = list(tests_changed | files_affected)
 
-        set_default_args(wpt_kwargs)
-
         do_delayed_imports()
 
         wpt_kwargs["stability"] = True