From a6528dc564686a28b4789312061253eebf86b72c Mon Sep 17 00:00:00 2001
From: Sreejith Punnapuzha <sreejith.punnapuzha@outlook.com>
Date: Wed, 9 Sep 2020 12:50:58 -0500
Subject: [PATCH] Enhance log collection zuul jobs

  * Change name for gate script runner job
  * Make log collection job parameterize

Change-Id: I9f7c711556996af2da350d0160e572e1a26efd0f
Signed-off-by: Sreejith Punnapuzha <sreejith.punnapuzha@outlook.com>
---
 playbooks/airship-collect-logs.yaml | 22 ++++++++++++++--------
 zuul.d/jobs.yaml                    |  9 ++++++++-
 zuul.d/projects.yaml                |  2 +-
 3 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/playbooks/airship-collect-logs.yaml b/playbooks/airship-collect-logs.yaml
index 2fb51d775..34cb75aac 100644
--- a/playbooks/airship-collect-logs.yaml
+++ b/playbooks/airship-collect-logs.yaml
@@ -15,16 +15,22 @@
 - hosts: primary
   vars:
     logs_dir: "/tmp/logs"
-  roles:
-    - gather-system-logs
-    - airship-gather-apache-logs
-    - airship-gather-libvirt-logs
-    - airship-gather-runtime-logs
-    - airship-airshipctl-gather-configs
   environment:
     LIBVIRT_DEFAULT_URI: qemu:///system
 
   tasks:
-    - name: save logs for ephemeral cluster
+    - name: set default roles
+      set_fact:
+        default_log_roles:
+          - gather-system-logs
+          - airship-gather-apache-logs
+          - airship-gather-libvirt-logs
+          - airship-gather-runtime-logs
+          - airship-airshipctl-gather-configs
+          - airship-gather-pod-logs
+    - name: run roles
       include_role:
-        name: airship-gather-pod-logs
+        name: "{{ role_name }}"
+      with_items: "{{ log_roles | default(default_log_roles) }}"
+      loop_control:
+        loop_var: role_name
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 2968d7c6e..6bf7aed01 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -75,7 +75,7 @@
         pass-to-parent: true
 
 - job:
-    name: airship-airshipctl-gate-script-runner-test
+    name: airship-airshipctl-gate-script-runner
     attempts: 1
     timeout: 5400
     pre-run:
@@ -101,6 +101,13 @@
         - ./tools/deployment/34_deploy_worker_node.sh
       serve_dir: /srv/iso
       serve_port: 8099
+      log_roles:
+        - gather-system-logs
+        - airship-gather-apache-logs
+        - airship-gather-libvirt-logs
+        - airship-gather-runtime-logs
+        - airship-airshipctl-gather-configs
+        - airship-gather-pod-logs
     voting: false
 
 - job:
diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml
index 021e5c306..6cbe32d33 100644
--- a/zuul.d/projects.yaml
+++ b/zuul.d/projects.yaml
@@ -24,7 +24,7 @@
         - airship-airshipctl-build-image
         - airship-airshipctl-validate-site-docs
 #        - airship-airshipctl-functional-existing-k8s TODO: Enable this when functional tests exist, and a cluster is up
-        - airship-airshipctl-gate-script-runner-test
+        - airship-airshipctl-gate-script-runner
     gate:
       jobs:
         - openstack-tox-docs