From 3596aa015585018b4599770b043c2c2518aa340d 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 69c671c9..8c092e1c 100644 --- a/contrib/test/integration/build/kubernetes.yml +++ b/contrib/test/integration/build/kubernetes.yml @@ -5,7 +5,7 @@ repo: "https://github.com/runcom/kubernetes.git" dest: "{{ ansible_env.GOPATH }}/src/k8s.io/kubernetes" # based on kube v1.9.0-alpha.2, update as needed - version: "cri-o-patched-1.9" + 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 1e96b313..8baaec9d 100644 --- a/contrib/test/integration/main.yml +++ b/contrib/test/integration/main.yml @@ -21,6 +21,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" @@ -64,6 +66,7 @@ include: "build/kubernetes.yml" vars: force_clone: True + k8s_git_version: "cri-o-patched-1.9" - name: run k8s e2e tests include: e2e.yml