vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

test: Add a version var for kube branches

Browse source 
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 <mrunalp@gmail.com>
This commit is contained in:
Mrunal Patel 2017-11-13 18:38:16 -08:00
parent 6ed8fbeea2
commit 3596aa0155
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
contrib/test/integration/build/kubernetes.yml
View file

@ -5,7 +5,7 @@
repo: "https://github.com/runcom/kubernetes.git" repo: "https://github.com/runcom/kubernetes.git"
dest: "{{ ansible_env.GOPATH }}/src/k8s.io/kubernetes" dest: "{{ ansible_env.GOPATH }}/src/k8s.io/kubernetes"
# based on kube v1.9.0-alpha.2, update as needed # 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}}" force: "{{ force_clone | default(False) | bool}}"
- name: install etcd - name: install etcd

3
contrib/test/integration/main.yml
View file

@ -21,6 +21,8 @@
- name: clone build and install kubernetes - name: clone build and install kubernetes
include: "build/kubernetes.yml" include: "build/kubernetes.yml"
vars:
k8s_git_version: "cri-o-node-e2e-patched-logs"
- name: clone build and install runc - name: clone build and install runc
include: "build/runc.yml" include: "build/runc.yml"
@ -64,6 +66,7 @@
include: "build/kubernetes.yml" include: "build/kubernetes.yml"
vars: vars:
force_clone: True force_clone: True
k8s_git_version: "cri-o-patched-1.9"
- name: run k8s e2e tests - name: run k8s e2e tests
include: e2e.yml include: e2e.yml