From 5195ccb70a4e9412a7b8d4574d9d432fb1efa221 Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Fri, 16 Feb 2018 10:27:33 +1100
Subject: [PATCH] Fix nodepool-zuul-functional

Several fixes to this job:

We need to run bindep twice - once for nodepool, once for zuul. Add
invocation of bindep role and also copy install-distro-packages so that
the job works, next step is remove the install-distro-packages from
zuul.

Add a post-run to copy the nodepool logs, so you can diagnose what's
going wrong if the jobs fails

Fix up a configuration issue, it tries to write build-logs to
/var/log/nodepool which it doesn't own, redirect to the temp area.

Add it as a non-voting check job

Depends-On: https://review.openstack.org/545163
Change-Id: I12db55d3e4c7a71b9af56567858df0a620ee3b73
---
 .zuul.yaml                                    | 6 +++---
 playbooks/nodepool-zuul-functional/post.yaml  | 8 ++++++++
 playbooks/nodepool-zuul-functional/pre.yaml   | 7 +++++++
 tools/zuul-nodepool-integration/nodepool.yaml | 1 +
 4 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 playbooks/nodepool-zuul-functional/post.yaml

diff --git a/.zuul.yaml b/.zuul.yaml
index 78e35ffd7..d207c6609 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -6,6 +6,7 @@
 
       This test runs the zuul project ``nodepool`` environment.
     pre-run: playbooks/nodepool-zuul-functional/pre.yaml
+    post-run: playbooks/nodepool-zuul-functional/post.yaml
     required-projects:
       - openstack-infra/nodepool
       - openstack-infra/zuul
@@ -115,6 +116,8 @@
         - tox-cover
         - tox-pep8
         - tox-py35
+        - nodepool-zuul-functional:
+            voting: false
         - nodepool-functional-py35:
             voting: false
         - nodepool-functional-py35-src:
@@ -132,6 +135,3 @@
     post:
       jobs:
         - publish-openstack-sphinx-docs-infra-python3
-    experimental:
-      jobs:
-        - nodepool-zuul-functional
diff --git a/playbooks/nodepool-zuul-functional/post.yaml b/playbooks/nodepool-zuul-functional/post.yaml
new file mode 100644
index 000000000..80f52fbdd
--- /dev/null
+++ b/playbooks/nodepool-zuul-functional/post.yaml
@@ -0,0 +1,8 @@
+- hosts: all
+  tasks:
+    - name: Copy nodepool logs from /tmp
+      synchronize:
+        src: '/tmp/nodepool/'
+        dest: '{{ zuul.executor.log_root }}/nodepool/'
+        mode: pull
+        verify_host: true
diff --git a/playbooks/nodepool-zuul-functional/pre.yaml b/playbooks/nodepool-zuul-functional/pre.yaml
index 418284082..54bb16ebf 100644
--- a/playbooks/nodepool-zuul-functional/pre.yaml
+++ b/playbooks/nodepool-zuul-functional/pre.yaml
@@ -1,5 +1,12 @@
 - hosts: all
   name: Zuul setup for nodepool test
+  roles:
+    - role: bindep
+      bindep_profile: default
+      bindep_dir: "{{ zuul.projects['git.openstack.org/openstack-infra/zuul'].src_dir }}"
+    # TODO(AJaeger): Remove once legacy script is removed from zuul
+    - legacy-copy-jenkins-scripts
+
   tasks:
 
     - name: Run tools/nodepool-integration-setup.sh from zuul
diff --git a/tools/zuul-nodepool-integration/nodepool.yaml b/tools/zuul-nodepool-integration/nodepool.yaml
index bac5aa568..6c4a935ca 100644
--- a/tools/zuul-nodepool-integration/nodepool.yaml
+++ b/tools/zuul-nodepool-integration/nodepool.yaml
@@ -1,4 +1,5 @@
 images-dir: /tmp/nodepool/images
+build-log-dir: /tmp/nodepool/builds
 
 zookeeper-servers:
   - host: localhost