From 2909e2e278b37a752c4f3501276166d6f2c18785 Mon Sep 17 00:00:00 2001 From: Victor Morales Date: Tue, 8 Aug 2017 15:51:52 -0500 Subject: Add oparent option It was implement the option to use the maven settings configuration file from OParent project Change-Id: Ic7f6c618c2ac707e882ea371985f5d6f77c3605b Signed-off-by: Victor Morales --- bootstrap/vagrant-onap/Vagrantfile | 3 +- bootstrap/vagrant-onap/lib/_onap_functions | 9 +- bootstrap/vagrant-onap/lib/files/settings.template | 274 --------------- bootstrap/vagrant-onap/lib/files/settings.xml | 369 +++++++++++++++++++++ 4 files changed, 379 insertions(+), 276 deletions(-) delete mode 100644 bootstrap/vagrant-onap/lib/files/settings.template create mode 100644 bootstrap/vagrant-onap/lib/files/settings.xml diff --git a/bootstrap/vagrant-onap/Vagrantfile b/bootstrap/vagrant-onap/Vagrantfile index bdf1d611c..0e8e1da1c 100644 --- a/bootstrap/vagrant-onap/Vagrantfile +++ b/bootstrap/vagrant-onap/Vagrantfile @@ -26,7 +26,8 @@ conf = { 'gitlab_branch' => 'master', 'build_image' => 'True', 'odl_version' => '0.5.3-Boron-SR3', - 'compile_repo' => 'False' + 'compile_repo' => 'False', + 'enable_oparent' => 'True' } Vagrant.require_version ">= 1.8.6" diff --git a/bootstrap/vagrant-onap/lib/_onap_functions b/bootstrap/vagrant-onap/lib/_onap_functions index 0d421552f..2c349d2c2 100755 --- a/bootstrap/vagrant-onap/lib/_onap_functions +++ b/bootstrap/vagrant-onap/lib/_onap_functions @@ -67,7 +67,14 @@ function _configure_maven { fi if [ ! -f $mvn_conf_file ]; then - cp /var/onap/files/settings.template $mvn_conf_file + if [[ "$enable_oparent" == "True" ]]; then + clone_repo oparent + cp $git_src_folder/oparent/settings.xml $mvn_conf_file + sed -i "s|<\/profiles>|<\/profiles>\n%PROXIES_START% \n%PROXIES% %HTTP_PROXY%\n%PROXIES% %HTTPS_PROXY%\n%PROXIES_END% <\/proxies>|g" $mvn_conf_file + else + cp /var/onap/files/settings.xml $mvn_conf_file + fi + sed -e " s|%PROXIES_START%|$proxies_start|g; s|%PROXIES%|$proxies|g; diff --git a/bootstrap/vagrant-onap/lib/files/settings.template b/bootstrap/vagrant-onap/lib/files/settings.template deleted file mode 100644 index f441f950c..000000000 --- a/bootstrap/vagrant-onap/lib/files/settings.template +++ /dev/null @@ -1,274 +0,0 @@ - - - -%PROXIES_START% -%PROXIES% %HTTP_PROXY% -%PROXIES% %HTTPS_PROXY% -%PROXIES_END% - - - - - 00_maven - - - 00_maven - https://maven.restlet.com - - - - - 10_nexus - - - 10_nexus - http://repo.maven.apache.org/maven2/ - true - true - - - - - 10_nexus - http://repo.maven.apache.org/maven2/ - true - true - - - - - 20_openecomp-public - - - 20_openecomp-public - 20_openecomp-public - https://nexus.onap.org/content/repositories/public/ - - true - daily - - - false - - - - - - 20_openecomp-public - 20_openecomp-public - https://nexus.onap.org/content/repositories/public/ - - true - daily - - - false - - - - - - 30_openecomp-staging - - - 30_openecomp-staging - 30_openecomp-staging - https://nexus.onap.org/content/repositories/staging/ - - true - daily - - - false - - - - - - 30_openecomp-staging - 30_openecomp-staging - https://nexus.onap.org/content/repositories/staging/ - - true - daily - - - false - - - - - - 40_openecomp-release - - - 40_openecomp-release - 40_openecomp-release - https://nexus.onap.org/content/repositories/releases/ - - true - daily - - - false - - - - - - 40_openecomp-release - 40_openecomp-release - https://nexus.onap.org/content/repositories/releases/ - - true - daily - - - false - - - - - - 50_openecomp-snapshots - - - 50_openecomp-snapshot - 50_openecomp-snapshot - https://nexus.onap.org/content/repositories/snapshots/ - - false - - - true - - - - - - 50_openecomp-snapshot - 50_openecomp-snapshot - https://nexus.onap.org/content/repositories/snapshots/ - - false - - - true - - - - - - 60_opendaylight-release - - - 60_opendaylight-mirror - 60_opendaylight-mirror - https://nexus.opendaylight.org/content/repositories/public/ - - true - daily - - - false - - - - - - 60_opendaylight-mirror - 60_opendaylight-mirror - https://nexus.opendaylight.org/content/repositories/public/ - - true - daily - - - false - - - - - - 70_opendaylight-snapshots - - - 70_opendaylight-snapshot - 70_opendaylight-snapshot - https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/ - - false - - - true - - - - - - 70_opendaylight-snapshot - 70_opendaylight-snapshot - https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/ - - false - - - true - - - - - - - 00_maven - 10_nexus - 20_openecomp-public - 30_openecomp-staging - 40_openecomp-release - 50_openecomp-snapshots - 60_opendaylight-release - 70_opendaylight-snapshots - - diff --git a/bootstrap/vagrant-onap/lib/files/settings.xml b/bootstrap/vagrant-onap/lib/files/settings.xml new file mode 100644 index 000000000..a3b972446 --- /dev/null +++ b/bootstrap/vagrant-onap/lib/files/settings.xml @@ -0,0 +1,369 @@ + + + + +%PROXIES_START% +%PROXIES% %HTTP_PROXY% +%PROXIES% %HTTPS_PROXY% +%PROXIES_END% + + + + + 00_maven + + + 00_maven + https://maven.restlet.com + + + + + 10_nexus + + + 10_nexus + http://repo.maven.apache.org/maven2/ + + true + + + true + + + + + + 10_nexus + http://repo.maven.apache.org/maven2/ + + true + + + true + + + + + + 20_openecomp-public + + + 20_openecomp-public + 20_openecomp-public + https://nexus.onap.org/content/repositories/public/ + + true + daily + + + false + + + + + + 20_openecomp-public + 20_openecomp-public + https://nexus.onap.org/content/repositories/public/ + + true + daily + + + false + + + + + + 30_openecomp-staging + + + 30_openecomp-staging + 30_openecomp-staging + https://nexus.onap.org/content/repositories/staging/ + + true + daily + + + false + + + + + + 30_openecomp-staging + 30_openecomp-staging + https://nexus.onap.org/content/repositories/staging/ + + true + daily + + + false + + + + + + 40_openecomp-release + + + 40_openecomp-release + 40_openecomp-release + https://nexus.onap.org/content/repositories/releases/ + + true + daily + + + false + + + + + + 40_openecomp-release + 40_openecomp-release + https://nexus.onap.org/content/repositories/releases/ + + true + daily + + + false + + + + + + 50_openecomp-snapshots + + + 50_openecomp-snapshot + 50_openecomp-snapshot + https://nexus.onap.org/content/repositories/snapshots/ + + false + + + true + + + + + + 50_openecomp-snapshot + 50_openecomp-snapshot + https://nexus.onap.org/content/repositories/snapshots/ + + false + + + true + + + + + + 60_opendaylight-release + + + 60_opendaylight-mirror + 60_opendaylight-mirror + https://nexus.opendaylight.org/content/repositories/public/ + + true + daily + + + false + + + + + + 60_opendaylight-mirror + 60_opendaylight-mirror + https://nexus.opendaylight.org/content/repositories/public/ + + true + daily + + + false + + + + + + 70_opendaylight-snapshots + + + 70_opendaylight-snapshot + 70_opendaylight-snapshot + https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/ + + false + + + true + + + + + + 70_opendaylight-snapshot + 70_opendaylight-snapshot + https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/ + + false + + + true + + + + + + 80_onap + + + onap-snapshots + onap-snapshots + https://nexus.onap.org/content/repositories/snapshots/ + + false + + + true + + + + onap-staging + onap-staging + https://nexus.onap.org/content/repositories/staging/ + + true + + + false + + + + onap-releases + onap-releases + https://nexus.onap.org/content/repositories/releases/ + + true + + + false + + + + onap-public + onap-public + https://nexus.onap.org/content/repositories/public/ + + true + + + false + + + + + + onap-snapshots + onap-snapshots + https://nexus.onap.org/content/repositories/snapshots/ + + false + + + true + + + + onap-staging + onap-staging + https://nexus.onap.org/content/repositories/staging/ + + true + + + false + + + + onap-releases + onap-releases + https://nexus.onap.org/content/repositories/releases/ + + true + + + false + + + + onap-public + onap-public + https://nexus.onap.org/content/repositories/public/ + + true + + + false + + + + + + + 00_maven + 10_nexus + 20_openecomp-public + 30_openecomp-staging + 40_openecomp-release + 50_openecomp-snapshots + 60_opendaylight-release + 70_opendaylight-snapshots + 80_onap + + -- cgit 1.2.3-korg