Fix Local modifications exist in repository

Depending on the state of upstream repositories, it's possible the
kubernetes repo could change between the ``setup`` and ``run`` phase.
Alternatively, something during ``setup`` itself could mangle the repo.

Add an option to force clone the kubernetes repo.  This gives support
for testing on multiple CRI-O branches, realizing some benefit from
caching, yet also allows hauling in brand-new-kubernetes for the e2e
tests.

Signed-off-by: Chris Evich <cevich@redhat.com>
This commit is contained in:
Chris Evich 2017-11-08 11:24:57 -05:00
parent f4883dd27a
commit d49fb788da
3 changed files with 6 additions and 3 deletions

View file

@ -5,6 +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"
version: "cri-o-patched-1.8" version: "cri-o-patched-1.8"
force: "{{ force_clone | default(False) | bool}}"
- name: install etcd - name: install etcd
command: "hack/install-etcd.sh" command: "hack/install-etcd.sh"

View file

@ -1,8 +1,5 @@
--- ---
- name: clone build and install kubernetes
include: "build/kubernetes.yml"
- name: enable and start CRI-O - name: enable and start CRI-O
systemd: systemd:
name: crio name: crio

View file

@ -54,5 +54,10 @@
tags: tags:
- e2e - e2e
tasks: tasks:
- name: clone build and install kubernetes
include: "build/kubernetes.yml"
vars:
force_clone: True
- name: run k8s e2e tests - name: run k8s e2e tests
include: e2e.yml include: e2e.yml