X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=build%2Fovercloud-onos.sh;h=070365d745f060ef21ad649cffa0d0f5aa7a1860;hb=08c44e734c45fc370c8d34547a65e226d929075f;hp=88f0b1664a75046ba3102c75fbb0f379369022c3;hpb=a90fc16a988cd5eb53de383d0830648f758edaff;p=apex.git diff --git a/build/overcloud-onos.sh b/build/overcloud-onos.sh index 88f0b166..070365d7 100755 --- a/build/overcloud-onos.sh +++ b/build/overcloud-onos.sh @@ -18,23 +18,22 @@ cp -f overcloud-full.qcow2 overcloud-full-onos_build.qcow2 ##### Adding ONOS to overcloud ##### ####################################### -# upload the onos puppet module +# get the onos files rm -rf puppet-onos git clone https://github.com/bobzhouHW/puppet-onos.git -pushd puppet-onos > /dev/null +populate_cache "$onos_release_uri/$onos_release_file" # download jdk, onos and maven dependancy packages. -pushd files -for i in jdk-8u51-linux-x64.tar.gz onos-1.3.0.tar.gz repository.tar; do - populate_cache ${onos_artifacts_uri}/$i - get_cached_file $i -done -popd > /dev/null +#for i in jdk-8u51-linux-x64.tar.gz onos-1.3.0.tar.gz repository.tar; do -popd > /dev/null tar --xform="s:puppet-onos/:onos/:" -czf puppet-onos.tar.gz puppet-onos -LIBGUESTFS_BACKEND=direct virt-customize --upload puppet-onos.tar.gz:/etc/puppet/modules/ \ - --run-command "cd /etc/puppet/modules/ && tar xzf puppet-onos.tar.gz" -a overcloud-full-onos_build.qcow2 +LIBGUESTFS_BACKEND=direct virt-customize --install "java-1.8.0-openjdk" \ + --upload puppet-onos.tar.gz:/etc/puppet/modules/ \ + --run-command "cd /etc/puppet/modules/ && tar xzf puppet-onos.tar.gz" \ + --upload $CACHE_DIR/$onos_release_file:/opt \ + --run-command "cd /opt && tar xzf $onos_release_file" \ + -a overcloud-full-onos_build.qcow2 + mv overcloud-full-onos_build.qcow2 overcloud-full-onos.qcow2 popd > /dev/null