From d49fb788da507ade493a22b19ed491dfe29e1910 Mon Sep 17 00:00:00 2001 From: Chris Evich Date: Wed, 8 Nov 2017 11:24:57 -0500 Subject: [PATCH] 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 --- contrib/test/integration/build/kubernetes.yml | 1 + contrib/test/integration/e2e.yml | 3 --- contrib/test/integration/main.yml | 5 +++++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/contrib/test/integration/build/kubernetes.yml b/contrib/test/integration/build/kubernetes.yml index f724230c..f0b929a7 100644 --- a/contrib/test/integration/build/kubernetes.yml +++ b/contrib/test/integration/build/kubernetes.yml @@ -5,6 +5,7 @@ repo: "https://github.com/runcom/kubernetes.git" dest: "{{ ansible_env.GOPATH }}/src/k8s.io/kubernetes" version: "cri-o-patched-1.8" + force: "{{ force_clone | default(False) | bool}}" - name: install etcd command: "hack/install-etcd.sh" diff --git a/contrib/test/integration/e2e.yml b/contrib/test/integration/e2e.yml index 41f92757..5c4d656e 100644 --- a/contrib/test/integration/e2e.yml +++ b/contrib/test/integration/e2e.yml @@ -1,8 +1,5 @@ --- -- name: clone build and install kubernetes - include: "build/kubernetes.yml" - - name: enable and start CRI-O systemd: name: crio diff --git a/contrib/test/integration/main.yml b/contrib/test/integration/main.yml index ce4a206f..19dd5b3e 100644 --- a/contrib/test/integration/main.yml +++ b/contrib/test/integration/main.yml @@ -54,5 +54,10 @@ tags: - e2e tasks: + - name: clone build and install kubernetes + include: "build/kubernetes.yml" + vars: + force_clone: True + - name: run k8s e2e tests include: e2e.yml