jenkins-bot has submitted this change and it was merged. Change subject: Add test runs for test2, beta and iPhone ......................................................................
Add test runs for test2, beta and iPhone Discussed with Ori last week what to test and we wanted to add test for test2 and beta. However beta is not SPDY (and https) so I haven't added tests for logged in users on that one. And not sure if it actually will help us as long as it isn't running SPDY. Merge this after https://gerrit.wikimedia.org/r/249363 so that tests will not timeout. Also added one run for iPhone 6. Let's keep it that way until we see that it actually works (guess it could be quite busy). I love having metrics for a new iOS device! Bug: T110230 Change-Id: I1dfe4ebde653fc0082b9d88b8d42dec824b92395 --- M scripts/batch/desktop-wpt-org.txt M scripts/batch/desktop.txt M scripts/batch/login-desktop.txt M scripts/batch/login-mobile.txt M scripts/batch/mobile-wpt-org.txt M scripts/batch/mobile.txt A scripts/wptscripts/login-desktop-test2wiki-washington.txt A scripts/wptscripts/login-mobile-test2wiki-washington.txt M test/rulethemall.sh 9 files changed, 52 insertions(+), 1 deletion(-) Approvals: Krinkle: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/batch/desktop-wpt-org.txt b/scripts/batch/desktop-wpt-org.txt index 12628fa..bbc1c3d 100644 --- a/scripts/batch/desktop-wpt-org.txt +++ b/scripts/batch/desktop-wpt-org.txt @@ -11,4 +11,4 @@ # nodejs installed), just make sure to change the value of the WebPageTest key: # $ WPT_ORG_WPT_KEY=SECRET_KEY STATSV_ENDPOINT=http://localhost WPT_ORG_RUNS=1 bin/index.js --batch ./scripts/batch/desktop-wpt-org.txt ---webPageTestKey <%WPT_ORG_WPT_KEY> --webPageTestHost www.webpagetest.org --median SpeedIndex --location Dulles:Chrome --label chrome-dulles --runs <%WPT_ORG_RUNS> --endpoint <%STATSV_ENDPOINT> --namespace webpagetest.enwiki.BlankPage --timeout 2400 https://en.wikipedia.org/wiki/Special:BlankPage +--webPageTestKey <%WPT_ORG_WPT_KEY> --webPageTestHost www.webpagetest.org --median SpeedIndex --location Dulles:Chrome --label chrome-dulles --runs <%WPT_ORG_RUNS> --endpoint <%STATSV_ENDPOINT> --namespace webpagetest.enwiki.anonymous.BlankPage --timeout 2400 --reporter statsv https://en.wikipedia.org/wiki/Special:BlankPage diff --git a/scripts/batch/desktop.txt b/scripts/batch/desktop.txt index 703b701..93a15a9 100644 --- a/scripts/batch/desktop.txt +++ b/scripts/batch/desktop.txt @@ -20,6 +20,10 @@ --webPageTestKey <%WMF_WPT_KEY> --webPageTestHost wpt.wmftest.org --median SpeedIndex --location <%WMF_WPT_LOCATION>:Chrome --label chrome-portals --runs <%WPT_RUNS> --endpoint <%STATSV_ENDPOINT> --namespace webpagetest.portals.anonymous.wikipedia_org --reporter statsv https://www.wikipedia.org/ +--webPageTestKey <%WMF_WPT_KEY> --webPageTestHost wpt.wmftest.org --median SpeedIndex --location <%WMF_WPT_LOCATION>:Chrome --label chrome --runs <%WPT_RUNS> --endpoint <%STATSV_ENDPOINT> --reporter statsv --namespace webpagetest.enwiki-beta.anonymous.Chamber_music http://en.wikipedia.beta.wmflabs.org/wiki/Chamber_music + +--webPageTestKey <%WMF_WPT_KEY> --webPageTestHost wpt.wmftest.org --median SpeedIndex --location <%WMF_WPT_LOCATION>:Chrome --label chrome --runs <%WPT_RUNS> --endpoint <%STATSV_ENDPOINT> --reporter statsv --namespace webpagetest.test2wiki.anonymous.Washington_DC https://test2.wikipedia.org/wiki/Washington,_D.C. + # Collect metrics using Firefox --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.Main_Page --reporter statsv https://en.wikipedia.org/wiki/Main_Page @@ -31,7 +35,14 @@ --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 https://www.wikipedia.org/ +--webPageTestKey <%WMF_WPT_KEY> --webPageTestHost wpt.wmftest.org --median SpeedIndex --location <%WMF_WPT_LOCATION>:Firefox --label ff --runs <%WPT_RUNS> --endpoint <%STATSV_ENDPOINT> --reporter statsv --namespace webpagetest.enwiki-beta.anonymous.Chamber_music http://en.wikipedia.beta.wmflabs.org/wiki/Chamber_music + +--webPageTestKey <%WMF_WPT_KEY> --webPageTestHost wpt.wmftest.org --median SpeedIndex --location <%WMF_WPT_LOCATION>:Firefox --label ff --reporter statsv --runs <%WPT_RUNS> --endpoint <%STATSV_ENDPOINT> --namespace webpagetest.test2wiki.anonymous.Washington_DC https://test2.wikipedia.org/wiki/Washington,_D.C. + # Collect metrics using IE 11 (running windows 7 = no SPDY) + +--webPageTestKey <%WMF_WPT_KEY> --webPageTestHost wpt.wmftest.org --median SpeedIndex --location <%WMF_WPT_LOCATION>_IE11 --label ie11-base --runs <%WPT_RUNS> --endpoint <%STATSV_ENDPOINT> --namespace webpagetest.enwiki.anonymous.BlankPage --reporter statsv https://en.wikipedia.org/wiki/Special:BlankPage + --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.Main_Page --reporter statsv https://en.wikipedia.org/wiki/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> --namespace webpagetest.enwiki.anonymous.Facebook --reporter statsv https://en.wikipedia.org/wiki/Facebook @@ -41,3 +52,7 @@ --webPageTestKey <%WMF_WPT_KEY> --webPageTestHost wpt.wmftest.org --median SpeedIndex --location <%WMF_WPT_LOCATION>_IE11 --label ie11-base --runs <%WPT_RUNS> --endpoint <%STATSV_ENDPOINT> --namespace webpagetest.enwiki.anonymous.BlankPage --reporter statsv https://en.wikipedia.org/wiki/Special:BlankPage --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 https://www.wikipedia.org/ + +--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.enwiki-beta.anonymous.Chamber_music http://en.wikipedia.beta.wmflabs.org/wiki/Chamber_music + +--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.test2wiki.anonymous.Washington_DC https://test2.wikipedia.org/wiki/Washington,_D.C. diff --git a/scripts/batch/login-desktop.txt b/scripts/batch/login-desktop.txt index 34ab54f..17f5d95 100644 --- a/scripts/batch/login-desktop.txt +++ b/scripts/batch/login-desktop.txt @@ -14,3 +14,5 @@ # $ WMF_WPT_KEY=SECRET_KEY STATSV_ENDPOINT=http://localhost WPT_RUNS=1 WPT_USER=wptuser WPT_USER_PASSWORD=SECRET_PASSWORD WMF_WPT_LOCATION=us-west-1 bin/index.js --batch ./scripts/batch/login-desktop.txt --webPageTestKey <%WMF_WPT_KEY> --median SpeedIndex --webPageTestHost wpt.wmftest.org --location <%WMF_WPT_LOCATION>:Chrome --label chrome-authenticated --runs <%WPT_RUNS> --first true --endpoint <%STATSV_ENDPOINT> --namespace webpagetest.enwiki.authenticated.Facebook --reporter statsv ./scripts/wptscripts/login-desktop-enwiki-facebook.txt + +--webPageTestKey <%WMF_WPT_KEY> --median SpeedIndex --webPageTestHost wpt.wmftest.org --location <%WMF_WPT_LOCATION>:Chrome --label chrome-authenticated --reporter statsv --runs <%WPT_RUNS> --first true --endpoint <%STATSV_ENDPOINT> --namespace webpagetest.test2wiki.authenticated.Washington_DC ./scripts/wptscripts/login-desktop-test2wiki-washington.txt diff --git a/scripts/batch/login-mobile.txt b/scripts/batch/login-mobile.txt index 26c8c65..8fee212 100644 --- a/scripts/batch/login-mobile.txt +++ b/scripts/batch/login-mobile.txt @@ -14,3 +14,5 @@ # $ WMF_WPT_KEY=SECRET_KEY STATSV_ENDPOINT=http://localhost WPT_RUNS=1 WPT_USER=wptuser WPT_USER_PASSWORD=SECRET_PASSWORD WMF_WPT_LOCATION=us-west-1 bin/index.js --batch ./scripts/batch/login-mobile.txt --webPageTestKey <%WMF_WPT_KEY> --webPageTestHost wpt.wmftest.org --median SpeedIndex --location <%WMF_WPT_LOCATION>:Chrome --label chrome-mobile-authenticated --runs <%WPT_MOBILE_RUNS> --first true --emulateMobile true --endpoint <%STATSV_ENDPOINT> --connectivity 3GFast --namespace webpagetest.enwiki-mobile.authenticated.Facebook --reporter statsv ./scripts/wptscripts/login-mobile-enwiki-facebook.txt + +--webPageTestKey <%WMF_WPT_KEY> --webPageTestHost wpt.wmftest.org --median SpeedIndex --location <%WMF_WPT_LOCATION>:Chrome --label chrome-mobile-authenticated --runs <%WPT_MOBILE_RUNS> --first true --emulateMobile true --endpoint <%STATSV_ENDPOINT> --reporter statsv --connectivity 3GFast --namespace webpagetest.test2wiki-mobile.authenticated.Washington_DC ./scripts/wptscripts/login-mobile-test2wiki-washington.txt diff --git a/scripts/batch/mobile-wpt-org.txt b/scripts/batch/mobile-wpt-org.txt index 64d7042..96a4b42 100644 --- a/scripts/batch/mobile-wpt-org.txt +++ b/scripts/batch/mobile-wpt-org.txt @@ -12,3 +12,5 @@ # $ WPT_ORG_WPT_KEY=SECRET_KEY STATSV_ENDPOINT=http://localhost WPT_ORG_MOBILE_RUNS=1 bin/index.js --batch ./scripts/batch/mobile-wpt-org.txt --webPageTestKey <%WPT_ORG_WPT_KEY> --webPageTestHost www.webpagetest.org --median SpeedIndex --location Dulles_MotoG:Motorola G - Chrome --label chrome-m --runs <%WPT_ORG_MOBILE_RUNS> --endpoint <%STATSV_ENDPOINT> --connectivity 3GFast --namespace webpagetest.enwiki-mobile.anonymous.Facebook --timeout 2400 --reporter statsv https://en.m.wikipedia.org/wiki/Facebook + +--webPageTestKey <%WPT_ORG_WPT_KEY> --webPageTestHost www.webpagetest.org --median SpeedIndex --location Dulles_iPhone6 --label iphone6 --runs 1 --endpoint <%STATSV_ENDPOINT> --connectivity 3GFast --namespace webpagetest.enwiki-mobile.anonymous.Facebook --timeout 2400 --reporter statsv https://en.m.wikipedia.org/wiki/Facebook diff --git a/scripts/batch/mobile.txt b/scripts/batch/mobile.txt index 5082a03..9aa7f6a 100644 --- a/scripts/batch/mobile.txt +++ b/scripts/batch/mobile.txt @@ -18,3 +18,7 @@ --webPageTestKey <%WMF_WPT_KEY> --webPageTestHost wpt.wmftest.org --median SpeedIndex --location <%WMF_WPT_LOCATION>:Chrome --label chrome-emulated-m --runs <%WPT_MOBILE_RUNS> --endpoint <%STATSV_ENDPOINT> --namespace webpagetest.test2wiki-mobile.anonymous.signup --emulateMobile true --connectivity 3GFast --reporter statsv https://test2.m.wikipedia.org/w/index.php?title=Special:UserLogin&type=signup --webPageTestKey <%WMF_WPT_KEY> --webPageTestHost wpt.wmftest.org --median SpeedIndex --location <%WMF_WPT_LOCATION>:Chrome --label chrome-emulated-m --runs <%WPT_MOBILE_RUNS> --endpoint <%STATSV_ENDPOINT> --namespace webpagetest.enwiki-mobile.anonymous.BlankPage --emulateMobile true --connectivity 3GFast --reporter statsv https://en.m.wikipedia.org/wiki/Special:BlankPage + +--webPageTestKey <%WMF_WPT_KEY> --webPageTestHost wpt.wmftest.org --median SpeedIndex --location <%WMF_WPT_LOCATION>:Chrome --label chrome-emulated-m --runs <%WPT_MOBILE_RUNS> --endpoint <%STATSV_ENDPOINT> --namespace webpagetest.enwiki-beta-mobile.anonymous.Chamber_music --reporter statsv --emulateMobile true --connectivity 3GFast http://en.m.wikipedia.beta.wmflabs.org/wiki/Chamber_music + +--webPageTestKey <%WMF_WPT_KEY> --webPageTestHost wpt.wmftest.org --median SpeedIndex --location <%WMF_WPT_LOCATION>:Chrome --label chrome-emulated-m --runs <%WPT_MOBILE_RUNS> --reporter statsv --endpoint <%STATSV_ENDPOINT> --namespace webpagetest.test2wiki-mobile.anonymous.Washington_DC --emulateMobile true --connectivity 3GFast https://test2.wikipedia.org/wiki/Washington,_D.C. diff --git a/scripts/wptscripts/login-desktop-test2wiki-washington.txt b/scripts/wptscripts/login-desktop-test2wiki-washington.txt new file mode 100644 index 0000000..cad9ff1 --- /dev/null +++ b/scripts/wptscripts/login-desktop-test2wiki-washington.txt @@ -0,0 +1,12 @@ +// The login page +logData 0 +navigate https://test2.wikipedia.org/w/index.php?title=Special:UserLogin&returnto=Main+Page + +// Log in the user +setValue name=wpName <%WPT_USER> +setValue name=wpPassword <%WPT_USER_PASSWORD> +submitForm name=userlogin + +// This is the URL that we want to measure as a logged in user +logData 1 +navigate https://test2.wikipedia.org/wiki/Washington,_D.C. diff --git a/scripts/wptscripts/login-mobile-test2wiki-washington.txt b/scripts/wptscripts/login-mobile-test2wiki-washington.txt new file mode 100644 index 0000000..5d0d4c8 --- /dev/null +++ b/scripts/wptscripts/login-mobile-test2wiki-washington.txt @@ -0,0 +1,12 @@ +// The login page +logData 0 +navigate https://test2.m.wikipedia.org/w/index.php?title=Special:UserLogin&returnto=Main+Page + +// Log in the user +setValue name=wpName <%WPT_USER> +setValue name=wpPassword <%WPT_USER_PASSWORD> +submitForm name=userlogin + +// This is the URL that we want to measure as a logged in user +logData 1 +navigate https://test2.wikipedia.org/wiki/Washington,_D.C. diff --git a/test/rulethemall.sh b/test/rulethemall.sh index dc3f596..00671c1 100755 --- a/test/rulethemall.sh +++ b/test/rulethemall.sh @@ -16,6 +16,7 @@ export WPT_MOBILE_RUNS=1 export WPT_RUNS=1 export WPT_ORG_MOBILE_RUNS=1 +export WPT_ORG_RUNS=1 export WMF_WPT_LOCATION=us-west-1 [ -z "$WMF_WPT_KEY" ] && echo "Missing the WMF_WPT_KEY" && exit 1; @@ -30,3 +31,4 @@ node bin/index.js --batch scripts/batch/second-view-desktop.txt node bin/index.js --batch scripts/batch/second-view-mobile.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/242121 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1dfe4ebde653fc0082b9d88b8d42dec824b92395 Gerrit-PatchSet: 9 Gerrit-Project: performance/WebPageTest Gerrit-Branch: master Gerrit-Owner: Phedenskog <[email protected]> Gerrit-Reviewer: Krinkle <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
