Update vpp-agent version

- Fix small bug in kubectl get pods
- Update vpp-agent release version
- Add ability to recompile vpp-agent from VPP. This could eliminate issue in case of some API mismatch)

Change-Id: Id9e8758017f3e5504e8a19b607b8ac37f26cf945
Signed-off-by: Peter Mikus <pmikus@cisco.com>

diff --git a/VPP_AGENT_STABLE_VER b/VPP_AGENT_STABLE_VER
index 849f17f..037b62f 100644 (file)
--- a/VPP_AGENT_STABLE_VER
+++ b/VPP_AGENT_STABLE_VER
@@ -1 +1 @@
-v1.0.5-2-g0c0f202
+v1.0.8-6-gd4339b8
\ No newline at end of file

diff --git a/bootstrap-verify-perf-ligato.sh b/bootstrap-verify-perf-ligato.sh
index e11b5e7..6654972 100644 (file)
--- a/bootstrap-verify-perf-ligato.sh
+++ b/bootstrap-verify-perf-ligato.sh
@@ -62,6 +62,7 @@ then
         VPP_DEBS="$( readlink -f *.deb | tr '\n' ' ' )"
     fi
 
+    dpkg -x vpp-${VPP_STABLE_VER}${VPP_CLASSIFIER}.deb /tmp/vpp
     # Temporary workaround as ligato docker file requires specific file name
     rename -v 's/^(.*)-(\d.*)-deb.deb/$1_$2.deb/' *.deb
     cd ${SCRIPT_DIR}
@@ -77,6 +78,7 @@ then
     VPP_STABLE_VER="$( expr match $1 'vpp-\(.*\)-deb.deb' )"
     # Move files to build-root for packing
     for deb in ${VPP_DEBS}; do mv ${deb} vpp/build-root/; done
+    dpkg -x vpp/build-root/vpp_${VPP_STABLE_VER}.deb /tmp/vpp
 else
     echo "Unable to identify job type based on JOB_NAME variable: ${JOB_NAME}"
     exit 1
@@ -119,10 +121,26 @@ sudo docker tag ligato/dev-vpp-agent:${VPP_AGENT_STABLE_VER}\
     dev_vpp_agent:latest
 sudo docker images
 
+# Start dev_vpp_agent container as daemon
+sudo docker run --rm -itd --name agentcnt dev_vpp_agent bash
+# Copy latest vpp api into running container
+sudo docker cp /tmp/vpp/usr/share/vpp/api agentcnt:/usr/share/vpp
+# Recompile vpp-agent
+sudo docker exec -i agentcnt \
+    script -qc '. ~/.bashrc; cd /root/go/src/github.com/ligato/vpp-agent && make generate && make install'
+# Extract vpp-agent
+rm -rf agent
+mkdir -p agent
+sudo docker cp agentcnt:/root/go/bin/vpp-agent agent/
+sudo docker cp agentcnt:/root/go/bin/vpp-agent-ctl agent/
+sudo docker cp agentcnt:/root/go/bin/agentctl agent/
+tar -zcvf ${SCRIPT_DIR}/../vpp-agent/docker/prod_vpp_agent/agent.tar.gz agent
+# Kill running container
+sudo docker rm -f agentcnt
+
 # Build prod_vpp_agent docker image
 cd ${SCRIPT_DIR}/../vpp-agent/docker/prod_vpp_agent/ &&\
     mv ${SCRIPT_DIR}/vpp.tar.gz . &&\
-    ./extract_agent_files.sh &&\
     sudo docker build -t prod_vpp_agent --no-cache .
 # Export Docker image
 sudo docker save prod_vpp_agent | gzip > prod_vpp_agent.tar.gz

diff --git a/resources/libraries/python/KubernetesUtils.py b/resources/libraries/python/KubernetesUtils.py
index ceeab0b..89c5bd2 100644 (file)
--- a/resources/libraries/python/KubernetesUtils.py
+++ b/resources/libraries/python/KubernetesUtils.py
@@ -320,7 +320,7 @@ class KubernetesUtils(object):
         cmd = "for p in $(kubectl get pods {nspace} -o jsonpath="\
             "'{{.items[*].metadata.name}}'); do echo $p; kubectl logs "\
             "{nspace} $p; done".format(nspace=nspace)
-        ssh.exec_command_sudo(cmd)
+        ssh.exec_command(cmd)
 
     @staticmethod
     def get_kubernetes_logs_on_all_duts(nodes, nspace):