From fce2ffb502e78d56887b6083d14be85137442a6a Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Tue, 13 Nov 2018 16:37:32 +0100 Subject: [PATCH] Move k8s install to pre playbook In the k8s integration job, run the install-kubernetes role in the pre-playbook since it is not (generally) the thing under test. Change-Id: Ib20cd12100f323f1eb262261394c4b180dc1f2cd --- playbooks/nodepool-functional-k8s/pre.yaml | 2 ++ playbooks/nodepool-functional-k8s/run.yaml | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/playbooks/nodepool-functional-k8s/pre.yaml b/playbooks/nodepool-functional-k8s/pre.yaml index 5dd518d73..8de8ad1b4 100644 --- a/playbooks/nodepool-functional-k8s/pre.yaml +++ b/playbooks/nodepool-functional-k8s/pre.yaml @@ -1,6 +1,8 @@ - hosts: all roles: - role: bindep + - role: install-kubernetes + docker_version: 18.06.1~ce~3-0~ubuntu tasks: - name: Ensure nodepool services directories diff --git a/playbooks/nodepool-functional-k8s/run.yaml b/playbooks/nodepool-functional-k8s/run.yaml index f06ce8e44..5c5dcc9de 100644 --- a/playbooks/nodepool-functional-k8s/run.yaml +++ b/playbooks/nodepool-functional-k8s/run.yaml @@ -1,6 +1,4 @@ - hosts: all roles: - - role: install-kubernetes - docker_version: 18.06.1~ce~3-0~ubuntu - role: tox tox_envlist: functional_kubernetes