Phedenskog has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/404918 )
Change subject: Move Internet Explorer tests to own test files. ...................................................................... Move Internet Explorer tests to own test files. By moving all IE tests to separate files, we can setup the new runs by only adding a extra job in Jenkins for the Linux agent. Bug: T175240 Change-Id: I786ea6153a26364c9880b314826695094a022d71 --- A scripts/batch/desktop-ie.txt M scripts/batch/desktop.txt A scripts/batch/second-view-desktop-ie.txt M scripts/batch/second-view-desktop.txt M test/rulethemall.sh 5 files changed, 47 insertions(+), 13 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/performance/WebPageTest refs/changes/18/404918/1 diff --git a/scripts/batch/desktop-ie.txt b/scripts/batch/desktop-ie.txt new file mode 100644 index 0000000..71ee925 --- /dev/null +++ b/scripts/batch/desktop-ie.txt @@ -0,0 +1,29 @@ +## This batch file contains runs testing Wikipedia desktop using WebPageTest +## for Internet Explorer 11. The IE tests is in it own file to make it +## easy to move to Linux test agents. + +# To run this you need to set the following environment variables: +# WMF_WPT_KEY - The secret API key for our WebPageTest instance +# STATSV_ENDPOINT - The endpoint of where we send the statsv data +# WPT_RUNS - The number of runs per test +# WMF_WPT_LOCATION - The AWS location to run the test example: us-west-1 + +# Example (make sure to change WMF_WPT_KEY) +# $ WMF_WPT_KEY=SECRET_KEY STATSV_ENDPOINT=http://localhost WPT_RUNS=1 WMF_WPT_LOCATION=us-west-1 bin/index.js --batch scripts/batch/desktop.txt + +--webPageTestKey <%WMF_WPT_KEY> --webPageTestHost wpt.wmftest.org --median SpeedIndex --location <%WMF_WPT_LOCATION>_IE11 --label ie11 --runs <%WPT_RUNS> --endpoint <%STATSV_ENDPOINT> --namespace webpagetest.enwiki.anonymous.Facebook --reporter statsv --first true https://en.wikipedia.org/wiki/Facebook + +--webPageTestKey <%WMF_WPT_KEY> --webPageTestHost wpt.wmftest.org --median SpeedIndex --location <%WMF_WPT_LOCATION>_IE11 --label ie11 --runs <%WPT_RUNS> --endpoint <%STATSV_ENDPOINT> --namespace webpagetest.enwiki.anonymous.Barack_Obama --reporter statsv --first true https://en.wikipedia.org/wiki/Barack_Obama + +# Test the portal page +--webPageTestKey <%WMF_WPT_KEY> --webPageTestHost wpt.wmftest.org --median SpeedIndex --location <%WMF_WPT_LOCATION>_IE11 --label ie11-portals --runs <%WPT_RUNS> --endpoint <%STATSV_ENDPOINT> --namespace webpagetest.portals.anonymous.wikipedia_org --reporter statsv --first true https://www.wikipedia.org/ + +--webPageTestKey <%WMF_WPT_KEY> --webPageTestHost wpt.wmftest.org --median SpeedIndex --location <%WMF_WPT_LOCATION>_IE11 --label ie11-portals-beta --runs <%WPT_RUNS> --endpoint <%STATSV_ENDPOINT> --namespace webpagetest.portals-beta.anonymous.wikipedia_org --reporter statsv --first true https://www.wikipedia.beta.wmflabs.org/ + +####### WIKIDATA + +--webPageTestKey <%WMF_WPT_KEY> --webPageTestHost wpt.wmftest.org --median SpeedIndex --location <%WMF_WPT_LOCATION>_IE11 --label ie11 --runs <%WPT_RUNS> --endpoint <%STATSV_ENDPOINT> --namespace webpagetest.wikidatawiki.anonymous.Main_Page --reporter statsv --first true https://www.wikidata.org/wiki/Wikidata:Main_Page + +--webPageTestKey <%WMF_WPT_KEY> --webPageTestHost wpt.wmftest.org --median SpeedIndex --location <%WMF_WPT_LOCATION>_IE11 --label ie11 --runs <%WPT_RUNS> --endpoint <%STATSV_ENDPOINT> --reporter statsv --namespace webpagetest.wikidatawiki.anonymous.Berlin --first true https://www.wikidata.org/wiki/Q64 + +--webPageTestKey <%WMF_WPT_KEY> --webPageTestHost wpt.wmftest.org --median SpeedIndex --location <%WMF_WPT_LOCATION>_IE11 --label ie11-beta --runs <%WPT_RUNS> --endpoint <%STATSV_ENDPOINT> --reporter statsv --namespace webpagetest.wikidatawiki-beta.anonymous.Italy --first true https://wikidata.beta.wmflabs.org/wiki/Q15905 diff --git a/scripts/batch/desktop.txt b/scripts/batch/desktop.txt index 51fa048..2151e69 100644 --- a/scripts/batch/desktop.txt +++ b/scripts/batch/desktop.txt @@ -1,4 +1,5 @@ ## This batch file contains runs testing Wikipedia desktop using WebPageTest +## for Chrome and Firefox. # To run this you need to set the following environment variables: # WMF_WPT_KEY - The secret API key for our WebPageTest instance @@ -12,14 +13,10 @@ # Test Facebook page --webPageTestKey <%WMF_WPT_KEY> --webPageTestHost wpt.wmftest.org --median SpeedIndex --location <%WMF_WPT_LOCATION>:Chrome --label chrome --runs <%WPT_RUNS> --endpoint <%STATSV_ENDPOINT> --namespace webpagetest.enwiki.anonymous.Facebook --reporter statsv --timeline true --bodies true https://en.wikipedia.org/wiki/Facebook ---webPageTestKey <%WMF_WPT_KEY> --webPageTestHost wpt.wmftest.org --median SpeedIndex --location <%WMF_WPT_LOCATION>_IE11 --label ie11 --runs <%WPT_RUNS> --endpoint <%STATSV_ENDPOINT> --namespace webpagetest.enwiki.anonymous.Facebook --reporter statsv --first true https://en.wikipedia.org/wiki/Facebook - --webPageTestKey <%WMF_WPT_KEY> --webPageTestHost wpt.wmftest.org --median SpeedIndex --location <%WMF_WPT_LOCATION>:Firefox --label ff --runs <%WPT_RUNS> --endpoint <%STATSV_ENDPOINT> --namespace webpagetest.enwiki.anonymous.Facebook --reporter statsv --first true https://en.wikipedia.org/wiki/Facebook # Test Barack Obama --webPageTestKey <%WMF_WPT_KEY> --webPageTestHost wpt.wmftest.org --median SpeedIndex --location <%WMF_WPT_LOCATION>:Chrome --label chrome --runs <%WPT_RUNS> --endpoint <%STATSV_ENDPOINT> --namespace webpagetest.enwiki.anonymous.Barack_Obama --reporter statsv --timeline true --bodies true https://en.wikipedia.org/wiki/Barack_Obama - ---webPageTestKey <%WMF_WPT_KEY> --webPageTestHost wpt.wmftest.org --median SpeedIndex --location <%WMF_WPT_LOCATION>_IE11 --label ie11 --runs <%WPT_RUNS> --endpoint <%STATSV_ENDPOINT> --namespace webpagetest.enwiki.anonymous.Barack_Obama --reporter statsv --first true https://en.wikipedia.org/wiki/Barack_Obama --webPageTestKey <%WMF_WPT_KEY> --webPageTestHost wpt.wmftest.org --median SpeedIndex --location <%WMF_WPT_LOCATION>:Firefox --label ff --runs <%WPT_RUNS> --endpoint <%STATSV_ENDPOINT> --namespace webpagetest.enwiki.anonymous.Barack_Obama --reporter statsv --first true https://en.wikipedia.org/wiki/Barack_Obama @@ -33,13 +30,11 @@ --webPageTestKey <%WMF_WPT_KEY> --webPageTestHost wpt.wmftest.org --median SpeedIndex --location <%WMF_WPT_LOCATION>:Firefox --label ff-portals --runs <%WPT_RUNS> --endpoint <%STATSV_ENDPOINT> --namespace webpagetest.portals.anonymous.wikipedia_org --reporter statsv --first true https://www.wikipedia.org/ ---webPageTestKey <%WMF_WPT_KEY> --webPageTestHost wpt.wmftest.org --median SpeedIndex --location <%WMF_WPT_LOCATION>_IE11 --label ie11-portals --runs <%WPT_RUNS> --endpoint <%STATSV_ENDPOINT> --namespace webpagetest.portals.anonymous.wikipedia_org --reporter statsv --first true https://www.wikipedia.org/ --webPageTestKey <%WMF_WPT_KEY> --webPageTestHost wpt.wmftest.org --median SpeedIndex --location <%WMF_WPT_LOCATION>:Chrome --label chrome-portals-beta --runs <%WPT_RUNS> --endpoint <%STATSV_ENDPOINT> --namespace webpagetest.portals-beta.anonymous.wikipedia_org --reporter statsv --first true https://www.wikipedia.beta.wmflabs.org/ --webPageTestKey <%WMF_WPT_KEY> --webPageTestHost wpt.wmftest.org --median SpeedIndex --location <%WMF_WPT_LOCATION>:Firefox --label ff-portals-beta --runs <%WPT_RUNS> --endpoint <%STATSV_ENDPOINT> --namespace webpagetest.portals-beta.anonymous.wikipedia_org --reporter statsv --first true https://www.wikipedia.beta.wmflabs.org/ ---webPageTestKey <%WMF_WPT_KEY> --webPageTestHost wpt.wmftest.org --median SpeedIndex --location <%WMF_WPT_LOCATION>_IE11 --label ie11-portals-beta --runs <%WPT_RUNS> --endpoint <%STATSV_ENDPOINT> --namespace webpagetest.portals-beta.anonymous.wikipedia_org --reporter statsv --first true https://www.wikipedia.beta.wmflabs.org/ ####### WIKIDATA @@ -55,8 +50,3 @@ --webPageTestKey <%WMF_WPT_KEY> --webPageTestHost wpt.wmftest.org --median SpeedIndex --location <%WMF_WPT_LOCATION>:Firefox --label ff-beta --reporter statsv --runs <%WPT_RUNS> --endpoint <%STATSV_ENDPOINT> --namespace webpagetest.wikidatawiki-beta.anonymous.Italy --first true https://wikidata.beta.wmflabs.org/wiki/Q15905 ---webPageTestKey <%WMF_WPT_KEY> --webPageTestHost wpt.wmftest.org --median SpeedIndex --location <%WMF_WPT_LOCATION>_IE11 --label ie11 --runs <%WPT_RUNS> --endpoint <%STATSV_ENDPOINT> --namespace webpagetest.wikidatawiki.anonymous.Main_Page --reporter statsv --first true https://www.wikidata.org/wiki/Wikidata:Main_Page - ---webPageTestKey <%WMF_WPT_KEY> --webPageTestHost wpt.wmftest.org --median SpeedIndex --location <%WMF_WPT_LOCATION>_IE11 --label ie11 --runs <%WPT_RUNS> --endpoint <%STATSV_ENDPOINT> --reporter statsv --namespace webpagetest.wikidatawiki.anonymous.Berlin --first true https://www.wikidata.org/wiki/Q64 - ---webPageTestKey <%WMF_WPT_KEY> --webPageTestHost wpt.wmftest.org --median SpeedIndex --location <%WMF_WPT_LOCATION>_IE11 --label ie11-beta --runs <%WPT_RUNS> --endpoint <%STATSV_ENDPOINT> --reporter statsv --namespace webpagetest.wikidatawiki-beta.anonymous.Italy --first true https://wikidata.beta.wmflabs.org/wiki/Q15905 diff --git a/scripts/batch/second-view-desktop-ie.txt b/scripts/batch/second-view-desktop-ie.txt new file mode 100644 index 0000000..9dc0373 --- /dev/null +++ b/scripts/batch/second-view-desktop-ie.txt @@ -0,0 +1,15 @@ +# This batch file contains runs testing Wikipedia the second page view, +# for Internet Explorer 11. The IE tests is in it own file to make it +# easy to move to Linux test agents. +# +# To run this you need to set the following environment variables: +# WMF_WPT_KEY - The secret API key for our WebPageTest instance +# STATSV_ENDPOINT - The endpoint of where we send the statsv data +# WPT_RUNS - The number of runs per test +# WMF_WPT_LOCATION - The AWS location to run the test example: us-west-1 + +# Example (make sure to change WMF_WPT_KEY) +# $ WMF_WPT_KEY=SECRET_KEY STATSV_ENDPOINT=http://localhost WPT_RUNS=1 WMF_WPT_LOCATION=us-west-1 bin/index.js --batch ./scripts/scripts/second-view-desktop.txt + + +--webPageTestKey <%WMF_WPT_KEY> --webPageTestHost wpt.wmftest.org --median SpeedIndex --location <%WMF_WPT_LOCATION>_IE11 --label ie-second-facebook --runs <%WPT_RUNS> --first true --endpoint <%STATSV_ENDPOINT> --namespace webpagetest.enwiki.anonymous.Facebook-second --reporter statsv ./scripts/wptscripts/second-view-desktop-enwiki-facebook.txt diff --git a/scripts/batch/second-view-desktop.txt b/scripts/batch/second-view-desktop.txt index d7d7dd8..dbeb80e 100644 --- a/scripts/batch/second-view-desktop.txt +++ b/scripts/batch/second-view-desktop.txt @@ -15,8 +15,6 @@ --webPageTestKey <%WMF_WPT_KEY> --webPageTestHost wpt.wmftest.org --median SpeedIndex --location <%WMF_WPT_LOCATION>:Firefox --label firefox-second-facebook --runs <%WPT_RUNS> --first true --endpoint <%STATSV_ENDPOINT> --namespace webpagetest.enwiki.anonymous.Facebook-second --reporter statsv ./scripts/wptscripts/second-view-desktop-enwiki-facebook.txt ---webPageTestKey <%WMF_WPT_KEY> --webPageTestHost wpt.wmftest.org --median SpeedIndex --location <%WMF_WPT_LOCATION>_IE11 --label ie-second-facebook --runs <%WPT_RUNS> --first true --endpoint <%STATSV_ENDPOINT> --namespace webpagetest.enwiki.anonymous.Facebook-second --reporter statsv ./scripts/wptscripts/second-view-desktop-enwiki-facebook.txt - --webPageTestKey <%WMF_WPT_KEY> --webPageTestHost wpt.wmftest.org --median SpeedIndex --location <%WMF_WPT_LOCATION>:Chrome --label chrome-second-elizabeth --runs <%WPT_RUNS> --first true --endpoint <%STATSV_ENDPOINT> --namespace webpagetest.enwiki.anonymous.Elizabeth-second --timeline true --bodies true --reporter statsv ./scripts/wptscripts/second-view-desktop-enwiki-elizabeth.txt --webPageTestKey <%WMF_WPT_KEY> --webPageTestHost wpt.wmftest.org --median SpeedIndex --location <%WMF_WPT_LOCATION>:Firefox --label firefox-second-elizabeth --runs <%WPT_RUNS> --first true --endpoint <%STATSV_ENDPOINT> --namespace webpagetest.enwiki.anonymous.Elizabeth-second --reporter statsv ./scripts/wptscripts/second-view-desktop-enwiki-elizabeth.txt diff --git a/test/rulethemall.sh b/test/rulethemall.sh index 23e480d..986b925 100755 --- a/test/rulethemall.sh +++ b/test/rulethemall.sh @@ -28,9 +28,11 @@ node bin/index.js --batch scripts/batch/asia.txt node bin/index.js --batch scripts/batch/mobile.txt node bin/index.js --batch scripts/batch/desktop.txt +node bin/index.js --batch scripts/batch/desktop-ie.txt node bin/index.js --batch scripts/batch/login-mobile.txt node bin/index.js --batch scripts/batch/login-desktop.txt node bin/index.js --batch scripts/batch/second-view-mobile.txt node bin/index.js --batch scripts/batch/second-view-desktop.txt +node bin/index.js --batch scripts/batch/second-view-desktop-ie.txt node bin/index.js --batch scripts/batch/mobile-wpt-org.txt node bin/index.js --batch scripts/batch/desktop-wpt-org.txt -- To view, visit https://gerrit.wikimedia.org/r/404918 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I786ea6153a26364c9880b314826695094a022d71 Gerrit-PatchSet: 1 Gerrit-Project: performance/WebPageTest Gerrit-Branch: master Gerrit-Owner: Phedenskog <phedens...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
