diff options
| author |   Tim Rozet <trozet@redhat.com> | 2017-03-29 21:11:05 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-03-29 21:11:05 +0000 |
| commit | bb4358f417fcd9a24017241725d00b5689df286e (patch) | |
| tree | db59acbab38cec69065ad92cb21bc090a7989c64 /build | |
| parent | eb69165f0dcebf41cccfc3124f980bab53908a2d (diff) | |
| parent | 621bfd97aa74877177039ada39c0c8f9578a0220 (diff) | |
Merge "Pins ODL L3 VPP/HC packages"
Diffstat (limited to 'build')
| -rwxr-xr-x | build/overcloud-full.sh | 9 | ||||
| -rw-r--r-- | build/variables.sh | 9 |
2 files changed, 18 insertions, 0 deletions
diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh index dbf297fd..9de6d9ab 100755 --- a/build/overcloud-full.sh +++ b/build/overcloud-full.sh @@ -87,6 +87,13 @@ EOF # Get Real Time Kernel from kvm4nfv populate_cache $kvmfornfv_uri_base/$kvmfornfv_kernel_rpm +# ODL/FDIO packages frozen for L3 scenarios +fdio_l3_pkg_str='' +for package in ${fdio_l3_pkgs[@]}; do + wget "$fdio_l3_uri_base/$package" + fdio_l3_pkg_str+=" --upload ${BUILD_DIR}/${package}:/root/fdio_l3/" +done + # ODL/FDIO packages frozen for L2 scenarios fdio_l2_pkg_str='' for package in ${fdio_l2_pkgs[@]}; do @@ -119,8 +126,10 @@ LIBGUESTFS_BACKEND=direct virt-customize \ --run-command "mkdir /root/dpdk_rpms" \ --upload ${BUILD_DIR}/fdio.repo:/etc/yum.repos.d/fdio.repo \ $dpdk_pkg_str \ + --run-command "mkdir /root/fdio_l3" \ --run-command "mkdir /root/fdio_l2" \ --upload ${BUILD_DIR}/noarch/$netvpp_pkg:/root/fdio_l2 \ + $fdio_l3_pkg_str \ $fdio_l2_pkg_str \ --run-command "yum install -y /root/fdio_l2/*.rpm" \ --run-command "yum install -y etcd" \ diff --git a/build/variables.sh b/build/variables.sh index 5249c2ec..32d6aed9 100644 --- a/build/variables.sh +++ b/build/variables.sh @@ -57,6 +57,15 @@ netvpp_pkg=python-networking-vpp-0.0.1-1.git${NETVPP_COMMIT}$(rpm -E %dist).noar gluon_rpm=gluon-0.0.1-1_20170302.noarch.rpm +fdio_l3_uri_base=http://artifacts.opnfv.org/apex/danube/fdio_l3_rpms +fdio_l3_pkgs=( +'vpp-17.04-rc0~399_g17a75cb~b2022.x86_64.rpm' +'vpp-api-python-17.04-rc0~399_g17a75cb~b2022.x86_64.rpm' +'vpp-lib-17.04-rc0~399_g17a75cb~b2022.x86_64.rpm' +'vpp-plugins-17.04-rc0~399_g17a75cb~b2022.x86_64.rpm' +'honeycomb-1.17.04-2503.noarch.rpm' +) + fdio_l2_uri_base=http://artifacts.opnfv.org/apex/danube/fdio_l2_rpms fdio_l2_pkgs=( 'vpp-17.04-rc0~300_gdef19da~b1923.x86_64.rpm' |