From 8806d500ed69106935021c2a205f52cc08ac74d4 Mon Sep 17 00:00:00 2001 From: Paul Sauve Date: Tue, 4 Jul 2017 13:40:59 -0500 Subject: [PATCH] Use browserstack instead of saucelabs --- .travis.yml | 4 ++-- scripts/travis-bench.js | 46 ++++++++++++++--------------------------- 2 files changed, 17 insertions(+), 33 deletions(-) diff --git a/.travis.yml b/.travis.yml index d8b84c39b5..a432f9e121 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ sudo: required env: global: - BUILD_TIMEOUT=10000 - - SAUCE_USERNAME=PaulBGD + - BROWSER_USERNAME=PaulBGD cache: directories: - "$HOME/.yarn-cache" @@ -22,5 +22,5 @@ jobs: node_js: '6' addons: jwt: - - secure: paQL489vgNsfNpPW7cZw6lp0ludg05A3j1ZohzSnW/qMwdR4NEp2Dmpag+BTbB86dUK7uVEJCGQ0sASRpDXJjVuWfFLwUehuPwmREggy6O4TLpkRS3Evju2LdKZWF46bkJcf257R/CdfRD1ug1r83wQEzJCAje8mRyPDRucZy6oEYqy7Q+qs5HOfGDHP3giFnbiweqxjscP1et/+PA2wQmdnxTdIZTJ7qs0/vwD8bGlDz8qt/h9X4CAv2KgT0Mw1kYocC/pZExPgfHbbS7nYIWHtwl3I9SPgZ/Hd+cDu2F8AHVppeoJyFJ6N+lxlqfnPyShFzXrXD5phJwKjEfcQAb7VyWNYbX+kYKPd4RCoYP4RBaiSqR3NKz5lgJCRhPmaDxQD3aDkJ/Uc6uU++x+t6vdxEtPH8OgywoPJrAWtFmJppInR79KJstGe6K0/kwQ3eLWos+lDd3dxsQmMAOUqxmSREeY5trHSK/jb70VfafqMCEgvSVkyJNKUqqXivXg4NhxPKWCE62XoWtDxXq+0OzYZGMJx2pKjIrINo8Q8uFy+yjVyw6WUq7L/JStZU7mwotzUzLuoIisx/3W5qaw1atjd4e13M+NBx5G6f/RrGTWSma5iHmIjGgBmz1biPamNxGlHetfaonohRcYHGS8egeUHlWpyyQ20iSvtgiZBjAE= # sauce_access_token + - secure: cE7fNdXH1DeXd1SGdpAV7tocxcq+YxmSXr+wTTqyAuzIFTVbcEqmkaMylJP0ZZ8uUlLRAKavHFR7lswcbhHhHAc71c7RjP5njqmj86g0PVKMDHy78gyLb3NfinyHPOH4StSrUUTD67D4bXPi/NBgeLNDnIgDvfcP7op3sAn1Q1HRuMCVJ8gTNm3w72wmKpPX6lylapmSbt5N8dhRZNq2iohixnKP4uKSj/DCp1wPxJ7EO6GPpbiZFGZS3leON/mVTK2nXCpVgyqOOQ1yr4A5HnyiiAWamPTl8jblM0aWZPucgNWEiivcEJdKuSYgBQE3sHAun87wGaNGZNa8P2pOLGrmb3dZDIfRe5F8IQUySyDczXsQDLakhBCDRD3PAkGh7cnO0DKz3JMXHrcDVgzSE93M/E4HyYuf6Z9jWX4jc/Vi7MG7Eq+AtzRSrMb9sKXpntH+Gdn4JYr7GRhDZd+EcnvOJFIj97bU0IaDkLN0gWBfMYpTB3+Gm6cpj64IJ0iI2YLJH/IVF9p5T5Qh9wxoEpgos5sOpJddtQDyJ2Zk9SsKutcMKjUNXHpIkiOtfG2CxA3wPP//3QCZo7tTbhnGkuWunRiVvRBTvd3owlQbCwaDwv/+ibAAifyzi9ihYqGZ0BY8kY/YHHTG6wz5LqCtTVdJWErp6jIjhuxn10toZNU= # browser key - secure: BkFLjOmOLU9euAZT9H/9ezDu8s3HdvWr4fEyl0Ddgjjjna/onv1c1GQ9Xu7BG/xEa8o+oM2hXrNs+pdz2euA/pJh6fiYsc3b2XMAEytM/kg8fAUzc6YKK0wRe9HzOW0UnmULyWgqfU1mPaFN+N2TrBXDNq5cCGt+Dze+Oc6fxj/h93OWjcYgHQCTFdIPXKCfKARWqhKgIxhufge1mbdkgT8sQohMdF7sE9hBj2soimRWN1+EWpYBDSGC1rhvm07udFBwFLb2zHPLesOdOsPjNgv8Zm1A8srwNljmKbL7Z0cpJPmB/H/ZaR0tuBTPLZM1yd5f5TR6Y8yNeE7a04t/UtCoLRXw6yd4bYQxGWPjSywAB/ZX3Af0CoMrWGxe7CEJAzhvUcyUXhhQsPNo5ec/vwswDVmF+iDSEpo5IfOMw3tFAOPr7wqBHSNZx6NmHIX58h2yE3AOBozBo+Z9QbCI5fikQ91Okk0YKq9FkYABZNnZpbhxCmVPjzZuuIDZfuCulrIaKAz0WX03TJHKTTrUPc2hHAnjvk6pHXcUMc9qDFUrd5UaSsqskDBhSn/mViAt15wR3p5G2ZkDipIxGuGjvEE7MlEsWCH+OdNQtCcEX5USu3csXzUF8/OZ8B7P4ZZbL5heljNQ9sil4qQoB6IIvpGOIURcQssq+w3dF3BV3aU= # github_access_token diff --git a/scripts/travis-bench.js b/scripts/travis-bench.js index 6670a94123..280c9fed6b 100644 --- a/scripts/travis-bench.js +++ b/scripts/travis-bench.js @@ -3,12 +3,10 @@ const fs = require('fs'); const childProcess = require('child_process'); const fetch = require('node-fetch'); -const username = process.env.SAUCE_USERNAME; -const accessKey = process.env.SAUCE_ACCESS_KEY; +const username = process.env.BROWSER_USERNAME; +const accessKey = process.env.BROWSER_KEY; const build = process.env.TRAVIS_BUILD_NUMBER; const pullRequest = process.env.TRAVIS_PULL_REQUEST; -const tags = [ process.env.TRAVIS_NODE_VERSION, 'CI' ]; -const idleTimeout = 30; if (pullRequest === 'false') { console.log('Benchmark skipped.'); @@ -17,51 +15,37 @@ if (pullRequest === 'false') { const outputFile = path.join(process.cwd(), 'tmp', 'output.txt'); +const defaultCap = { + 'browserstack.user': username, + 'browserstack.key': accessKey, + build +}; + const args = [ `--capabilities=${JSON.stringify([ /* { browserName: 'safari', version: '10.0', platform: 'macOS 10.12', - username, - accessKey, - idleTimeout, - build, - tags, }, { browserName: 'internet explorer', version: '11.103', platform: 'Windows 10', - username, - accessKey, - idleTimeout, - build, - tags, }, */ { - browserName: 'firefox', - version: 'latest', - platform: 'Windows 10', - username, - accessKey, - idleTimeout, - build, - tags, + browserName: 'Firefox', + os: 'Windows', + os_version: '10', }, { browserName: 'chrome', - version: 'latest', - platform: 'Windows 10', - username, - accessKey, - idleTimeout, - build, - tags, + os: 'Windows', + os_version: '10', }, - ])}`, - `--server=http://${username}:${accessKey}@ondemand.saucelabs.com/wd/hub`, + ].map(cap => Object.assign(cap, defaultCap))}`, + `--server=http://hub-cloud.browserstack.com/wd/hub`, `--custom=${process.cwd()}`, `--output=${outputFile}`, `--iterations=15`,