diff options
4 files changed, 9 insertions, 8 deletions
diff --git a/bootstrap/vagrant-onap/lib/sdc b/bootstrap/vagrant-onap/lib/sdc index 1c872fa48..275f64485 100644 --- a/bootstrap/vagrant-onap/lib/sdc +++ b/bootstrap/vagrant-onap/lib/sdc @@ -56,7 +56,7 @@ function clone_all_sdc_repos { # compile_all_sdc_repos() - Function that compiles SDC source repo. function compile_all_sdc_repos { - clone_repo sdc $sdc_src_folder + compile_src sdc $sdc_src_folder for dirc in ${sdc_repos[@]}; do compile_src $sdc_src_folder/$dirc diff --git a/test/csit/plans/vnfsdk-refrepo/sanity-check/setup.sh b/test/csit/plans/vnfsdk-refrepo/sanity-check/setup.sh index 85c6bc275..b54ea56ad 100644 --- a/test/csit/plans/vnfsdk-refrepo/sanity-check/setup.sh +++ b/test/csit/plans/vnfsdk-refrepo/sanity-check/setup.sh @@ -19,12 +19,12 @@ #Start market place -docker run -d -i -t --name=vnfmarket -p 8702:8702 onap/vnfmarket +docker run -d -i -t --name=refrepo -p 8702:8702 nexus3.onap.org:10001/onap/refrepo:1.0-STAGING-latest -REPO_IP=`docker inspect --format '{{ .NetworkSettings.IPAddress }}' vnfmarket` +REPO_IP=`docker inspect --format '{{ .NetworkSettings.IPAddress }}' refrepo` # Pass any variables required by Robot test suites in ROBOT_VARIABLES -ROBOT_VARIABLES="-v REPO_IP:${REPO_IP}" - +ROBOT_VARIABLES="-v SCRIPTS:{SCRIPTS} -v REPO_IP:${REPO_IP}" +echo ${ROBOT_VARIABLES} diff --git a/test/csit/plans/vnfsdk-refrepo/sanity-check/teardown.sh b/test/csit/plans/vnfsdk-refrepo/sanity-check/teardown.sh index 42d7b7fd4..a42634303 100644 --- a/test/csit/plans/vnfsdk-refrepo/sanity-check/teardown.sh +++ b/test/csit/plans/vnfsdk-refrepo/sanity-check/teardown.sh @@ -17,5 +17,5 @@ # This script is sourced by run-csit.sh after Robot test completion. -kill-instance.sh vnfmarket +kill-instance.sh refrepo diff --git a/test/csit/tests/vnfsdk-marketplace/provision/sanity_test_vnfsdktestfunction.robot b/test/csit/tests/vnfsdk-marketplace/provision/sanity_test_vnfsdktestfunction.robot index cff6b58da..473415eab 100644 --- a/test/csit/tests/vnfsdk-marketplace/provision/sanity_test_vnfsdktestfunction.robot +++ b/test/csit/tests/vnfsdk-marketplace/provision/sanity_test_vnfsdktestfunction.robot @@ -4,8 +4,8 @@ Library Process *** Variables *** -${csarpath} enterprise2DC.csar -${upload} uploadCSAR.sh +${csarpath} ${SCRIPTS}/../tests/vnfsdk-marketplace/provision/enterprise2DC.csar +${upload} ${SCRIPTS}/../tests/vnfsdk-marketplace/provision/uploadCSAR.sh *** Test Cases *** @@ -13,4 +13,5 @@ ${upload} uploadCSAR.sh E2E Test case for VNF SDK [Documentation] Upload the VNF Package ${status}= Run Process bash ${upload} ${REPO_IP} ${csarpath} > log.txt shell=yes + Log Status is ${status} |