Bug 1444948 [wpt PR 9977] - Remove the rest of Sauce support for stability runs (including JWT), a=testonly
authorPhilip Jägenstedt <philip@foolip.org>
Mon, 09 Apr 2018 14:42:02 +0000
changeset 467007 3582e94198299a6c64414d17a79d9b6343fd1849
parent 467006 9011794a980089e9568bb1034f5dc7d4b34c391c
child 467008 1e0357b5ad237d0c191f80d5fee6c207d170a4cb
push id9165
push userasasaki@mozilla.com
push dateThu, 26 Apr 2018 21:04:54 +0000
treeherdermozilla-beta@064c3804de2e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstestonly
bugs1444948
milestone61.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 1444948 [wpt PR 9977] - Remove the rest of Sauce support for stability runs (including JWT), a=testonly Automatic update from web-platform-testsRemove the rest of Sauce support for stability runs (including JWT) (#9977) Fixes https://github.com/w3c/web-platform-tests/issues/9903. wpt-commits: 18ce941a0840daaa8a17fbe54449c6acc092b442 wpt-pr: 9977 wpt-commits: 18ce941a0840daaa8a17fbe54449c6acc092b442 wpt-pr: 9977
testing/web-platform/meta/MANIFEST.json
testing/web-platform/tests/.travis.yml
testing/web-platform/tests/tools/ci/check_stability.py
--- a/testing/web-platform/meta/MANIFEST.json
+++ b/testing/web-platform/meta/MANIFEST.json
@@ -390957,17 +390957,17 @@
    "525f7d93f00f11086aabc1f652cf06623e21986c",
    "support"
   ],
   "./.pyup.yml": [
    "a276808f4f41f6243ca69600d8f9b78ca7f9ed96",
    "support"
   ],
   "./.travis.yml": [
-   "916102006e70f31e4739438a8b2f86bf068642fc",
+   "db5838d29eefceadbb7f088f7de75d765dbaa58c",
    "support"
   ],
   "./CONTRIBUTING.md": [
    "cc9b0261662898aef7f4eed81741361c3f7c6467",
    "support"
   ],
   "./LICENSE": [
    "cfedb92777a36954d6e285461bf224cb6d2b5407",
--- a/testing/web-platform/tests/.travis.yml
+++ b/testing/web-platform/tests/.travis.yml
@@ -7,18 +7,16 @@ branches:
 addons:
   hosts:
     - web-platform.test
     - www.web-platform.test
     - www1.web-platform.test
     - 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
 install:
   - ./tools/ci/install.sh
 matrix:
   fast_finish: true
   include:
--- a/testing/web-platform/tests/tools/ci/check_stability.py
+++ b/testing/web-platform/tests/tools/ci/check_stability.py
@@ -167,32 +167,16 @@ def get_parser():
                         default="check_stability.ini")
     parser.add_argument("--rev",
                         action="store",
                         default=None,
                         help="Commit range to use")
     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
 
 
 def post_results(results, pr_number, iterations, product, url, status):
     """Post stability results to a given URL."""
     payload_results = []
@@ -296,20 +280,16 @@ def run(venv, wpt_args, **kwargs):
         os.makedirs(wpt_args.metadata_root)
     except OSError:
         pass
 
     setup_logging()
 
     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"):
         logger.info(markdown.format_comment_title(wpt_args.product))
 
         if pr is not None:
             deepen_checkout(kwargs["user"])
 
@@ -333,18 +313,16 @@ def run(venv, wpt_args, **kwargs):
             if tests_changed:
                 logger.debug("Tests changed:\n%s" % "".join(" * %s\n" % item for item in tests_changed))
 
             if files_affected:
                 logger.debug("Affected tests:\n%s" % "".join(" * %s\n" % item for item in files_affected))
 
             wpt_kwargs["test_list"] = list(tests_changed | files_affected)
 
-        set_default_args(wpt_kwargs)
-
         do_delayed_imports()
 
         wpt_kwargs["stability"] = True
         wpt_kwargs["prompt"] = False
         wpt_kwargs["install_browser"] = True
         wpt_kwargs["install"] = wpt_kwargs["product"].split(":")[0] == "firefox"
 
         wpt_kwargs = setup_wptrunner(venv, **wpt_kwargs)