Build: Use browserSets from testswarm config

It's already in jQuery's Jenkins node-testswarm config
(and set to the same value) but not used yet.

Reference it to make sure it keeps working in the future.

Closes gh-1452
(cherry picked from commit 1e7a1e811f7c9d624b2561ea3e2f34f80773ad0c)
(cherry picked from commit 258dbe3ae481b74c056e6445bd1aaaface9d6c48)

Conflicts:

	build/tasks/testswarm.js
(cherry picked from commit 1d30b8051b4d92dcd42cd856a1fbcc24a1ec42d0)

diff --git a/build/tasks/testswarm.js b/build/tasks/testswarm.js
index d724aafcc2729b8b71b9a264738f3b62db3c4613..558aac4e678113ca640b48525dd6c2cdef0ad886 100644 (file)
--- a/build/tasks/testswarm.js
+++ b/build/tasks/testswarm.js
@@ -61,7 +61,8 @@ function submit( commit, runs, configFile, extra, done ) {
                name: "Commit <a href='" + commitUrl + "'>" + commit.substr( 0, 10 ) + "</a>" + extra,
                runs: runs,
                runMax: config.runMax,
-               browserSets: ["popular-ui"]
+               browserSets: config.browserSets,
+               timeout: 1000 * 60 * 30
        }, function( error, passed ) {
                if ( error ) {
                        grunt.log.error( error );