summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2017-04-09 02:46:59 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-04-09 02:46:59 +0000
commitdec6bf3f25f340c2523c9f288400499072bfbe94 (patch)
tree1455b2c3bee6b26feb178d58cdca2f34645e119c /build
parentfd92fd7332bdd97564ecad0fb87c7e54603b94e2 (diff)
parent778593a0d93f1a994c58a30c2dfc3f2243bf1b2f (diff)
Merge "nosdn fdio scenario fixes"
Diffstat (limited to 'build')
-rwxr-xr-xbuild/overcloud-full.sh11
-rw-r--r--build/variables.sh8
2 files changed, 18 insertions, 1 deletions
diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh
index 963579f3..c6a53e3d 100755
--- a/build/overcloud-full.sh
+++ b/build/overcloud-full.sh
@@ -94,6 +94,13 @@ for package in ${fdio_l2_pkgs[@]}; do
fdio_l2_pkg_str+=" --upload ${BUILD_DIR}/${package}:/root/fdio_l2/"
done
+# FDIO packages frozen for nosdn scenarios
+fdio_nosdn_pkg_str=''
+for package in ${fdio_nosdn_pkgs[@]}; do
+ wget "$fdio_nosdn_uri_base/$package"
+ fdio_nosdn_pkg_str+=" --upload ${BUILD_DIR}/${package}:/root/fdio_nosdn/"
+done
+
# Increase disk size by 900MB to accommodate more packages
qemu-img resize overcloud-full_build.qcow2 +900MB
@@ -121,9 +128,11 @@ LIBGUESTFS_BACKEND=direct virt-customize \
$dpdk_pkg_str \
--run-command "mkdir /root/fdio_l3" \
--run-command "mkdir /root/fdio_l2" \
- --upload ${BUILD_DIR}/noarch/$netvpp_pkg:/root/fdio_l2 \
+ --run-command "mkdir /root/fdio_nosdn" \
+ --upload ${BUILD_DIR}/noarch/$netvpp_pkg:/root/fdio_nosdn \
$fdio_l3_pkg_str \
$fdio_l2_pkg_str \
+ $fdio_nosdn_pkg_str \
--run-command "yum install -y /root/fdio_l2/*.rpm" \
--run-command "yum install -y etcd" \
--install python-etcd \
diff --git a/build/variables.sh b/build/variables.sh
index 32d6aed9..6064dc8e 100644
--- a/build/variables.sh
+++ b/build/variables.sh
@@ -73,3 +73,11 @@ fdio_l2_pkgs=(
'vpp-lib-17.04-rc0~300_gdef19da~b1923.x86_64.rpm'
'vpp-plugins-17.04-rc0~300_gdef19da~b1923.x86_64.rpm'
)
+
+fdio_nosdn_uri_base=http://artifacts.opnfv.org/apex/danube/fdio_nosdn_rpms
+fdio_nosdn_pkgs=(
+'vpp-17.04-rc0~476_geaabe07~b2100.x86_64.rpm'
+'vpp-api-python-17.04-rc0~476_geaabe07~b2100.x86_64.rpm'
+'vpp-lib-17.04-rc0~476_geaabe07~b2100.x86_64.rpm'
+'vpp-plugins-17.04-rc0~476_geaabe07~b2100.x86_64.rpm'
+)