Merge pull request #1153 from mrunalp/add_kube_version_var

test: Add a version var for kube branches
cri-o · Nov 14, 2017 · 429a687 · 429a687
2 parents e747160 + 3596aa0
commit 429a687
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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