diff options
Diffstat (limited to 'bootstrap')
| -rw-r--r-- | bootstrap/jenkins/vagrant/jjb/java-jobs.yaml | 62 | ||||
| -rw-r--r-- | bootstrap/vagrant-onap/README.md | 1 | ||||
| -rw-r--r-- | bootstrap/vagrant-onap/lib/vnfsdk | 13 | ||||
| -rw-r--r-- | bootstrap/vagrant-onap/tests/test_vnfsdk | 21 | ||||
| -rw-r--r-- | bootstrap/vagrant-onap/tox.ini | 12 |
5 files changed, 76 insertions, 33 deletions
diff --git a/bootstrap/jenkins/vagrant/jjb/java-jobs.yaml b/bootstrap/jenkins/vagrant/jjb/java-jobs.yaml index 9662e83d3..cb1f94afb 100644 --- a/bootstrap/jenkins/vagrant/jjb/java-jobs.yaml +++ b/bootstrap/jenkins/vagrant/jjb/java-jobs.yaml @@ -21,6 +21,9 @@ - 'aai_aai-service': repo: 'aai/aai-service' pom: 'pom.xml' + - 'aai_babel': + repo: 'aai/babel' + pom: 'pom.xml' - 'aai_champ': repo: 'aai/champ' pom: 'pom.xml' @@ -237,9 +240,12 @@ - 'holmes_rule-management': repo: 'holmes/rule-management' pom: 'pom.xml' - - 'integration': + - 'integration_test_mocks_sniroemulator': repo: 'integration' - pom: 'pom.xml' + pom: 'test/mocks/sniroemulator/pom.xml' + - 'integration_version-manifest': + repo: 'integration' + pom: 'version-manifest/pom.xml' - 'modeling_toscaparsers_javatoscachecker': repo: 'modeling/toscaparsers' pom: 'javatoscachecker/pom.xml' @@ -273,6 +279,9 @@ - 'multicloud_openstack_vmware': repo: 'multicloud/openstack/vmware' pom: 'pom.xml' + - 'multicloud_openstack_windriver': + repo: 'multicloud/openstack/windriver' + pom: 'pom.xml' - 'ncomp_cdap': repo: 'ncomp/cdap' pom: 'pom.xml' @@ -357,9 +366,6 @@ - 'sdc_sdc-workflow-designer': repo: 'sdc/sdc-workflow-designer' pom: 'pom.xml' - - 'sdc_sdc_common': - repo: 'sdc/sdc_common' - pom: 'pom.xml' - 'sdnc_adaptors': repo: 'sdnc/adaptors' pom: 'pom.xml' @@ -393,6 +399,9 @@ - 'usecase-ui': repo: 'usecase-ui' pom: 'pom.xml' + - 'usecase-ui_server': + repo: 'usecase-ui/server' + pom: 'pom.xml' - 'vfc_gvnfm_vnflcm': repo: 'vfc/gvnfm/vnflcm' pom: 'pom.xml' @@ -423,21 +432,24 @@ - 'vfc_nfvo_resmanagement': repo: 'vfc/nfvo/resmanagement' pom: 'pom.xml' - - 'vfc_nfvo_wfengine_activiti-extension': - repo: 'vfc/nfvo/wfengine' - pom: 'activiti-extension/pom.xml' - - 'vfc_nfvo_wfengine_wfenginemgrservice': + - 'vfc_nfvo_wfengine': repo: 'vfc/nfvo/wfengine' - pom: 'wfenginemgrservice/pom.xml' - - 'vfc_nfvo_wfengine_wso2': - repo: 'vfc/nfvo/wfengine' - pom: 'wso2/pom.xml' + pom: 'pom.xml' - 'vid': repo: 'vid' pom: 'pom.xml' - 'vid_asdcclient': repo: 'vid/asdcclient' pom: 'pom.xml' + - 'vnfsdk_compliance_veslibrary_ves_clibrary_VESreporting_vFW': + repo: 'vnfsdk/compliance' + pom: 'veslibrary/ves_clibrary/VESreporting_vFW/pom.xml' + - 'vnfsdk_compliance_veslibrary_ves_clibrary_VESreporting_vLB': + repo: 'vnfsdk/compliance' + pom: 'veslibrary/ves_clibrary/VESreporting_vLB/pom.xml' + - 'vnfsdk_compliance_veslibrary_ves_javalibrary_evel_javalib2': + repo: 'vnfsdk/compliance' + pom: 'veslibrary/ves_javalibrary/evel_javalib2/pom.xml' - 'vnfsdk_functest': repo: 'vnfsdk/functest' pom: 'pom.xml' @@ -453,3 +465,27 @@ - 'vnfsdk_validation': repo: 'vnfsdk/validation' pom: 'pom.xml' + - 'vvp_cms': + repo: 'vvp/cms' + pom: 'pom.xml' + - 'vvp_engagementmgr': + repo: 'vvp/engagementmgr' + pom: 'pom.xml' + - 'vvp_gitlab': + repo: 'vvp/gitlab' + pom: 'pom.xml' + - 'vvp_image-scanner': + repo: 'vvp/image-scanner' + pom: 'pom.xml' + - 'vvp_jenkins': + repo: 'vvp/jenkins' + pom: 'pom.xml' + - 'vvp_portal': + repo: 'vvp/portal' + pom: 'pom.xml' + - 'vvp_postgresql': + repo: 'vvp/postgresql' + pom: 'pom.xml' + - 'vvp_test-engine': + repo: 'vvp/test-engine' + pom: 'pom.xml' diff --git a/bootstrap/vagrant-onap/README.md b/bootstrap/vagrant-onap/README.md index e90e0a724..e1815e7eb 100644 --- a/bootstrap/vagrant-onap/README.md +++ b/bootstrap/vagrant-onap/README.md @@ -55,6 +55,7 @@ current options include: | vfc | Virtual Function Controller | | multicloud | Multi Cloud | | ccsdk | Common Controller SDK | +| vnfsdk | VNF SDK | | all_in_one | All ONAP services in a VM | | testing | Unit Test VM | diff --git a/bootstrap/vagrant-onap/lib/vnfsdk b/bootstrap/vagrant-onap/lib/vnfsdk index b73e06426..c23ed8581 100644 --- a/bootstrap/vagrant-onap/lib/vnfsdk +++ b/bootstrap/vagrant-onap/lib/vnfsdk @@ -5,22 +5,19 @@ set -o xtrace source /var/onap/functions vnfsdk_src_folder=$git_src_folder/vnfsdk - -vnfsdk_repos=("refrepo") +vnfsdk_repos=("vnfsdk/compliance" "vnfsdk/functest" "vnfsdk/lctest" "vnfsdk/model" "vnfsdk/pkgtools" "vnfsdk/refrepo" "vnfsdk/validation") # clone_all_vnfsdk_repos() - Function that clones vnfsdk source repo. function clone_all_vnfsdk_repos { - - for dirc in ${vnfsdk_repos[@]}; do - clone_repo vnfsdk/$dirc $vnfsdk_src_folder/$dirc + for repo in ${vnfsdk_repos[@]}; do + clone_repo $repo $vnfsdk_src_folder${repo#*vnfsdk} done } # compile_all_vnfsdk_repos - Function that builds vnfsdk source repo function compile_all_vnfsdk_repos { - - for dirc in ${vnfsdk_repos[@]}; do - clone_repo vnfsdk/$dirc $vnfsdk_src_folder/$dirc + for repo in ${vnfsdk_repos[@]}; do + compile_src $vnfsdk_src_folder${repo#*vnfsdk} done } diff --git a/bootstrap/vagrant-onap/tests/test_vnfsdk b/bootstrap/vagrant-onap/tests/test_vnfsdk index 5aeca45c2..250a9fcc5 100644 --- a/bootstrap/vagrant-onap/tests/test_vnfsdk +++ b/bootstrap/vagrant-onap/tests/test_vnfsdk @@ -11,21 +11,28 @@ covered_functions=( function test_clone_all_vnfsdk_repos { clone_all_vnfsdk_repos + asserts_file_exist $vnfsdk_src_folder/compliance/veslibrary/README + asserts_file_exist $vnfsdk_src_folder/functest/pom.xml + asserts_file_exist $vnfsdk_src_folder/lctest/pom.xml + asserts_file_exist $vnfsdk_src_folder/model/docs/index.rst + asserts_file_exist $vnfsdk_src_folder/pkgtools/pom.xml asserts_file_exist $vnfsdk_src_folder/refrepo/pom.xml + asserts_file_exist $vnfsdk_src_folder/validation/pom.xml } # test_compile_all_vnfsdk_repos () - Verify if VNFSDK source repo compiles correctly. function test_compile_all_vnfsdk_repos { clone_all_vnfsdk_repos - { - compile_all_vnfsdk_repos - } || { - set -e - } + compile_all_vnfsdk_repos + + asserts_file_exist $vnfsdk_src_folder/lctest/lifecycle-test/target/lifecycle-test-service-1.0.0-SNAPSHOT.war + asserts_file_exist $vnfsdk_src_folder/pkgtools/target/vnf-sdk-pkgtools-1.0.0-SNAPSHOT.zip + asserts_file_exist $vnfsdk_src_folder/refrepo/vnfmarket-be/vnf-sdk-marketplace/target/ROOT.war + asserts_file_exist $vnfsdk_src_folder/validation/csarvalidation/target/validation-csar-1.0.0-SNAPSHOT.jar } # test_get_vnfsdk_images() - Verify that the VNFSDK images are created or retrieved -function test_get_vnfsdk_images { +function test_get_vnfsdk_images { clone_all_vnfsdk_repos get_vnfsdk_images @@ -47,4 +54,4 @@ if [ "$1" != '*' ]; then unset covered_functions covered_functions=$1 fi -main "${covered_functions[@]}"
\ No newline at end of file +main "${covered_functions[@]}" diff --git a/bootstrap/vagrant-onap/tox.ini b/bootstrap/vagrant-onap/tox.ini index 674810006..6ab309fdf 100644 --- a/bootstrap/vagrant-onap/tox.ini +++ b/bootstrap/vagrant-onap/tox.ini @@ -12,11 +12,13 @@ install_command = pip install {opts} {packages} deps = {env:BASHATE_INSTALL_PATH:bashate} whitelist_externals = bash -commands = bash -c "find {toxinidir}/{tests,lib,tools} \ - -not \( -type d -path *files* -prune \) \ - -not \( -type f -name .*.swp* -prune \) \ - -not \( -type f -name *.ps1 -prune \) \ - -type f \ +commands = bash -c "find {toxinidir}/{tests,lib,tools} \ + -not \( -type d -path *files* -prune \) \ + -not \( -type f -name .*.swp* -prune \) \ + -not \( -type f -name *.ps1 -prune \) \ + -not \( -type f -name installed-software* -prune \) \ + -not \( -type f -name *projects.txt -prune \) \ + -type f \ # E005 file does not begin with #! or have a .sh prefix # E006 check for lines longer than 79 columns # E042 local declaration hides errors |