diff options
Diffstat (limited to 'build/overcloud-full.sh')
| -rwxr-xr-x | build/overcloud-full.sh | 51 |
1 files changed, 26 insertions, 25 deletions
diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh index f1ec8650..b821a15c 100755 --- a/build/overcloud-full.sh +++ b/build/overcloud-full.sh @@ -41,8 +41,8 @@ rm -rf vsperf vsperf.tar.gz git clone https://gerrit.opnfv.org/gerrit/vswitchperf vsperf tar czf vsperf.tar.gz vsperf -# Increase disk size by 900MB to accommodate more packages -qemu-img resize overcloud-full_build.qcow2 +900MB +# Increase disk size by 1200MB to accommodate more packages +qemu-img resize overcloud-full_build.qcow2 +1200MB # expand file system to max disk size # installing forked apex-puppet-tripleo @@ -68,11 +68,13 @@ LIBGUESTFS_BACKEND=direct virt-customize \ --upload ${BUILD_ROOT}/patches/neutron_openstacksdk_dps.patch:/usr/lib/python2.7/site-packages/ \ --upload ${BUILD_ROOT}/patches/neutron_openstackclient_dps.patch:/usr/lib/python2.7/site-packages/ \ --upload ${BUILD_ROOT}/patches/puppet-neutron-add-sfc.patch:/usr/share/openstack-puppet/modules/neutron/ \ + --upload ${BUILD_ROOT}/patches/congress-parallel-execution.patch:/usr/lib/python2.7/site-packages/ \ -a overcloud-full_build.qcow2 # apply neutron port data plane status patches # https://specs.openstack.org/openstack/neutron-specs/specs/backlog/ocata/port-data-plane-status.html -# Requirement from Doctor project +# apply congress parallel execution patch +# Requirements from Doctor project # TODO(cgoncalves): code merged in Pike dev cycle. drop from >= OpenStack Pike / > OPNFV Euphrates LIBGUESTFS_BACKEND=direct virt-customize \ --run-command "cd /usr/lib/python2.7/site-packages/ && patch -p1 < neutron_lib_dps.patch " \ @@ -80,6 +82,7 @@ LIBGUESTFS_BACKEND=direct virt-customize \ --run-command "cd /usr/lib/python2.7/site-packages/ && patch -p1 < neutron_openstacksdk_dps.patch" \ --run-command "cd /usr/lib/python2.7/site-packages/ && patch -p1 < neutron_openstackclient_dps.patch" \ --run-command "cd /usr/share/openstack-puppet/modules/neutron && patch -p1 < puppet-neutron-add-sfc.patch" \ + --run-command "cd /usr/lib/python2.7/site-packages/ && patch -p1 < congress-parallel-execution.patch" \ -a overcloud-full_build.qcow2 # Arch dependent on x86 @@ -118,9 +121,6 @@ for package in ${fdio_pkgs[@]}; do fdio_pkg_str+=" --upload ${BUILD_DIR}/${package##*/}:/root/fdio/" done -# Increase disk size by 900MB to accommodate more packages -qemu-img resize overcloud-full_build.qcow2 +900MB - # upload dpdk rpms but do not install # install fd.io yum repo and packages # upload puppet fdio @@ -131,6 +131,7 @@ LIBGUESTFS_BACKEND=direct virt-customize \ $dpdk_pkg_str \ --upload ${BUILD_DIR}/puppet-fdio.tar.gz:/etc/puppet/modules \ --run-command "cd /etc/puppet/modules && tar xzf puppet-fdio.tar.gz" \ + --upload ${BUILD_DIR}/fdio.repo:/etc/yum.repos.d/ \ --run-command "mkdir /root/fdio" \ --upload ${BUILD_DIR}/noarch/$netvpp_pkg:/root/fdio \ $fdio_pkg_str \ @@ -147,28 +148,26 @@ LIBGUESTFS_BACKEND=direct virt-customize \ --upload ${BUILD_ROOT}/patches/puppet-neutron-vpp-ml2-type_drivers-setting.patch:/usr/share/openstack-puppet/modules/neutron/ \ --run-command "cd /usr/share/openstack-puppet/modules/neutron && patch -p1 < puppet-neutron-vpp-ml2-type_drivers-setting.patch" \ -a overcloud-full_build.qcow2 -fi # upload and install barometer packages -if [ "$(uname -i)" == 'x86_64' ]; then barometer_pkgs overcloud-full_build.qcow2 -fi - -# Build OVS with NSH -rm -rf ovs_nsh_patches -rm -rf ovs -git clone https://github.com/yyang13/ovs_nsh_patches.git -git clone https://github.com/openvswitch/ovs.git -pushd ovs > /dev/null -git checkout v2.6.1 -cp ../ovs_nsh_patches/v2.6.1/*.patch ./ -cp ${BUILD_ROOT}/patches/ovs-fix-build-on-RHEL-7.3.patch ./ -# Hack for build servers that have no git config -git config user.email "apex@opnfv.com" -git config user.name "apex" -git am *.patch -popd > /dev/null -tar czf ovs.tar.gz ovs + + # Build OVS with NSH + rm -rf ovs_nsh_patches + rm -rf ovs + git clone https://github.com/yyang13/ovs_nsh_patches.git + git clone https://github.com/openvswitch/ovs.git + pushd ovs > /dev/null + git checkout v2.6.1 + cp ../ovs_nsh_patches/v2.6.1/*.patch ./ + cp ${BUILD_ROOT}/patches/ovs-fix-build-on-RHEL-7.3.patch ./ + # Hack for build servers that have no git config + git config user.email "apex@opnfv.com" + git config user.name "apex" + git am *.patch + popd > /dev/null + tar czf ovs.tar.gz ovs + LIBGUESTFS_BACKEND=direct virt-customize \ --upload ${BUILD_ROOT}/build_ovs_nsh.sh:/root/ \ @@ -177,5 +176,7 @@ LIBGUESTFS_BACKEND=direct virt-customize \ --run-command "cd /root/ovs && /root/build_ovs_nsh.sh" \ -a overcloud-full_build.qcow2 +fi # end x86_64 specific items + mv -f overcloud-full_build.qcow2 overcloud-full.qcow2 popd > /dev/null |