From 0472c33344d90b3471e7afba063741e8edb6d48e Mon Sep 17 00:00:00 2001 From: Antonio Murdaca Date: Thu, 25 May 2017 18:10:13 +0200 Subject: [PATCH 1/2] contrib: test: CNI plugins moved repo Signed-off-by: Antonio Murdaca --- contrib/test/crio-integration-playbook.yaml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/contrib/test/crio-integration-playbook.yaml b/contrib/test/crio-integration-playbook.yaml index 6bbe8c61..a89f35e7 100644 --- a/contrib/test/crio-integration-playbook.yaml +++ b/contrib/test/crio-integration-playbook.yaml @@ -5,6 +5,7 @@ remote_user: root vars: xunit: false + cni_commit: dcf7368eeab15e2affc6256f0bb1e84dd46a34de tasks: - name: Update all packages yum: @@ -140,8 +141,9 @@ poll: 10 - name: git clone cni repo git: - repo: https://github.com/containernetworking/cni - dest: /root/src/github.com/containernetworking/cni + repo: https://github.com/containernetworking/plugins + dest: /root/src/github.com/containernetworking/plugins + version: "{{ cni_commit }}" async: 600 poll: 10 - name: Git fetch the PR @@ -174,9 +176,9 @@ - name: Build cni networking shell: ./build.sh args: - chdir: /root/src/github.com/containernetworking/cni + chdir: /root/src/github.com/containernetworking/plugins - name: cp bin to cni bin dir - shell: cp /root/src/github.com/containernetworking/cni/bin/* /opt/cni/bin + shell: cp /root/src/github.com/containernetworking/plugins/bin/* /opt/cni/bin - name: curl ocid bridge conf file for cni networking get_url: url: https://raw.githubusercontent.com/kubernetes-incubator/cri-o/master/contrib/cni/10-ocid-bridge.conf From f51b0a10c623bf59f61a78f854a3b10958e98fe4 Mon Sep 17 00:00:00 2001 From: Antonio Murdaca Date: Thu, 25 May 2017 18:13:53 +0200 Subject: [PATCH 2/2] Dockerfile: move to containernetworking/plugins Signed-off-by: Antonio Murdaca --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index ff14ef7b..1bcfca88 100644 --- a/Dockerfile +++ b/Dockerfile @@ -56,11 +56,11 @@ RUN set -x \ && rm -rf "$GOPATH" # Install CNI plugins -ENV CNI_COMMIT d4bbce1865270cd2d2be558d6a23e63d314fe769 +ENV CNI_COMMIT dcf7368eeab15e2affc6256f0bb1e84dd46a34de RUN set -x \ && export GOPATH="$(mktemp -d)" \ - && git clone https://github.com/containernetworking/cni.git "$GOPATH/src/github.com/containernetworking/cni" \ - && cd "$GOPATH/src/github.com/containernetworking/cni" \ + && git clone https://github.com/containernetworking/plugins.git "$GOPATH/src/github.com/containernetworking/plugins" \ + && cd "$GOPATH/src/github.com/containernetworking/plugins" \ && git checkout -q "$CNI_COMMIT" \ && ./build.sh \ && mkdir -p /opt/cni/bin \