summaryrefslogtreecommitdiffstats
path: root/vnfs/vCPE
diff options
context:
space:
mode:
authorMariah Jacobs <mariah.jacobs@intel.com>2018-07-10 15:01:20 -0700
committerMariah Jacobs <mariah.jacobs@intel.com>2018-07-10 15:02:50 -0700
commitd187917a1d01faa17f244a432b7c79045a9d9273 (patch)
treea5868e7d2ed9442e17ce251f980d2660f27f0794 /vnfs/vCPE
parentfd761391ba59ba11452270807033e3605da5c6a4 (diff)
Fix vCPE VNF vBRG image build issue
Checkout hc2vpp and vpp released code rather than stable branches. Modify heat and env template parameters to specify release tag is checked out. The buildable vBRG image is no longer dependent on snapshot artifacts. Issue-ID: INT-525 Change-Id: Ic13ce1c11138856a0958ec8af0c2c9f293f206f9 Signed-off-by: Mariah Jacobs <mariah.jacobs@intel.com>
Diffstat (limited to 'vnfs/vCPE')
-rwxr-xr-xvnfs/vCPE/scripts/v_brgemu_install.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/vnfs/vCPE/scripts/v_brgemu_install.sh b/vnfs/vCPE/scripts/v_brgemu_install.sh
index e3a32fd5..9e8d9d47 100755
--- 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
@@ -347,7 +347,7 @@ 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