diff options
| author |   ilanap <ilanap@amdocs.com> | 2019-02-03 16:26:17 +0200 |
|---|---|---|
| committer | ilanap <ilanap@amdocs.com> | 2019-02-03 16:32:22 +0200 |
| commit | 62067173f2772622f29830a39f359854dcabb5e6 (patch) | |
| tree | e0bd36ecd8cea36a83dac10d915aea2f6631c16f /cucumber-js-test-apis-ci | |
| parent | c0ebab732256fed103b7cb1445177ebc58f07050 (diff) | |
Fixes to docker run
different port on jenkins where 8080 already taken
Change-Id: If7ed9b00faf3e44e56593b53ca64397d0ad05eb8
Issue-ID: SDC-2028
Signed-off-by: ilanap <ilanap@amdocs.com>
Diffstat (limited to 'cucumber-js-test-apis-ci')
| -rw-r--r-- | cucumber-js-test-apis-ci/docker_run.sh | 14 | ||||
| -rw-r--r-- | cucumber-js-test-apis-ci/pom.xml | 2 |
2 files changed, 10 insertions, 6 deletions
diff --git a/cucumber-js-test-apis-ci/docker_run.sh b/cucumber-js-test-apis-ci/docker_run.sh index da4c532490..0bfbd11d54 100644 --- a/cucumber-js-test-apis-ci/docker_run.sh +++ b/cucumber-js-test-apis-ci/docker_run.sh @@ -17,18 +17,19 @@ then fi fi echo "Workspace under: $WORKSPACE" - # add dynamic ports from kubernetes master if [ -z "$TEST_CI_BE_HOST" ] 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_CATALOG_PORT=8080 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" @@ -51,11 +52,14 @@ chmod 777 $WORKSPACE/data/scripts/docker_run.sh sed -i "s/xxx/TEST_CI/g" $WORKSPACE/TEST_CI.json sed -i "s/yyy/$TEST_CI_BE_HOST/g" $WORKSPACE/TEST_CI.json -sed -i "s/8080/$TEST_CI_BE_PORT/g" $WORKSPACE/TEST_CI.json mv $WORKSPACE/TEST_CI.json $WORKSPACE/data/environments +sed -i "s/8080:8080/$TEST_CI_CATALOG_PORT:8080/g" $WORKSPACE/data/scripts/docker_run.sh +sed -i "s/:8080\/sdc/:$TEST_CI_CATALOG_PORT\/sdc/g" $WORKSPACE/data/scripts/docker_run.sh + + echo "getting images for $IMAGES_TAG" -$WORKSPACE/data/scripts/docker_run.sh -e TEST_CI -r $IMAGES_TAG -sim -p 10001 +$WORKSPACE/data/scripts/docker_run.sh -e TEST_CI -r $IMAGES_TAG -p 10001 echo "setting configuration" diff --git a/cucumber-js-test-apis-ci/pom.xml b/cucumber-js-test-apis-ci/pom.xml index e9ea4d637b..3a9e9d59bf 100644 --- a/cucumber-js-test-apis-ci/pom.xml +++ b/cucumber-js-test-apis-ci/pom.xml @@ -9,7 +9,7 @@ <artifactId>cucumber-bdd</artifactId> <name>cucumber-bdd</name> <groupId>org.openecomp.sdc</groupId> - <version>1.3.1-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <packaging>jar</packaging> <build> <plugins> |