summaryrefslogtreecommitdiffstats
path: root/cucumber-js-test-apis-ci/docker_run.sh
diff options
context:
space:
mode:
authorilanap <ilanap@amdocs.com>2019-02-04 14:15:11 +0200
committerAvi Gaffa <avi.gaffa@amdocs.com>2019-02-05 10:59:51 +0000
commite53320e41123bd6219158208b4eac36f44d67cd2 (patch)
tree4b06b0dc7f0f504c68dc48fc00023443a826ddf8 /cucumber-js-test-apis-ci/docker_run.sh
parent1468fdc4558bb82c025a05b03d1511018d8fd835 (diff)
Fixes to docker run
yet again since changes did not affect the changes in the merge build Change-Id: I71881fcfc556a0566bc2d05c6bc33a52d5873b10 Issue-ID: SDC-2028 Signed-off-by: ilanap <ilanap@amdocs.com>
Diffstat (limited to 'cucumber-js-test-apis-ci/docker_run.sh')
-rw-r--r--cucumber-js-test-apis-ci/docker_run.sh14
1 files changed, 9 insertions, 5 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"