From 8c8184129ea268f919cffcea1f2ec509b7cbabce Mon Sep 17 00:00:00 2001
From: Enyinna Ochulor <enyinna.ochulor@intel.com>
Date: Thu, 12 Jul 2018 12:06:34 -0700
Subject: Fix vGMUX building from snapshot dependency issues

The vgmux env, yaml, install script, and  hc2vpp patch files were edited to remove snapshot dependencies.

Change-Id: Ibfdef8cf35013c4fea8254437d12098a0bb82575
Issue-ID: INT-525
Signed-off-by: Enyinna Ochulor <enyinna.ochulor@intel.com>
---
 vnfs/vCPE/scripts/v_gmux_install.sh                |  8 ++---
 .../patches/Hc2vpp-Add-VES-agent-for-vG-MUX.patch  | 34 +++++++++++-----------
 2 files changed, 21 insertions(+), 21 deletions(-)

(limited to 'vnfs/vCPE')

diff --git a/vnfs/vCPE/scripts/v_gmux_install.sh b/vnfs/vCPE/scripts/v_gmux_install.sh
index e1702ee4..5245c6d7 100644
--- a/vnfs/vCPE/scripts/v_gmux_install.sh
+++ b/vnfs/vCPE/scripts/v_gmux_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)
 HC2VPP_PATCH_URL=$(cat /opt/config/hc2vpp_patch_url.txt)
 LIBEVEL_PATCH_URL=$(cat /opt/config/libevel_patch_url.txt)
 CLOUD_ENV=$(cat /opt/config/cloud_env.txt)
@@ -77,7 +77,7 @@ then
 
     #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-VES-agent-for-vG-MUX.patch ${VPP_PATCH_URL} 
 
     cd vpp
@@ -249,7 +249,7 @@ 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
     wget -O Hc2vpp-Add-VES-agent-for-vG-MUX.patch ${HC2VPP_PATCH_URL}
 
     apt-get install -y maven
diff --git a/vnfs/vCPE/vpp-ves-agent-for-vgmux/src/patches/Hc2vpp-Add-VES-agent-for-vG-MUX.patch b/vnfs/vCPE/vpp-ves-agent-for-vgmux/src/patches/Hc2vpp-Add-VES-agent-for-vG-MUX.patch
index 7899ed9a..47c8388e 100644
--- a/vnfs/vCPE/vpp-ves-agent-for-vgmux/src/patches/Hc2vpp-Add-VES-agent-for-vG-MUX.patch
+++ b/vnfs/vCPE/vpp-ves-agent-for-vgmux/src/patches/Hc2vpp-Add-VES-agent-for-vG-MUX.patch
@@ -60,13 +60,13 @@ index 0000000..1ded010
 +  <parent>
 +    <groupId>io.fd.hc2vpp.common</groupId>
 +    <artifactId>hc2vpp-parent</artifactId>
-+    <version>1.17.04.1-SNAPSHOT</version>
++    <version>1.17.04</version>
 +    <relativePath>../common/hc2vpp-parent</relativePath>
 +  </parent>
 +
 +  <groupId>io.fd.hc2vpp.ves</groupId>
 +  <artifactId>ves-agent</artifactId>
-+  <version>1.17.04.1-SNAPSHOT</version>
++  <version>1.17.04</version>
 +  <name>ves-agent</name>
 +  <packaging>pom</packaging>
 +  <modelVersion>4.0.0</modelVersion>
@@ -131,7 +131,7 @@ index 0000000..78bf47b
 +  <parent>
 +    <groupId>io.fd.hc2vpp.common</groupId>
 +    <artifactId>api-parent</artifactId>
-+    <version>1.17.04.1-SNAPSHOT</version>
++    <version>1.17.04</version>
 +    <relativePath>../../common/api-parent</relativePath>
 +  </parent>
 +
