From 70b83fd641d96206b66153e08c11612dfaa3bd60 Mon Sep 17 00:00:00 2001 From: Chris Evich Date: Fri, 3 Nov 2017 15:37:37 -0400 Subject: [PATCH] Fix e2e test dependency on building k8s These two should not be tightly-coupled. e.g. for RPM testing, the packages will be built/installed, then e2e tests will run. Having k8s secondarily built/installed will seriously screw with rpm-building and testing. Signed-off-by: Chris Evich --- contrib/test/integration/e2e.yml | 3 --- contrib/test/integration/main.yml | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) 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 e095aeb4..f09d8d52 100644 --- a/contrib/test/integration/main.yml +++ b/contrib/test/integration/main.yml @@ -31,6 +31,9 @@ - integration - e2e tasks: + - name: clone build and install kubernetes + include: "build/kubernetes.yml" + - name: clone build and install cri-o include: "build/cri-o.yml"