diff options
author | ilanap <ilanap@amdocs.com> | 2019-02-06 11:36:35 +0200 |
---|---|---|
committer | Avi Gaffa <avi.gaffa@amdocs.com> | 2019-02-07 08:39:42 +0000 |
commit | b551a05893bcf6ac1ff3679d3354ba106fef24bb (patch) | |
tree | 1ac0d1538ccf5a6fdfa4893b14e9ca2c570503bc | |
parent | 705419d32937600738b2422913beee3641c9716f (diff) |
Fixes to docker run
with summary report for cucumber to be inserted into emails
Change-Id: I2b65410a7dddf7cfe2f897db43d77809eaf9cb9e
Issue-ID: SDC-2028
Signed-off-by: ilanap <ilanap@amdocs.com>
-rw-r--r-- | cucumber-js-test-apis-ci/cucumber.js | 2 | ||||
-rw-r--r-- | cucumber-js-test-apis-ci/docker_run.sh | 6 | ||||
-rw-r--r-- | cucumber-js-test-apis-ci/plugins/README.md | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/cucumber-js-test-apis-ci/cucumber.js b/cucumber-js-test-apis-ci/cucumber.js index 4ade9b1cb3..0eb79d3ac5 100644 --- a/cucumber-js-test-apis-ci/cucumber.js +++ b/cucumber-js-test-apis-ci/cucumber.js @@ -1,3 +1,3 @@ module.exports = { - "default" : "--require stepDefinitions -f summary -r ./features -f json:report/report.json" + "default" : "--require stepDefinitions -f summary -r ./features -f summary:report/summary.txt -f json:report/report.json --format-options '{\"colorsEnabled\": false}'" };
\ No newline at end of file diff --git a/cucumber-js-test-apis-ci/docker_run.sh b/cucumber-js-test-apis-ci/docker_run.sh index 0bfbd11d54..95cdab302a 100644 --- a/cucumber-js-test-apis-ci/docker_run.sh +++ b/cucumber-js-test-apis-ci/docker_run.sh @@ -23,14 +23,11 @@ then TEST_CI_BE_HOST="$(ifconfig 'eth0' | sed -n '2p' | awk '{print $2}' | sed 's/addr://g')" TEST_CI_BE_PORT=8081 TEST_CI_CATALOG_HOST=$TEST_CI_BE_HOST - TEST_CI_AP_HOST=$TEST_CI_BE_HOST - TEST_CI_AP_PORT=8080 fi if [ -z "$TEST_CI_CATALOG_PORT" ] then TEST_CI_CATALOG_PORT=8080 fi - echo "host $TEST_CI_BE_HOST" if [ -e "$WORKSPACE/data" ] @@ -69,9 +66,6 @@ sed -i "s/onboarding.user/cs0008/g" $WORKSPACE/data/environments/dockerConfig.js sed -i "s/CatalogBE.port/$TEST_CI_CATALOG_PORT/g" $WORKSPACE/data/environments/dockerConfig.json sed -i "s/CatalogBE.server/$TEST_CI_CATALOG_HOST/g" $WORKSPACE/data/environments/dockerConfig.json sed -i "s/CatalogBE.user/cs0008/g" $WORKSPACE/data/environments/dockerConfig.json -sed -i "s/activity_spec.port/$TEST_CI_AP_PORT/g" $WORKSPACE/data/environments/dockerConfig.json -sed -i "s/activity_spec.server/$TEST_CI_AP_HOST/g" $WORKSPACE/data/environments/dockerConfig.json -sed -i "s/activity_spec.user/cs0008/g" $WORKSPACE/data/environments/dockerConfig.json cat $WORKSPACE/data/environments/dockerConfig.json diff --git a/cucumber-js-test-apis-ci/plugins/README.md b/cucumber-js-test-apis-ci/plugins/README.md index 956fe77276..a57d61b1bb 100644 --- a/cucumber-js-test-apis-ci/plugins/README.md +++ b/cucumber-js-test-apis-ci/plugins/README.md @@ -7,7 +7,7 @@ The Modules on the left contains all steps for particalar aress and/or explanati <li> Copy the config.json to devConfig.json <li> Replace the server and user values with the correct values <h3>How to run with Maven</h3> -<li>"mvn install" will install npm if needed, download all modules and create the documentation under the "docs" folder +<li>"mvn clean install -f dev_pom.xml" will install npm if needed, download all modules and create the documentation under the "docs" folder <li>"mvn test-and-report" will run all tests in the features folder and create an HTML report under the "reports" folder <h3>How to develop tests</h3> You can open the project in IntelliJ and Webstorm to run and develop scenarios.<br> @@ -21,3 +21,9 @@ You can open the project in IntelliJ and Webstorm to run and develop scenarios.< <li> More on <a href="https://cucumber.io/docs/reference">Cucumber</a> <li> More on <a herf="https://github.com/cucumber/cucumber/wiki/Gherkin">Gherkin</a> <li> More on <a href="https://github.com/cucumber/cucumber-js">Cucumber-js</a> +<br> +<h3>How to run the docker</h3> +<li>"mvn clean install -P docker" will create the docker images +<li>the "docker_run.sh" script will start all ONAP images and run the cucumber docker against them +<li> environment variables that can be set to change the server/version: IMAGES_TAG (default 1.4-STAGING-latest), TEST_CI_BE_HOST (deafult - machine IP), TEST_CI_CATALOG_PORT (default 8080) + |