@@ -139,7 +139,7 @@ index 0000000..78bf47b
 +  <groupId>io.fd.hc2vpp.ves</groupId>
 +  <artifactId>ves-api</artifactId>
 +  <name>ves-api</name>
-+  <version>1.17.04.1-SNAPSHOT</version>
++  <version>1.17.04</version>
 +  <packaging>bundle</packaging>
 +
 +  <dependencies>
@@ -282,7 +282,7 @@ index 0000000..5ed2c1b
 +    <parent>
 +        <groupId>io.fd.hc2vpp.common</groupId>
 +        <artifactId>vpp-impl-parent</artifactId>
-+        <version>1.17.04.1-SNAPSHOT</version>
++        <version>1.17.04</version>
 +        <relativePath>../../vpp-common/vpp-impl-parent</relativePath>
 +    </parent>
 +
@@ -290,12 +290,12 @@ index 0000000..5ed2c1b
 +    <groupId>io.fd.hc2vpp.ves</groupId>
 +    <artifactId>ves-impl</artifactId>
 +    <name>${project.artifactId}</name>
-+    <version>1.17.04.1-SNAPSHOT</version>
++    <version>1.17.04</version>
 +    <packaging>bundle</packaging>
 +
 +    <properties>
-+        <honeycomb.infra.version>1.17.04.1-SNAPSHOT</honeycomb.infra.version>
-+        <hc2vpp.common.version>1.17.04.1-SNAPSHOT</hc2vpp.common.version>
++        <honeycomb.infra.version>1.17.04</honeycomb.infra.version>
++        <hc2vpp.common.version>1.17.04</hc2vpp.common.version>
 +    </properties>
 +
 +    <dependencies>
@@ -319,7 +319,7 @@ index 0000000..5ed2c1b
 +        <dependency>
 +            <groupId>io.fd.vpp</groupId>
 +            <artifactId>jvpp-ves</artifactId>
-+            <version>17.04.2-SNAPSHOT</version>
++            <version>17.04</version>
 +        </dependency>
 +
 +        <!-- Honeycomb infrastructure-->
@@ -369,7 +369,7 @@ index 0000000..5ed2c1b
 +        <dependency>
 +            <groupId>io.fd.honeycomb</groupId>
 +            <artifactId>translate-impl</artifactId>
-+            <version>1.17.04.1-SNAPSHOT</version>
++            <version>1.17.04</version>
 +        </dependency>
 +
 +
@@ -1055,13 +1055,13 @@ index e126114..ca0e5b2 100644
 --- a/vpp-integration/minimal-distribution/pom.xml
 +++ b/vpp-integration/minimal-distribution/pom.xml
 @@ -40,6 +40,7 @@
-     <routing.version>1.17.04.1-SNAPSHOT</routing.version>
-     <acl.version>1.17.04.1-SNAPSHOT</acl.version>
-     <dhcp.version>1.17.04.1-SNAPSHOT</dhcp.version>
-+    <vesagent.version>1.17.04.1-SNAPSHOT</vesagent.version>
-     <vpp.classifier.version>1.17.04.1-SNAPSHOT</vpp.classifier.version>
-     <l3-impl.version>1.17.04.1-SNAPSHOT</l3-impl.version>
-     <vpp-management-impl.version>1.17.04.1-SNAPSHOT</vpp-management-impl.version>
+     <routing.version>1.17.04</routing.version>
+     <acl.version>1.17.04</acl.version>
+     <dhcp.version>1.17.04</dhcp.version>
++    <vesagent.version>1.17.04</vesagent.version>
+     <vpp.classifier.version>1.17.04</vpp.classifier.version>
+     <l3-impl.version>1.17.04</l3-impl.version>
+     <vpp-management-impl.version>1.17.04</vpp-management-impl.version>
 @@ -63,6 +64,7 @@
        io.fd.hc2vpp.routing.RoutingModule,
        io.fd.hc2vpp.acl.AclModule,
-- 
cgit 1.2.3-korg