diff options
| author |   Gary Wu <gary.i.wu@huawei.com> | 2017-09-20 17:01:40 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2017-09-20 17:01:40 +0000 |
| commit | 7ed6bcce5358b3e7affa59c548b4fc11016accee (patch) | |
| tree | ba0fd7def5232df1b7f2f41dccba8ca5e529d39b /bootstrap/vagrant-onap/lib | |
| parent | 3c8ca3a7bbdd047b4f2295a9db314a9cc189a2d7 (diff) | |
| parent | dbe2e0b8ff4476016f68c8885bbaa23c303aeafa (diff) | |
Merge "Update SDC lib and test scripts"
Diffstat (limited to 'bootstrap/vagrant-onap/lib')
| -rw-r--r-- | bootstrap/vagrant-onap/lib/sdc | 10 | ||||
| -rwxr-xr-x | bootstrap/vagrant-onap/lib/vfc | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/bootstrap/vagrant-onap/lib/sdc b/bootstrap/vagrant-onap/lib/sdc index 275f64485..9ec04b21b 100644 --- a/bootstrap/vagrant-onap/lib/sdc +++ b/bootstrap/vagrant-onap/lib/sdc @@ -5,7 +5,7 @@ set -o xtrace source /var/onap/functions sdc_src_folder=$git_src_folder/sdc -sdc_repos=("sdc-os-chef" "jtosca" "sdc-distribution-client" "sdc-titan-cassandra" "sdc-tosca" "sdc_common") +sdc_repos=("jtosca" "sdc-distribution-client" "sdc-docker-base" "sdc-titan-cassandra" "sdc-tosca" "sdc-vnfdesign" "sdc-workflow-designer" "sdc_common") # _mount_external_partition() - Create partition and mount the external volume function _mount_external_partition { @@ -69,7 +69,7 @@ function get_sdc_images { if [[ "$compile_repo" != "True" ]]; then compile_src $sdc_src_folder fi - build_docker_image $sdc_src_folder/sdc-os-chef docker + build_docker_image $sdc_src_folder/sdc-docker-base else for image in backend frontend elasticsearch kibana cassandra sanity; do pull_openecomp_image openecomp/sdc-$image @@ -81,8 +81,6 @@ function get_sdc_images { function install_sdc { local ENV_NAME=$dmaap_topic local MR_IP_ADDR='10.0.11.1' - local RELEASE=$docker_version - NEXUS_DOCKER_PORT=$(echo $nexus_docker_repo | cut -d':' -f2) _init_data_folders cp $sdc_src_folder/sdc-os-chef/environments/Template.json /data/environments @@ -99,7 +97,9 @@ function install_sdc { install_docker if [[ "$pull_docker_image" == "True" ]]; then docker_openecomp_login - bash /data/scripts/docker_run.sh -e $ENV_NAME -r $RELEASE -p $NEXUS_DOCKER_PORT + bash /data/scripts/docker_run.sh -e $ENV_NAME -r $docker_version -p $(echo $nexus_docker_repo | cut -d':' -f2) + else + bash /data/scripts/docker_run.sh -e $ENV_NAME -l fi } diff --git a/bootstrap/vagrant-onap/lib/vfc b/bootstrap/vagrant-onap/lib/vfc index 2d1418258..fb32708e0 100755 --- a/bootstrap/vagrant-onap/lib/vfc +++ b/bootstrap/vagrant-onap/lib/vfc @@ -19,8 +19,8 @@ function clone_all_vfc_repos { function compile_all_vfc_repos { install_python_package tox - tox_repos=("gvnfm/vnflcm/lcm" "gvnfm/vnfmgr/mgr" "gvnfm/vnfres/res" "nfvo/lcm" - "nfvo/driver/vnfm/gvnfm/gvnfmadapter" "nfvo/driver/vnfm/svnfm/zte/vmanager") + tox_repos=("gvnfm/vnflcm/lcm" "gvnfm/vnfmgr/mgr" "gvnfm/vnfres/res" "nfvo/lcm" \ + "nfvo/driver/vnfm/gvnfm/gvnfmadapter" "nfvo/driver/vnfm/svnfm/zte/vmanager") for dirc in ${tox_repos[@]}; do pushd $src_folder/$dirc tox -e py27 |