aboutsummaryrefslogtreecommitdiffstats
path: root/bootstrap
diff options
context:
space:
mode:
Diffstat (limited to 'bootstrap')
-rw-r--r--bootstrap/jenkins/vagrant/jjb/java-jobs.yaml14
-rw-r--r--bootstrap/vagrant-onap/tests/test_functions10
2 files changed, 14 insertions, 10 deletions
diff --git a/bootstrap/jenkins/vagrant/jjb/java-jobs.yaml b/bootstrap/jenkins/vagrant/jjb/java-jobs.yaml
index cea15b668..9662e83d3 100644
--- a/bootstrap/jenkins/vagrant/jjb/java-jobs.yaml
+++ b/bootstrap/jenkins/vagrant/jjb/java-jobs.yaml
@@ -243,6 +243,9 @@
- 'modeling_toscaparsers_javatoscachecker':
repo: 'modeling/toscaparsers'
pom: 'javatoscachecker/pom.xml'
+ - 'modeling_toscaparsers_nfvparser':
+ repo: 'modeling/toscaparsers'
+ pom: 'nfvparser/pom.xml'
- 'msb_apigateway':
repo: 'msb/apigateway'
pom: 'pom.xml'
@@ -261,9 +264,9 @@
- 'mso_libs':
repo: 'mso/libs'
pom: 'pom.xml'
- - 'multicloud_framework_multivimbroker':
+ - 'multicloud_framework':
repo: 'multicloud/framework'
- pom: 'multivimbroker/pom.xml'
+ pom: 'pom.xml'
- 'multicloud_openstack':
repo: 'multicloud/openstack'
pom: 'pom.xml'
@@ -405,9 +408,9 @@
- 'vfc_nfvo_driver_ems':
repo: 'vfc/nfvo/driver/ems'
pom: 'pom.xml'
- - 'vfc_nfvo_driver_sfc_zte_sfc-driver':
+ - 'vfc_nfvo_driver_sfc':
repo: 'vfc/nfvo/driver/sfc'
- pom: 'zte/sfc-driver/pom.xml'
+ pom: 'pom.xml'
- 'vfc_nfvo_driver_vnfm_gvnfm':
repo: 'vfc/nfvo/driver/vnfm/gvnfm'
pom: 'pom.xml'
@@ -447,3 +450,6 @@
- 'vnfsdk_refrepo':
repo: 'vnfsdk/refrepo'
pom: 'pom.xml'
+ - 'vnfsdk_validation':
+ repo: 'vnfsdk/validation'
+ pom: 'pom.xml'
diff --git a/bootstrap/vagrant-onap/tests/test_functions b/bootstrap/vagrant-onap/tests/test_functions
index ea268923b..17a66313a 100644
--- a/bootstrap/vagrant-onap/tests/test_functions
+++ b/bootstrap/vagrant-onap/tests/test_functions
@@ -102,7 +102,6 @@ function test_install_python {
install_python
asserts_installed_package python2.7
asserts_installed_package python-dev
- asserts_file_exist /usr/local/bin/tox
}
# test_install_docker() - Verify the correct installation of Docker
@@ -158,13 +157,12 @@ function test_compile_src {
# test_build_docker_image() - Verify that a docker image is created from source code
function test_build_docker_image {
- clone_repo portal
- compile_src $git_src_folder/portal/ecomp-portal-widget-ms
- build_docker_image $git_src_folder/portal/ecomp-portal-widget-ms
+ clone_repo ccsdk/distribution
+ build_docker_image $git_src_folder/ccsdk/distribution/ubuntu docker
- asserts_image widget-ms
+ asserts_image onap/ccsdk-ubuntu-image
- docker rmi -f widget-ms
+ docker rmi -f onap/ccsdk-ubuntu-image
}
if [ "$1" != '*' ]; then