From 01425b1e805750bfb201bc0329acd1fc679a1985 Mon Sep 17 00:00:00 2001 From: Mrunal Patel Date: Mon, 13 Nov 2017 18:38:16 -0800 Subject: [PATCH] test: Add a version var for kube branches This allows us to cache a k8s branch for cri-o 1.0 branch while allowing overriding of k8s branch in master and other newer cri-o branches. Signed-off-by: Mrunal Patel --- contrib/test/integration/build/kubernetes.yml | 2 +- contrib/test/integration/main.yml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/contrib/test/integration/build/kubernetes.yml b/contrib/test/integration/build/kubernetes.yml index f0b929a7..8771d3f6 100644 --- a/contrib/test/integration/build/kubernetes.yml +++ b/contrib/test/integration/build/kubernetes.yml @@ -4,7 +4,7 @@ git: repo: "https://github.com/runcom/kubernetes.git" dest: "{{ ansible_env.GOPATH }}/src/k8s.io/kubernetes" - version: "cri-o-patched-1.8" + version: "{{ k8s_git_version }}" force: "{{ force_clone | default(False) | bool}}" - name: install etcd diff --git a/contrib/test/integration/main.yml b/contrib/test/integration/main.yml index 19dd5b3e..491bf8e1 100644 --- a/contrib/test/integration/main.yml +++ b/contrib/test/integration/main.yml @@ -19,6 +19,8 @@ - name: clone build and install kubernetes include: "build/kubernetes.yml" + vars: + k8s_git_version: "cri-o-node-e2e-patched-logs" - name: clone build and install runc include: "build/runc.yml" @@ -58,6 +60,7 @@ include: "build/kubernetes.yml" vars: force_clone: True + k8s_git_version: "cri-o-patched-1.8" - name: run k8s e2e tests include: e2e.yml