diff options
| -rwxr-xr-x | bootstrap/vagrant-onap/lib/sdnc | 2 | ||||
| -rw-r--r-- | bootstrap/vagrant-onap/tests/test_appc | 6 | ||||
| -rw-r--r-- | bootstrap/vagrant-onap/tests/test_sdnc | 12 |
3 files changed, 9 insertions, 11 deletions
diff --git a/bootstrap/vagrant-onap/lib/sdnc b/bootstrap/vagrant-onap/lib/sdnc index c7c2745d8..770f6be9f 100755 --- a/bootstrap/vagrant-onap/lib/sdnc +++ b/bootstrap/vagrant-onap/lib/sdnc @@ -3,6 +3,7 @@ set -o xtrace source /var/onap/functions +source /var/onap/ccsdk sdnc_src_folder=$git_src_folder/openecomp/sdnc sdnc_repos=("core" "adaptors" "northbound" "plugins" "oam") @@ -28,6 +29,7 @@ function compile_all_sdnc_repos { function _build_sdnc_images { local folder=$sdnc_src_folder/oam + get_ccsdk_images install_package unzip clone_repo sdnc/oam $folder # The OAM code depends on all the SDNC repos which should be downloaded and compiled first diff --git a/bootstrap/vagrant-onap/tests/test_appc b/bootstrap/vagrant-onap/tests/test_appc index 0d46ef47d..2290f16a2 100644 --- a/bootstrap/vagrant-onap/tests/test_appc +++ b/bootstrap/vagrant-onap/tests/test_appc @@ -36,7 +36,7 @@ function test_compile_all_appc_repos { asserts_file_exist $appc_src_folder/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/target/appc-ssh-adapter-sshd-1.1.0-SNAPSHOT.jar asserts_file_exist $appc_src_folder/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-tests/target/appc-ssh-adapter-tests-1.1.0-SNAPSHOT.jar - for component in appc-asdc-listener appc-event-listener appc-oam appc-provider; do + for component in appc-event-listener appc-oam appc-provider; do asserts_file_exist $appc_src_folder/$component/$component-bundle/target/$component-bundle-1.1.0-SNAPSHOT.jar asserts_file_exist $appc_src_folder/$component/$component-features/target/$component-features-1.1.0-SNAPSHOT.jar asserts_file_exist $appc_src_folder/$component/$component-installer/target/$component-1.1.0-SNAPSHOT.zip @@ -45,8 +45,6 @@ function test_compile_all_appc_repos { asserts_file_exist $appc_src_folder/$component/$component-model/target/$component-model-1.1.0-SNAPSHOT.jar done - asserts_file_exist $appc_src_folder/appc-asdc-listener/appc-yang-generator/target/appc-yang-generator-1.1.0-SNAPSHOT.jar - asserts_file_exist $appc_src_folder/appc-common/target/appc-common-1.1.0-SNAPSHOT.jar asserts_file_exist $appc_src_folder/appc-dg/appc-dg-shared/appc-dg-dependency-model/target/appc-dg-dependency-model-1.1.0-SNAPSHOT.jar @@ -85,9 +83,7 @@ function test_install_appc { get_appc_images install_appc - asserts_image_running openecomp/dgbuilder-sdnc-image asserts_image_running openecomp/appc-image - asserts_image_running mysql/mysql-server:5.6 } if [ "$1" != '*' ]; then diff --git a/bootstrap/vagrant-onap/tests/test_sdnc b/bootstrap/vagrant-onap/tests/test_sdnc index a60145fbf..bc742fad2 100644 --- a/bootstrap/vagrant-onap/tests/test_sdnc +++ b/bootstrap/vagrant-onap/tests/test_sdnc @@ -60,9 +60,9 @@ function test_get_sdnc_images { clone_all_sdnc_repos get_sdnc_images - asserts_image openecomp/sdnc-image - asserts_image openecomp/admportal-sdnc-image - asserts_image openecomp/dgbuilder-sdnc-image + asserts_image onap/sdnc-image + asserts_image onap/admportal-sdnc-image + asserts_image onap/dgbuilder-sdnc-image asserts_image mysql/mysql-server:5.6 } @@ -72,9 +72,9 @@ function test_install_sdnc { get_sdnc_images install_sdnc - asserts_image_running openecomp/dgbuilder-sdnc-image - asserts_image_running openecomp/admportal-sdnc-image - asserts_image_running openecomp/sdnc-image + asserts_image_running onap/ccsdk-dgbuilder-image + asserts_image_running onap/admportal-sdnc-image + asserts_image_running onap/sdnc-image asserts_image_running mysql/mysql-server:5.6 } |