From d5dd1719b6809057c368aeb03b8948575f695c4a Mon Sep 17 00:00:00 2001 From: John Hill Date: Wed, 7 Aug 2019 11:48:12 -0400 Subject: [PATCH 1/2] Parameterize E2E Suite retries --- awx/ui/package.json | 3 +-- awx/ui/test/e2e/cluster/docker-compose.yml | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/awx/ui/package.json b/awx/ui/package.json index 5a1bbb822d..cc402c1d76 100644 --- a/awx/ui/package.json +++ b/awx/ui/package.json @@ -24,8 +24,7 @@ "test": "karma start test/spec/karma.spec.js", "jshint": "grunt jshint:source --no-color", "test:ci": "npm run test -- --single-run --reporter junit,dots --browsers=chromeHeadless", - "e2e": "./test/e2e/runner.js --config ./test/e2e/nightwatch.conf.js --suiteRetries=2", - "e2e-no-retry": "./test/e2e/runner.js --config ./test/e2e/nightwatch.conf.js", + "e2e": "./test/e2e/runner.js --config ./test/e2e/nightwatch.conf.js --suiteRetries=${E2E_RETRIES}", "headless-e2e": "./test/e2e/runner.js --config ./test/e2e/nightwatch.conf.js --env headless --suiteRetries=2", "unit": "karma start test/unit/karma.unit.js", "lint": "eslint .", diff --git a/awx/ui/test/e2e/cluster/docker-compose.yml b/awx/ui/test/e2e/cluster/docker-compose.yml index 3c2aa5ce7e..d40a85e551 100644 --- a/awx/ui/test/e2e/cluster/docker-compose.yml +++ b/awx/ui/test/e2e/cluster/docker-compose.yml @@ -38,4 +38,5 @@ services: environment: AWX_E2E_CLUSTER_HOST: hub AWX_E2E_CLUSTER_PORT: 4444 + E2E_RETRIES: ${E2E_RETRIES} DBUS_SESSION_BUS_ADDRESS: /dev/null From ce37bc98979582b1d72fe93148827d5e32299633 Mon Sep 17 00:00:00 2001 From: John Hill Date: Thu, 8 Aug 2019 10:44:56 -0400 Subject: [PATCH 2/2] remove static definition and move to pipelines --- awx/ui/package.json | 2 +- awx/ui/test/e2e/cluster/docker-compose.yml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/awx/ui/package.json b/awx/ui/package.json index cc402c1d76..706bb35fe6 100644 --- a/awx/ui/package.json +++ b/awx/ui/package.json @@ -24,7 +24,7 @@ "test": "karma start test/spec/karma.spec.js", "jshint": "grunt jshint:source --no-color", "test:ci": "npm run test -- --single-run --reporter junit,dots --browsers=chromeHeadless", - "e2e": "./test/e2e/runner.js --config ./test/e2e/nightwatch.conf.js --suiteRetries=${E2E_RETRIES}", + "e2e": "./test/e2e/runner.js --config ./test/e2e/nightwatch.conf.js", "headless-e2e": "./test/e2e/runner.js --config ./test/e2e/nightwatch.conf.js --env headless --suiteRetries=2", "unit": "karma start test/unit/karma.unit.js", "lint": "eslint .", diff --git a/awx/ui/test/e2e/cluster/docker-compose.yml b/awx/ui/test/e2e/cluster/docker-compose.yml index d40a85e551..3c2aa5ce7e 100644 --- a/awx/ui/test/e2e/cluster/docker-compose.yml +++ b/awx/ui/test/e2e/cluster/docker-compose.yml @@ -38,5 +38,4 @@ services: environment: AWX_E2E_CLUSTER_HOST: hub AWX_E2E_CLUSTER_PORT: 4444 - E2E_RETRIES: ${E2E_RETRIES} DBUS_SESSION_BUS_ADDRESS: /dev/null