diff options
| author |   Marco Platania <platania@research.att.com> | 2018-07-11 15:03:55 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-07-11 15:03:55 +0000 |
| commit | 8043ce8591b6c5f2d5296b4bbbd6716815716d44 (patch) | |
| tree | 0d274fcdd99350fade74d2fe0a1d4fd52f5e7dc7 /vnfs/vCPE/scripts | |
| parent | ab98f6a0db3df8f5232395d899e96462dbc11159 (diff) | |
| parent | d187917a1d01faa17f244a432b7c79045a9d9273 (diff) | |
Merge "Fix vCPE VNF vBRG image build issue"
Diffstat (limited to 'vnfs/vCPE/scripts')
| -rwxr-xr-x | vnfs/vCPE/scripts/v_brgemu_install.sh | 8 |
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 |