Fix adding null schema to non list properties

[sdc.git] / cucumber-js-test-apis-ci / docker_run.sh

diff --git a/cucumber-js-test-apis-ci/docker_run.sh b/cucumber-js-test-apis-ci/docker_run.sh
index da4c532..045162a 100644 (file)
--- a/cucumber-js-test-apis-ci/docker_run.sh
+++ b/cucumber-js-test-apis-ci/docker_run.sh
@@ -13,23 +13,21 @@ then
     fi
     if [ -z "$IMAGES_TAG" ]
     then
-        IMAGES_TAG=1.4-STAGING-latest
+        IMAGES_TAG=1.5-STAGING-latest
     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
+fi
+if [ -z "$TEST_CI_CATALOG_PORT" ]
+then
     TEST_CI_CATALOG_PORT=8080
-    TEST_CI_AP_HOST=$TEST_CI_BE_HOST
-    TEST_CI_AP_PORT=8080
 fi
-
-
 echo "host $TEST_CI_BE_HOST"
 
 if [ -e "$WORKSPACE/data" ]
@@ -51,11 +49,13 @@ 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"
 
@@ -65,9 +65,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