diff options
| author |   Luc Provoost <luc.provoost@intel.com> | 2020-01-23 06:12:03 -0500 |
|---|---|---|
| committer | Luc Provoost <luc.provoost@intel.com> | 2020-01-23 06:12:03 -0500 |
| commit | 203bd7b09fa3c250a23b0eb9b6ce8921c8871172 (patch) | |
| tree | 7460d8683e3b55af46c245c6ac6d3194847e15f1 /VNFs/DPPD-PROX/helper-scripts/rapid/deploycentostools.sh | |
| parent | 1eb070d16476285b3dff087cff03cf352a0aadbc (diff) | |
Fix run_iteration when not using the sut_sock
When no sut_sock monitoring the swap, the while loop would never come to
an end. Also added heartbeat timeout in the generator config files.
Change-Id: I3c36991c65b9b826faf3d051a1354ca7eb34c24e
Signed-off-by: Luc Provoost <luc.provoost@intel.com>
Diffstat (limited to 'VNFs/DPPD-PROX/helper-scripts/rapid/deploycentostools.sh')
| -rw-r--r-- | VNFs/DPPD-PROX/helper-scripts/rapid/deploycentostools.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/deploycentostools.sh b/VNFs/DPPD-PROX/helper-scripts/rapid/deploycentostools.sh index ddef6448..8d85e345 100644 --- a/VNFs/DPPD-PROX/helper-scripts/rapid/deploycentostools.sh +++ b/VNFs/DPPD-PROX/helper-scripts/rapid/deploycentostools.sh @@ -21,6 +21,10 @@ WORK_DIR="/home/centos" # Directory where the packer tool has copied some files # 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_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,8 @@ 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} + #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 |