Merge branch 'upg_upgrade_to_stable_1.2' into 'develop'

upg upgrade to stable 1.2

See merge request oai/cn5g/oai-cn5g-upf-vpp!15

docker/Dockerfile.upf-vpp.rhel7

@@ -64,10 +64,8 @@ COPY . .
 
 # Applying vpp patches
 RUN git clone -b stable/2101 https://github.com/fdio/vpp.git && \
-    git clone https://github.com/travelping/upg-vpp.git && \
-    # For the moment let us fix a given commit
+    git clone -b stable/1.2 https://github.com/travelping/upg-vpp.git && \
     cd upg-vpp && \
-    git checkout -f 1f047425c5c99db44c2e599ad1dfd767d426cce8 && \
     cd .. && \
     mv upg-vpp/upf/ vpp/src/plugins/ && \
     mv upg-vpp/vpp-patches/* scripts/patches/ && \

docker/Dockerfile.upf-vpp.ubuntu18

@@ -57,10 +57,8 @@ COPY . .
 
 # Applying vpp patches
 RUN git clone -b stable/2101 https://github.com/fdio/vpp.git && \
-    git clone https://github.com/travelping/upg-vpp.git && \
-    # For the moment let us fix a given commit
+    git clone -b stable/1.2 https://github.com/travelping/upg-vpp.git && \
     cd upg-vpp && \
-    git checkout -f 1f047425c5c99db44c2e599ad1dfd767d426cce8 && \
     cd .. && \
     mv upg-vpp/upf/ vpp/src/plugins/ && \
     mv upg-vpp/vpp-patches/* scripts/patches/ && \