Merge "Update vCPE vBNG vpp to released version"

[demo.git] / vnfs / vCPE / scripts / v_brgemu_install.sh

diff --git a/vnfs/vCPE/scripts/v_brgemu_install.sh b/vnfs/vCPE/scripts/v_brgemu_install.sh
index f8824f9..9e8d9d4 100755 (executable)
--- a/vnfs/vCPE/scripts/v_brgemu_install.sh
+++ b/vnfs/vCPE/scripts/v_brgemu_install.sh
@@ -5,10 +5,10 @@ REPO_URL_ARTIFACTS=$(cat /opt/config/repo_url_artifacts.txt)
 DEMO_ARTIFACTS_VERSION=$(cat /opt/config/demo_artifacts_version.txt)
 INSTALL_SCRIPT_VERSION=$(cat /opt/config/install_script_version.txt)
 VPP_SOURCE_REPO_URL=$(cat /opt/config/vpp_source_repo_url.txt)
-VPP_SOURCE_REPO_BRANCH=$(cat /opt/config/vpp_source_repo_branch.txt)
+VPP_SOURCE_REPO_RELEASE_TAG=$(cat /opt/config/vpp_source_repo_release_tag.txt)
 VPP_PATCH_URL=$(cat /opt/config/vpp_patch_url.txt)
 HC2VPP_SOURCE_REPO_URL=$(cat /opt/config/hc2vpp_source_repo_url.txt)
-HC2VPP_SOURCE_REPO_BRANCH=$(cat /opt/config/hc2vpp_source_repo_branch.txt)
+HC2VPP_SOURCE_REPO_RELEASE_TAG=$(cat /opt/config/hc2vpp_source_repo_release_tag.txt)
 CLOUD_ENV=$(cat /opt/config/cloud_env.txt)
 
 # Build states are:
@@ -56,7 +56,7 @@ then
     apt-get install -y expect git patch make linux-image-extra-`uname -r`
     #Download and build the VPP codes
     cd /opt
-    git clone ${VPP_SOURCE_REPO_URL} -b ${VPP_SOURCE_REPO_BRANCH} vpp
+    git clone ${VPP_SOURCE_REPO_URL} -b ${VPP_SOURCE_REPO_RELEASE_TAG} vpp
     wget -O VPP-Add-Option82-Nat-Filter-For-vBRG.patch ${VPP_PATCH_URL}
 
     cd vpp
@@ -326,10 +326,10 @@ do
     sleep 1
 done
 EOF
+
     chmod +x /opt/set_nat.sh
-fi  # endif BUILD_STATE != "build"
 
-#Create script to run bind_nic.sh and set_nat.sh
+    #Create script to run bind_nic.sh and set_nat.sh
     cat > /opt/nat_service.sh << 'EOF'
 #! /bin/bash
 
@@ -340,12 +340,14 @@ sleep 15
 EOF
     chmod +x /opt/nat_service.sh
 
+fi  # endif BUILD_STATE != "build"
+
 if [[ $BUILD_STATE != "done" ]]
 then
 
     # Download and install HC2VPP from source
     cd /opt
-    git clone ${HC2VPP_SOURCE_REPO_URL} -b ${HC2VPP_SOURCE_REPO_BRANCH} hc2vpp
+    git clone ${HC2VPP_SOURCE_REPO_URL} -b ${HC2VPP_SOURCE_REPO_RELEASE_TAG} hc2vpp
 
     apt-get -f -y install
     apt-get install -y maven