From a3ad923a7e5e2cd257a9d39fe07412a8c5ef52d0 Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Fri, 16 Feb 2018 08:50:23 +0100
Subject: [PATCH] Avoid tools/nodepool-integration-setup.sh from zuul

Fold in content from zuul/tools/nodepool-integration-setup.sh into our
playbook to reduce dependency of the repos and simplify job setup.

Change-Id: I168522ae2c214eac2f51410c67b3a79862a8787f
---
 playbooks/nodepool-zuul-functional/pre.yaml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/playbooks/nodepool-zuul-functional/pre.yaml b/playbooks/nodepool-zuul-functional/pre.yaml
index 017743fec..4d68a3c5c 100644
--- a/playbooks/nodepool-zuul-functional/pre.yaml
+++ b/playbooks/nodepool-zuul-functional/pre.yaml
@@ -7,7 +7,9 @@
 
   tasks:
 
-    - name: Run tools/nodepool-integration-setup.sh from zuul
+    - name: Install packages and  run zuul-nodepool-integration/start.sh
       shell:
-        cmd: tools/nodepool-integration-setup.sh
-        chdir: "{{ zuul.projects['git.openstack.org/openstack-infra/zuul'].src_dir }}"
+        cmd: |
+          sudo pip3 install .
+          ./tools/zuul-nodepool-integration/start.sh
+        chdir: "{{ zuul.projects['git.openstack.org/openstack-infra/nodepool'].src_dir }}"