diff options
| author |   Luc Provoost <luc.provoost@intel.com> | 2021-06-08 13:37:55 +0200 |
|---|---|---|
| committer | Luc Provoost <luc.provoost@intel.com> | 2021-06-08 13:37:55 +0200 |
| commit | d85020c43d0c65dc3891bd4cc03a159f918c62cc (patch) | |
| tree | d53401f14c334d43423128d6df11138b111e9692 /VNFs/DPPD-PROX/helper-scripts | |
| parent | ef3d8d2223899f70d93be3ffa5ff14e7ad2d421f (diff) | |
fix container image and use latest code
The container image was not containing a working prox executable any
more.
Also took out the commit id, so we always have the latest prox code in
the latest container image
Change-Id: I4336e06031d5bf5b3f08f4bc32b76703fde34040
Signed-off-by: Luc Provoost <luc.provoost@intel.com>
Diffstat (limited to 'VNFs/DPPD-PROX/helper-scripts')
| -rw-r--r-- | VNFs/DPPD-PROX/helper-scripts/rapid/deploycentostools.sh | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/deploycentostools.sh b/VNFs/DPPD-PROX/helper-scripts/rapid/deploycentostools.sh index f4d92d88..c50d7968 100644 --- a/VNFs/DPPD-PROX/helper-scripts/rapid/deploycentostools.sh +++ b/VNFs/DPPD-PROX/helper-scripts/rapid/deploycentostools.sh @@ -18,15 +18,9 @@ # Directory for package build BUILD_DIR="/opt/rapid" DPDK_VERSION="20.05" -PROX_COMMIT="8442f6a8ce0962d818b7cd800150980c65983719" -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 with the COMMIT ID specified above -## As an example: Following line has the commit for testing IMIX, IPV6, ... It is the merge of all PROX commits on May 27th 2020 -#PROX_CHECKOUT="git fetch \"https://gerrit.opnfv.org/gerrit/samplevnf\" refs/changes/23/70223/1 && git checkout FETCH_HEAD" MULTI_BUFFER_LIB_VER="0.52" -export RTE_SDK="${BUILD_DIR}/dpdk" -export RTE_TARGET="build" +export RTE_SDK="${BUILD_DIR}/dpdk-${DPDK_VERSION}" +export RTE_TARGET="x86_64-native-linuxapp-gcc" # By default, do not update OS OS_UPDATE="n" @@ -167,6 +161,8 @@ function prox_compile() { # Compile PROX pushd ${BUILD_DIR}/samplevnf/VNFs/DPPD-PROX + COMMIT_ID=$(git rev-parse HEAD) + echo "${COMMIT_ID}" > ${BUILD_DIR}/commit_id make -j`getconf _NPROCESSORS_ONLN` ${SUDO} cp ${BUILD_DIR}/samplevnf/VNFs/DPPD-PROX/build/app/prox ${BUILD_DIR}/prox popd > /dev/null 2>&1 @@ -177,8 +173,6 @@ function prox_install() # Clone PROX pushd ${BUILD_DIR} > /dev/null 2>&1 git clone https://git.opnfv.org/samplevnf - bash -c "${PROX_CHECKOUT}" - echo "${PROX_CHECKOUT}" > ${BUILD_DIR}/commit_id cp -R ./samplevnf/VNFs/DPPD-PROX/helper-scripts/rapid ./src popd > /dev/null 2>&1 prox_compile |