diff options
author | Luc Provoost <luc.provoost@intel.com> | 2020-01-29 08:22:32 -0500 |
---|---|---|
committer | Luc Provoost <luc.provoost@intel.com> | 2020-01-29 08:22:32 -0500 |
commit | 0630b43a41c3afbddd796446de5845a147e9091e (patch) | |
tree | 031a9070515fc9204cec6c336f22ff750dfe053b /VNFs/DPPD-PROX/helper-scripts/rapid/deploycentostools.sh | |
parent | 837fc0385061a75a5bd172e850c8716ab038c3a7 (diff) |
code review comments and PROX commit ID
Implemented the code review comments I got on previous commits and using
commit ID 2cd03b7 to select the PROX version that will be installed in
the VMs through deploycentostools.sh
Change-Id: Ifc4c18c657a8bd57c68a7fc9d885c75ffdcb7b5d
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, 3 insertions, 4 deletions
diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/deploycentostools.sh b/VNFs/DPPD-PROX/helper-scripts/rapid/deploycentostools.sh index 8d85e345..96a90de2 100644 --- a/VNFs/DPPD-PROX/helper-scripts/rapid/deploycentostools.sh +++ b/VNFs/DPPD-PROX/helper-scripts/rapid/deploycentostools.sh @@ -20,11 +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_CHECKOUT="git checkout ${PROX_COMMIT}" +PROX_COMMIT="2cd03b79" +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" +##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" @@ -129,7 +129,6 @@ 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 |