4 files changed, 17 insertions, 3 deletions
diff --git a/plans/modeling-toscaparsers-genericparser/sanity-check/setup.sh b/plans/modeling-genericparser/sanity-check/setup.sh
index 1ca35bef..721885db 100644
--- a/plans/modeling-toscaparsers-genericparser/sanity-check/setup.sh
+++ b/plans/modeling-genericparser/sanity-check/setup.sh
@@ -56,7 +56,7 @@ echo sleep 60
 sleep 60
 
 # start modeling-genericparser
-docker run -d --name modeling-genericparser -v /var/lib/mysql -e MSB_ADDR=${DISCOVERY_IP}:10081 -e MYSQL_ADDR=${VFC_DB_IP}:3306 nexus3.onap.org:10001/onap/vfc/catalog
+docker run -d --name modeling-genericparser -v /var/lib/mysql -e MSB_ADDR=${DISCOVERY_IP}:10081 -e MYSQL_ADDR=${VFC_DB_IP}:3306 nexus3.onap.org:10001/onap/modeling/genericparser
 GenericParser_IP=`get-instance-ip.sh modeling-genericparser`
 for i in {1..10}; do
     curl -sS -m 1 ${GenericParser_IP}:8806 && break
diff --git a/plans/modeling-toscaparsers-genericparser/sanity-check/teardown.sh b/plans/modeling-genericparser/sanity-check/teardown.sh
index 3982a1ef..3982a1ef 100644
--- a/plans/modeling-toscaparsers-genericparser/sanity-check/teardown.sh
+++ b/plans/modeling-genericparser/sanity-check/teardown.sh
diff --git a/plans/modeling-toscaparsers-genericparser/sanity-check/testplan.txt b/plans/modeling-genericparser/sanity-check/testplan.txt
index 13456aed..25d2c5d7 100644
--- a/plans/modeling-toscaparsers-genericparser/sanity-check/testplan.txt
+++ b/plans/modeling-genericparser/sanity-check/testplan.txt
@@ -1,3 +1,3 @@
 # Test suites are relative paths under [integration/csit.git]/tests/.
 # Place the suites in run order.
-modeling-toscaparsers-genericparser/test.robot
+modeling-genericparser/test.robot
diff --git a/plans/multicloud-k8s/functionality1/setup.sh b/plans/multicloud-k8s/functionality1/setup.sh
index 182fb8b7..eda24ba4 100755
--- a/plans/multicloud-k8s/functionality1/setup.sh
+++ b/plans/multicloud-k8s/functionality1/setup.sh
@@ -17,8 +17,22 @@ pushd ${SCRIPTS}
 ./run-instance.sh docker.io/mongo:4.0 multicloud-k8s-mongodb
 MONGO_IP=$(./get-instance-ip.sh multicloud-k8s-mongodb)
 
+# setup multicloud-k8s configuration
+CONFIG_FILE=$(pwd)/k8sconfig.json
+cat << EOF > $CONFIG_FILE
+{
+    "database-address": "$MONGO_IP",
+    "database-type": "mongo",
+    "plugin-dir": "plugins",
+    "kube-config-dir": "kubeconfigs"
+}
+EOF
+
+cat $CONFIG_FILE
+
 # start multicloud-k8s
-./run-instance.sh nexus3.onap.org:10001/onap/multicloud/k8s:latest multicloud-k8s "-e PLUGINS_DIR=/opt/multicloud/k8s -e DATABASE_TYPE=mongo -e DATABASE_IP=$MONGO_IP"
+docker run --name multicloud-k8s -v $CONFIG_FILE:/opt/multicloud/k8splugin/k8sconfig.json \
+           -d nexus3.onap.org:10001/onap/multicloud/k8s:latest
 SERVICE_IP=$(./get-instance-ip.sh multicloud-k8s)
 SERVICE_PORT=8081
 popd