Merge pull request #676 from ondrej-fabry/remove-submodule

Remove vpp git submodule (in master)

docker/dev_vpp_agent/Dockerfile

@@ -24,9 +24,10 @@ RUN mkdir -p /opt/vpp-agent/dev /opt/vpp-agent/plugin
 WORKDIR /opt/vpp-agent/dev
 
 ARG VPP_COMMIT
+ARG VPP_REPO_URL
 
 RUN /bin/bash -c "\
-    git clone https://github.com/ligato/vpp.git \
+    git clone ${VPP_REPO_URL} \
     && cd vpp \
     && git checkout ${VPP_COMMIT} \
     && UNATTENDED=y make vpp_configure_args_vpp='--disable-japi --disable-vom' install-dep bootstrap dpdk-install-dev build build-release;"

docker/dev_vpp_agent/build.sh

@@ -6,10 +6,12 @@ VPP_DEBUG_DEB=${VPP_DEBUG_DEB:-}
 IMAGE_TAG=${IMAGE_TAG:-dev_vpp_agent}
 
 AGENT_COMMIT=`git rev-parse HEAD`
-VPP_COMMIT=`cd ../.. && git submodule status|grep vpp|cut -c2-41`
+
+source ../../vpp.env
 
 echo "repo agent commit: ${AGENT_COMMIT}"
 echo "repo vpp commit:   ${VPP_COMMIT}"
+echo "repo vpp repo url: ${VPP_REPO_URL}"
 
 while [ "$1" != "" ]; do
     case $1 in
@@ -30,4 +32,9 @@ done
 echo
 echo "building docker image: ${IMAGE_TAG}"
 
-sudo docker build --tag ${IMAGE_TAG} --build-arg VPP_DEBUG_DEB=${VPP_DEBUG_DEB} --build-arg AGENT_COMMIT=${AGENT_COMMIT} --build-arg VPP_COMMIT=${VPP_COMMIT} .
+sudo docker build --tag ${IMAGE_TAG} \
+    --build-arg VPP_DEBUG_DEB=${VPP_DEBUG_DEB} \
+    --build-arg AGENT_COMMIT=${AGENT_COMMIT} \
+    --build-arg VPP_COMMIT=${VPP_COMMIT} \
+    --build-arg VPP_REPO_URL=${VPP_REPO_URL} \
+  .

vpp.env

@@ -0,0 +1,2 @@
+VPP_REPO_URL=https://gerrit.fd.io/r/vpp.git
+VPP_COMMIT=2302d0dfa27a348d96a6c9a7d667bd910280a098