Improving the configuration by overriding the node hosts outside the json file.
This commit is contained in:
Dave Hunt
Родитель
4d906ba3c6
Коммит
5bba290073
|
|
@ -43,6 +43,8 @@
|
|||
<arg value="webdriver"/>
|
||||
<arg value="-hub"/>
|
||||
<arg value="http://${hub.host}:${hub.port}/grid/register"/>
|
||||
<arg value="-host"/>
|
||||
<arg value="${node.host}"/>
|
||||
<arg value="-nodeConfig"/>
|
||||
<arg value="${node.configuration.file}"/>
|
||||
</java>
|
||||
|
|
@ -69,6 +71,8 @@
|
|||
<arg value="rc"/>
|
||||
<arg value="-hub"/>
|
||||
<arg value="http://${hub.host}:${hub.port}/grid/register"/>
|
||||
<arg value="-host"/>
|
||||
<arg value="${node.host}"/>
|
||||
<arg value="-nodeConfig"/>
|
||||
<arg value="${node.configuration.file}"/>
|
||||
<arg value="-firefoxProfileTemplate"/>
|
||||
|
|
@ -86,6 +90,8 @@
|
|||
<arg value="rc"/>
|
||||
<arg value="-hub"/>
|
||||
<arg value="http://${hub.host}:${hub.port}/grid/register"/>
|
||||
<arg value="-host"/>
|
||||
<arg value="${node.host}"/>
|
||||
<arg value="-nodeConfig"/>
|
||||
<arg value="${node.configuration.file}"/>
|
||||
<arg line="${rc.arguments}"/>
|
||||
|
|
|
|||
|
|
@ -1,28 +0,0 @@
|
|||
{
|
||||
"capabilities":
|
||||
[
|
||||
{
|
||||
"browserName": "Firefox 3.6 on Mac OS X",
|
||||
"maxInstances": 5
|
||||
}, {
|
||||
"browserName": "Firefox 4 on Mac OS X",
|
||||
"maxInstances": 5
|
||||
}, {
|
||||
"browserName": "Firefox 5 on Mac OS X",
|
||||
"maxInstances": 5
|
||||
}, {
|
||||
"browserName": "Firefox Beta on Mac OS X",
|
||||
"maxInstances": 5
|
||||
}, {
|
||||
"browserName": "Firefox Aurora on Mac OS X",
|
||||
"maxInstances": 5
|
||||
}, {
|
||||
"browserName": "Firefox Nightly on Mac OS X",
|
||||
"maxInstances": 5
|
||||
}
|
||||
],
|
||||
"configuration": {
|
||||
"host": "qa-selenium.mv.mozilla.com",
|
||||
"timeout": 180000
|
||||
}
|
||||
}
|
||||
|
|
@ -1 +1 @@
|
|||
node.configuration.file=qa-selenium.json
|
||||
node.host=qa-selenium.mv.mozilla.com
|
||||
|
|
|
|||
|
|
@ -1,28 +0,0 @@
|
|||
{
|
||||
"capabilities":
|
||||
[
|
||||
{
|
||||
"browserName": "Firefox 3.6 on Mac OS X",
|
||||
"maxInstances": 5
|
||||
}, {
|
||||
"browserName": "Firefox 4 on Mac OS X",
|
||||
"maxInstances": 5
|
||||
}, {
|
||||
"browserName": "Firefox 5 on Mac OS X",
|
||||
"maxInstances": 5
|
||||
}, {
|
||||
"browserName": "Firefox Beta on Mac OS X",
|
||||
"maxInstances": 5
|
||||
}, {
|
||||
"browserName": "Firefox Aurora on Mac OS X",
|
||||
"maxInstances": 5
|
||||
}, {
|
||||
"browserName": "Firefox Nightly on Mac OS X",
|
||||
"maxInstances": 5
|
||||
}
|
||||
],
|
||||
"configuration": {
|
||||
"host": "qa-selenium2.mv.mozilla.com",
|
||||
"timeout": 180000
|
||||
}
|
||||
}
|
||||
|
|
@ -1 +1 @@
|
|||
node.configuration.file=qa-selenium2.json
|
||||
node.host=qa-selenium2.mv.mozilla.com
|
||||
|
|
|
|||
|
|
@ -1,28 +0,0 @@
|
|||
{
|
||||
"capabilities":
|
||||
[
|
||||
{
|
||||
"browserName": "Firefox 3.6 on Mac OS X",
|
||||
"maxInstances": 5
|
||||
}, {
|
||||
"browserName": "Firefox 4 on Mac OS X",
|
||||
"maxInstances": 5
|
||||
}, {
|
||||
"browserName": "Firefox 5 on Mac OS X",
|
||||
"maxInstances": 5
|
||||
}, {
|
||||
"browserName": "Firefox Beta on Mac OS X",
|
||||
"maxInstances": 5
|
||||
}, {
|
||||
"browserName": "Firefox Aurora on Mac OS X",
|
||||
"maxInstances": 5
|
||||
}, {
|
||||
"browserName": "Firefox Nightly on Mac OS X",
|
||||
"maxInstances": 5
|
||||
}
|
||||
],
|
||||
"configuration": {
|
||||
"host": "qa-selenium3.mv.mozilla.com",
|
||||
"timeout": 180000
|
||||
}
|
||||
}
|
||||
|
|
@ -1 +1 @@
|
|||
node.configuration.file=qa-selenium3.json
|
||||
node.host=qa-selenium3.mv.mozilla.com
|
||||
|
|
|
|||
|
|
@ -1,28 +0,0 @@
|
|||
{
|
||||
"capabilities":
|
||||
[
|
||||
{
|
||||
"browserName": "Firefox 3.6 on Mac OS X",
|
||||
"maxInstances": 5
|
||||
}, {
|
||||
"browserName": "Firefox 4 on Mac OS X",
|
||||
"maxInstances": 5
|
||||
}, {
|
||||
"browserName": "Firefox 5 on Mac OS X",
|
||||
"maxInstances": 5
|
||||
}, {
|
||||
"browserName": "Firefox Beta on Mac OS X",
|
||||
"maxInstances": 5
|
||||
}, {
|
||||
"browserName": "Firefox Aurora on Mac OS X",
|
||||
"maxInstances": 5
|
||||
}, {
|
||||
"browserName": "Firefox Nightly on Mac OS X",
|
||||
"maxInstances": 5
|
||||
}
|
||||
],
|
||||
"configuration": {
|
||||
"host": "qa-selenium4.mv.mozilla.com",
|
||||
"timeout": 180000
|
||||
}
|
||||
}
|
||||
|
|
@ -1 +1 @@
|
|||
node.configuration.file=qa-selenium4.json
|
||||
node.host=qa-selenium4.mv.mozilla.com
|
||||
|
|
|
|||
|
|
@ -1,28 +0,0 @@
|
|||
{
|
||||
"capabilities":
|
||||
[
|
||||
{
|
||||
"browserName": "Firefox 3.6 on Mac OS X",
|
||||
"maxInstances": 5
|
||||
}, {
|
||||
"browserName": "Firefox 4 on Mac OS X",
|
||||
"maxInstances": 5
|
||||
}, {
|
||||
"browserName": "Firefox 5 on Mac OS X",
|
||||
"maxInstances": 5
|
||||
}, {
|
||||
"browserName": "Firefox Beta on Mac OS X",
|
||||
"maxInstances": 5
|
||||
}, {
|
||||
"browserName": "Firefox Aurora on Mac OS X",
|
||||
"maxInstances": 5
|
||||
}, {
|
||||
"browserName": "Firefox Nightly on Mac OS X",
|
||||
"maxInstances": 5
|
||||
}
|
||||
],
|
||||
"configuration": {
|
||||
"host": "qa-selenium5.mv.mozilla.com",
|
||||
"timeout": 180000
|
||||
}
|
||||
}
|
||||
|
|
@ -1 +1 @@
|
|||
node.configuration.file=qa-selenium5.json
|
||||
node.host=qa-selenium5.mv.mozilla.com
|
||||
|
|
|
|||
|
|
@ -1,46 +0,0 @@
|
|||
{
|
||||
"capabilities":
|
||||
[
|
||||
{
|
||||
"browserName": "firefox",
|
||||
"version": "3.6",
|
||||
"firefox_binary": "/Applications/Firefox 3.6.app/Contents/MacOS/firefox-bin",
|
||||
"platform": "MAC",
|
||||
"maxInstances": 5
|
||||
}, {
|
||||
"browserName": "firefox",
|
||||
"version": "4",
|
||||
"firefox_binary": "/Applications/Firefox 4.app/Contents/MacOS/firefox-bin",
|
||||
"platform": "MAC",
|
||||
"maxInstances": 5
|
||||
}, {
|
||||
"browserName": "firefox",
|
||||
"version": "5",
|
||||
"firefox_binary": "/Applications/Firefox 5.app/Contents/MacOS/firefox-bin",
|
||||
"platform": "MAC",
|
||||
"maxInstances": 5
|
||||
}, {
|
||||
"browserName": "firefox",
|
||||
"version": "beta",
|
||||
"firefox_binary": "/Applications/Firefox Beta.app/Contents/MacOS/firefox-bin",
|
||||
"platform": "MAC",
|
||||
"maxInstances": 5
|
||||
}, {
|
||||
"browserName": "firefox",
|
||||
"version": "aurora",
|
||||
"firefox_binary": "/Applications/Aurora.app/Contents/MacOS/firefox-bin",
|
||||
"platform": "MAC",
|
||||
"maxInstances": 5
|
||||
}, {
|
||||
"browserName": "firefox",
|
||||
"version": "nightly",
|
||||
"firefox_binary": "/Applications/Nightly.app/Contents/MacOS/firefox-bin",
|
||||
"platform": "MAC",
|
||||
"maxInstances": 5
|
||||
}
|
||||
],
|
||||
"configuration": {
|
||||
"host": "qa-selenium6.mv.mozilla.com",
|
||||
"timeout": 180000
|
||||
}
|
||||
}
|
||||
|
|
@ -1 +1,2 @@
|
|||
node.configuration.file=qa-selenium6.json
|
||||
node.host=qa-selenium6.mv.mozilla.com
|
||||
node.configuration.file=wd-mac.json
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче