mirror of
https://github.com/ansible/awx.git
synced 2026-02-26 23:46:05 -03:30
use launch_url to specify awx host for workers
This commit is contained in:
@@ -17,7 +17,7 @@ docker-compose \
|
|||||||
up --scale chrome=2 --scale firefox=0
|
up --scale chrome=2 --scale firefox=0
|
||||||
|
|
||||||
# run headlessly with multiple workers on the cluster
|
# run headlessly with multiple workers on the cluster
|
||||||
AWX_E2E_URL='https://awx:8043' AWX_E2E_WORKERS=2 npm --prefix awx/ui run e2e
|
AWX_E2E_LAUNCH_URL='https://awx:8043' AWX_E2E_WORKERS=2 npm --prefix awx/ui run e2e
|
||||||
```
|
```
|
||||||
|
|
||||||
**Note:** Unless overridden in [settings](settings.js), tests will run against `localhost:8043`.
|
**Note:** Unless overridden in [settings](settings.js), tests will run against `localhost:8043`.
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
module.exports = {
|
module.exports = {
|
||||||
url() {
|
url() {
|
||||||
return `${this.api.globals.awxURL}/#/activity_stream`
|
return `${this.api.globals.launch_url}/#/activity_stream`
|
||||||
},
|
},
|
||||||
elements: {
|
elements: {
|
||||||
title: '.List-titleText',
|
title: '.List-titleText',
|
||||||
|
|||||||
@@ -53,7 +53,7 @@ const listPanel = {
|
|||||||
|
|
||||||
module.exports = {
|
module.exports = {
|
||||||
url() {
|
url() {
|
||||||
return `${this.api.globals.awxURL}/#/credential_types`
|
return `${this.api.globals.launch_url}/#/credential_types`
|
||||||
},
|
},
|
||||||
sections: {
|
sections: {
|
||||||
header,
|
header,
|
||||||
|
|||||||
@@ -229,7 +229,7 @@ const details = _.merge({}, common, {
|
|||||||
|
|
||||||
module.exports = {
|
module.exports = {
|
||||||
url() {
|
url() {
|
||||||
return `${this.api.globals.awxURL}/#/credentials`
|
return `${this.api.globals.launch_url}/#/credentials`
|
||||||
},
|
},
|
||||||
sections: {
|
sections: {
|
||||||
header,
|
header,
|
||||||
|
|||||||
@@ -37,7 +37,7 @@ const smartInvDetails = createFormSection({
|
|||||||
|
|
||||||
module.exports = {
|
module.exports = {
|
||||||
url() {
|
url() {
|
||||||
return `${this.api.globals.awxURL}/#/inventories`;
|
return `${this.api.globals.launch_url}/#/inventories`;
|
||||||
},
|
},
|
||||||
sections: {
|
sections: {
|
||||||
header,
|
header,
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ const details = createFormSection({
|
|||||||
|
|
||||||
module.exports = {
|
module.exports = {
|
||||||
url() {
|
url() {
|
||||||
return `${this.api.globals.awxURL}/#/inventory_scripts`;
|
return `${this.api.globals.launch_url}/#/inventory_scripts`;
|
||||||
},
|
},
|
||||||
sections: {
|
sections: {
|
||||||
header,
|
header,
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
module.exports = {
|
module.exports = {
|
||||||
url() {
|
url() {
|
||||||
return `${this.api.globals.awxURL}/#/login`
|
return `${this.api.globals.launch_url}/#/login`
|
||||||
},
|
},
|
||||||
elements: {
|
elements: {
|
||||||
username: '#login-username',
|
username: '#login-username',
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ const details = createFormSection({
|
|||||||
|
|
||||||
module.exports = {
|
module.exports = {
|
||||||
url() {
|
url() {
|
||||||
return `${this.api.globals.awxURL}/#/notification_templates`;
|
return `${this.api.globals.launch_url}/#/notification_templates`;
|
||||||
},
|
},
|
||||||
sections: {
|
sections: {
|
||||||
header,
|
header,
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ const details = createFormSection({
|
|||||||
|
|
||||||
module.exports = {
|
module.exports = {
|
||||||
url() {
|
url() {
|
||||||
return `${this.api.globals.awxURL}/#/organizations`;
|
return `${this.api.globals.launch_url}/#/organizations`;
|
||||||
},
|
},
|
||||||
sections: {
|
sections: {
|
||||||
header,
|
header,
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ const details = createFormSection({
|
|||||||
|
|
||||||
module.exports = {
|
module.exports = {
|
||||||
url() {
|
url() {
|
||||||
return `${this.api.globals.awxURL}/#/projects`;
|
return `${this.api.globals.launch_url}/#/projects`;
|
||||||
},
|
},
|
||||||
sections: {
|
sections: {
|
||||||
header,
|
header,
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ const details = createFormSection({
|
|||||||
|
|
||||||
module.exports = {
|
module.exports = {
|
||||||
url() {
|
url() {
|
||||||
return `${this.api.globals.awxURL}/#/teams`;
|
return `${this.api.globals.launch_url}/#/teams`;
|
||||||
},
|
},
|
||||||
sections: {
|
sections: {
|
||||||
header,
|
header,
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ const details = createFormSection({
|
|||||||
|
|
||||||
module.exports = {
|
module.exports = {
|
||||||
url() {
|
url() {
|
||||||
return `${this.api.globals.awxURL}/#/templates`;
|
return `${this.api.globals.launch_url}/#/templates`;
|
||||||
},
|
},
|
||||||
sections: {
|
sections: {
|
||||||
header,
|
header,
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ const details = createFormSection({
|
|||||||
|
|
||||||
module.exports = {
|
module.exports = {
|
||||||
url() {
|
url() {
|
||||||
return `${this.api.globals.awxURL}/#/users`;
|
return `${this.api.globals.launch_url}/#/users`;
|
||||||
},
|
},
|
||||||
sections: {
|
sections: {
|
||||||
header,
|
header,
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ const AWX_E2E_USERNAME = process.env.AWX_E2E_USERNAME || 'awx-e2e';
|
|||||||
const AWX_E2E_PASSWORD = process.env.AWX_E2E_PASSWORD || 'password';
|
const AWX_E2E_PASSWORD = process.env.AWX_E2E_PASSWORD || 'password';
|
||||||
const AWX_E2E_SELENIUM_HOST = process.env.AWX_E2E_SELENIUM_HOST || 'localhost';
|
const AWX_E2E_SELENIUM_HOST = process.env.AWX_E2E_SELENIUM_HOST || 'localhost';
|
||||||
const AWX_E2E_SELENIUM_PORT = process.env.AWX_E2E_SELENIUM_PORT || 4444;
|
const AWX_E2E_SELENIUM_PORT = process.env.AWX_E2E_SELENIUM_PORT || 4444;
|
||||||
|
const AWX_E2E_LAUNCH_URL = process.env.AWX_E2E_LAUNCH_URL || AWX_E2E_URL;
|
||||||
const AWX_E2E_TIMEOUT_SHORT = process.env.AWX_E2E_TIMEOUT_SHORT || 1000;
|
const AWX_E2E_TIMEOUT_SHORT = process.env.AWX_E2E_TIMEOUT_SHORT || 1000;
|
||||||
const AWX_E2E_TIMEOUT_MEDIUM = process.env.AWX_E2E_TIMEOUT_MEDIUM || 5000;
|
const AWX_E2E_TIMEOUT_MEDIUM = process.env.AWX_E2E_TIMEOUT_MEDIUM || 5000;
|
||||||
const AWX_E2E_TIMEOUT_LONG = process.env.AWX_E2E_TIMEOUT_LONG || 10000;
|
const AWX_E2E_TIMEOUT_LONG = process.env.AWX_E2E_TIMEOUT_LONG || 10000;
|
||||||
@@ -20,6 +21,7 @@ module.exports = {
|
|||||||
retryAssertionTimeout: AWX_E2E_TIMEOUT_MEDIUM,
|
retryAssertionTimeout: AWX_E2E_TIMEOUT_MEDIUM,
|
||||||
selenium_host: AWX_E2E_SELENIUM_HOST,
|
selenium_host: AWX_E2E_SELENIUM_HOST,
|
||||||
selenium_port: AWX_E2E_SELENIUM_PORT,
|
selenium_port: AWX_E2E_SELENIUM_PORT,
|
||||||
|
launch_url: AWX_E2E_LAUNCH_URL,
|
||||||
shortTimeout: AWX_E2E_TIMEOUT_SHORT,
|
shortTimeout: AWX_E2E_TIMEOUT_SHORT,
|
||||||
waitForConditionTimeout: AWX_E2E_TIMEOUT_MEDIUM,
|
waitForConditionTimeout: AWX_E2E_TIMEOUT_MEDIUM,
|
||||||
test_workers: {
|
test_workers: {
|
||||||
|
|||||||
Reference in New Issue
Block a user