summaryrefslogtreecommitdiffstats
path: root/VNFs/DPPD-PROX/helper-scripts/rapid/deploycentostools.sh
diff options
context:
space:
mode:
authorXavier Simonart <xavier.simonart@intel.com>2020-01-31 17:13:30 +0000
committerGerrit Code Review <gerrit@opnfv.org>2020-01-31 17:13:30 +0000
commit5d3bcf89c23b72fcdc0c32306a843bb3a0f64dcf (patch)
treefbee0a5daffa85d102b2a295914930ed99158228 /VNFs/DPPD-PROX/helper-scripts/rapid/deploycentostools.sh
parentb71a4cfd39acd385a8ac80bdae4cb83064cc5e25 (diff)
parent438a3dcafd3bd943b4f7cadf0520fd9a2e74b079 (diff)
Merge changes from topic "TST009_benchmark"
* changes: New PROX commit ID and bug fix code review comments and PROX commit ID Code review feedback & back-ground traffic support Fix run_iteration when not using the sut_sock Specify latency bucket size & correct calculation Initial support for percentile latency measurements Combine code for fixed rate and variable rate tests Better Latency accuray warning message Support for ETSI GS NFV-TST 009
Diffstat (limited to 'VNFs/DPPD-PROX/helper-scripts/rapid/deploycentostools.sh')
-rw-r--r--VNFs/DPPD-PROX/helper-scripts/rapid/deploycentostools.sh8
1 files changed, 6 insertions, 2 deletions
diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/deploycentostools.sh b/VNFs/DPPD-PROX/helper-scripts/rapid/deploycentostools.sh
index ddef6448..1d260d61 100644
--- a/VNFs/DPPD-PROX/helper-scripts/rapid/deploycentostools.sh
+++ b/VNFs/DPPD-PROX/helper-scripts/rapid/deploycentostools.sh
@@ -20,7 +20,11 @@ WORK_DIR="/home/centos" # Directory where the packer tool has copied some files
# Runtime scripts are assuming ${WORK_DIR} as the directory for PROX. Check the rundir variable in runrapid.py. Should be the same!
# This variable is defined in 4 different places and should have the same value: centos.json, deploycentos.sh, check_prox_system_setup.sh and runrapid.py
DPDK_VERSION="19.05"
-PROX_COMMIT="f456ab65"
+PROX_COMMIT="b71a4cfd"
+PROX_CHECKOUT="git checkout ${PROX_COMMIT}"
+## Next line is overruling the PROX_COMMIT and will replace the version with a very specific patch. Should be commented out
+## if you want to use a committed version of PROX
+##PROX_CHECKOUT="git fetch \"https://gerrit.opnfv.org/gerrit/samplevnf\" refs/changes/75/69475/2 && git checkout FETCH_HEAD"
MULTI_BUFFER_LIB_VER="0.52"
export RTE_SDK="${BUILD_DIR}/dpdk-${DPDK_VERSION}"
export RTE_TARGET="x86_64-native-linuxapp-gcc"
@@ -125,7 +129,7 @@ function prox_install()
pushd ${BUILD_DIR} > /dev/null 2>&1
git clone https://git.opnfv.org/samplevnf
pushd ${BUILD_DIR}/samplevnf/VNFs/DPPD-PROX
- git checkout ${PROX_COMMIT}
+ ${PROX_CHECKOUT}
popd > /dev/null 2>&1
prox_compile
sudo ln -s ${BUILD_DIR}/samplevnf/VNFs/DPPD-PROX ${WORK_DIR}/prox