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>

3 files changed, 16 insertions, 16 deletions

diff --git a/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.env b/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.env
index a08a84f6..788a25c8 100644
--- a/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.env
+++ b/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.env
@@ -22,7 +22,7 @@
   pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh
   cloud_env: PUT THE CLOUD PROVIDED HERE (openstack or rackspace)
   vpp_source_repo_url: https://gerrit.fd.io/r/vpp
-  vpp_source_repo_branch: stable/1704
+  vpp_source_repo_release_tag: v17.04
   hc2vpp_source_repo_url: https://gerrit.fd.io/r/hc2vpp
-  hc2vpp_source_repo_branch: stable/1704
+  hc2vpp_source_repo_release_tag: v1.17.04
   vpp_patch_url: https://git.onap.org/demo/plain/vnfs/vCPE/vpp-option-82-for-vbrg/src/patches/VPP-Add-Option82-Nat-Filter-For-vBRG.patch
diff --git a/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.yaml b/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.yaml
index a7869950..50d79022 100644
--- a/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.yaml
+++ b/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.yaml
@@ -119,18 +119,18 @@ parameters:
     type: string
     label: VPP Source Git Repo
     description: URL for VPP source codes
-  vpp_source_repo_branch:
+  vpp_source_repo_release_tag:
     type: string
-    label: VPP Source Git Branch
-    description: Git Branch for the VPP source codes
+    label: VPP Source Git Release Tag
+    description: Git Release Tag for the VPP source codes
   hc2vpp_source_repo_url:
     type: string
     label: Honeycomb Source Git Repo
     description: URL for Honeycomb source codes
-  hc2vpp_source_repo_branch:
+  hc2vpp_source_repo_release_tag:
     type: string
-    label: Honeycomb Source Git Branch
-    description: Git Branch for the Honeycomb source codes
+    label: Honeycomb Source Git Release Tag
+    description: Git Release Tag for the Honeycomb source codes
   vpp_patch_url:
     type: string
     label: VPP Patch URL
@@ -219,9 +219,9 @@ resources:
             __install_script_version__ : { get_param: install_script_version }
             __cloud_env__ : { get_param: cloud_env }
             __vpp_source_repo_url__ : { get_param: vpp_source_repo_url }
-            __vpp_source_repo_branch__ : { get_param: vpp_source_repo_branch }
+            __vpp_source_repo_release_tag__ : { get_param: vpp_source_repo_release_tag }
             __hc2vpp_source_repo_url__ : { get_param: hc2vpp_source_repo_url }
-            __hc2vpp_source_repo_branch__ : { get_param: hc2vpp_source_repo_branch }
+            __hc2vpp_source_repo_release_tag__ : { get_param: hc2vpp_source_repo_release_tag }
             __vpp_patch_url__ : { get_param: vpp_patch_url }
             __sdnc_ip__ : { get_param: sdnc_ip }
             __compile_state__ : { get_param: compile_state }
@@ -239,9 +239,9 @@ resources:
             echo "__install_script_version__" > /opt/config/install_script_version.txt
             echo "__cloud_env__" > /opt/config/cloud_env.txt
             echo "__vpp_source_repo_url__" > /opt/config/vpp_source_repo_url.txt
-            echo "__vpp_source_repo_branch__" > /opt/config/vpp_source_repo_branch.txt
+            echo "__vpp_source_repo_release_tag__" > /opt/config/vpp_source_repo_release_tag.txt
             echo "__hc2vpp_source_repo_url__" > /opt/config/hc2vpp_source_repo_url.txt
-            echo "__hc2vpp_source_repo_branch__" > /opt/config/hc2vpp_source_repo_branch.txt
+            echo "__hc2vpp_source_repo_release_tag__" > /opt/config/hc2vpp_source_repo_release_tag.txt
             echo "__vpp_patch_url__" > /opt/config/vpp_patch_url.txt
             echo "__sdnc_ip__" > /opt/config/sdnc_ip.txt
             echo "__compile_state__" > /opt/config/compile_state.txt
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