From a31dd496ebe8c41588c9acdaf7db73a90f3f72fa Mon Sep 17 00:00:00 2001 From: Archana Shinde Date: Sat, 16 Jun 2018 21:41:14 -0700 Subject: [PATCH] cni: Use the vendored version of CNI plugins to install binaries Out CI is failing because of a recent change introduced in the CNI plugins repo(github.com/containernetworking/plugins) that vendors in CNI v0.7.0-alpha0. Refer to commit #e4fdb6cd1883b7b. However, it looks like the the plugins themselves have not been updated yet, causing failures in CI. This was verified by vendoring in the latest CNI and CNI plugins in our repo. Till the plugin binaries our fixed, use older version of CNI plugins for testing virtcontainers. See this: https://github.com/containernetworking/plugins/commit/68b4efb4056c In any case we should keep this version in sync with what we vendor in, in our runtime and not use the latest commit. Signed-off-by: Archana Shinde --- virtcontainers/utils/virtcontainers-setup.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/virtcontainers/utils/virtcontainers-setup.sh b/virtcontainers/utils/virtcontainers-setup.sh index d241ad8cd3..ef56c220a7 100755 --- a/virtcontainers/utils/virtcontainers-setup.sh +++ b/virtcontainers/utils/virtcontainers-setup.sh @@ -60,12 +60,13 @@ echo -e "Move to ${tmpdir}/${virtcontainers_build_dir}" pushd ${tmpdir}/${virtcontainers_build_dir} echo "Clone cni" git clone https://github.com/containernetworking/plugins.git +pushd plugins +git checkout 7f98c94613021d8b57acfa1a2f0c8d0f6fd7ae5a echo "Copy CNI config files" cp $GOPATH/src/github.com/kata-containers/runtime/virtcontainers/test/cni/10-mynet.conf ${ETCDIR}/cni/net.d/ cp $GOPATH/src/github.com/kata-containers/runtime/virtcontainers/test/cni/99-loopback.conf ${ETCDIR}/cni/net.d/ -pushd plugins ./build.sh cp ./bin/bridge ${TMPDIR}/cni/bin/cni-bridge cp ./bin/loopback ${TMPDIR}/cni/bin/loopback