From 3afa22eebb22a73dffe39fef4cf445b8883c2c11 Mon Sep 17 00:00:00 2001
From: Pete Birley <pete@port.direct>
Date: Sun, 5 Aug 2018 08:45:37 -0500
Subject: [PATCH] WIP: fix osh-addons gate

Change-Id: Id964cbefbc0d2886fc4970dde33e102679bf9758
Signed-off-by: Pete Birley <pete@port.direct>
---
 .zuul.yaml                                    |  9 ++---
 tools/gate/playbooks/osh-addons-check.yaml    |  2 +-
 .../playbooks/osh-infra-collect-logs.yaml     | 38 ++++++++++++++++---
 .../playbooks/osh-infra-deploy-docker.yaml    |  4 +-
 4 files changed, 39 insertions(+), 14 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 1e16ffba..b41a3240 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -34,10 +34,11 @@
     nodeset: openstack-helm-single-node
 
 - job:
-    name: openstack-helm-addons
+    name: openstack-helm-addons-ubuntu
     roles:
       - zuul: openstack/openstack-helm-infra
     vars:
+      osh_openstack_release: newton
       zuul_osh_infra_relative_path: ../openstack-helm-infra/
     timeout: 7200
     pre-run:
@@ -49,8 +50,4 @@
     post-run: tools/gate/playbooks/osh-infra-collect-logs.yaml
     required-projects:
       - openstack/openstack-helm-infra
-
-- job:
-    name: openstack-helm-addons-ubuntu
-    parent: openstack-helm-addons
-    nodeset: openstack-helm-single-node
+    nodeset: openstack-helm-ubuntu
diff --git a/tools/gate/playbooks/osh-addons-check.yaml b/tools/gate/playbooks/osh-addons-check.yaml
index 61c81a3c..f222a906 100644
--- a/tools/gate/playbooks/osh-addons-check.yaml
+++ b/tools/gate/playbooks/osh-addons-check.yaml
@@ -19,4 +19,4 @@
         set -xe;
         ./tools/gate/scripts/build-charts.sh
       args:
-        chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"
+        chdir: "{{ zuul_osh_addons_relative_path | default(zuul.project.src_dir) }}"
diff --git a/tools/gate/playbooks/osh-infra-collect-logs.yaml b/tools/gate/playbooks/osh-infra-collect-logs.yaml
index f08f7066..bcd5c546 100644
--- a/tools/gate/playbooks/osh-infra-collect-logs.yaml
+++ b/tools/gate/playbooks/osh-infra-collect-logs.yaml
@@ -18,13 +18,41 @@
     logs_dir: "/tmp/logs"
   roles:
     - gather-host-logs
-    - helm-release-status
-    - describe-kubernetes-objects
-    - gather-pod-logs
-    - gather-prom-metrics
   tags:
     - gather-host-logs
+
+- hosts: primary
+  vars:
+    work_dir: "{{ zuul.project.src_dir }}/{{ zuul_osh_infra_relative_path | default('') }}"
+    logs_dir: "/tmp/logs"
+  roles:
     - helm-release-status
+  tags:
+    - helm-release-status
+
+- hosts: primary
+  vars:
+    work_dir: "{{ zuul.project.src_dir }}/{{ zuul_osh_infra_relative_path | default('') }}"
+    logs_dir: "/tmp/logs"
+  roles:
     - describe-kubernetes-objects
+  tags:
+    - describe-kubernetes-objects
+
+- hosts: primary
+  vars:
+    work_dir: "{{ zuul.project.src_dir }}/{{ zuul_osh_infra_relative_path | default('') }}"
+    logs_dir: "/tmp/logs"
+  roles:
     - gather-pod-logs
-    - gather-prom-metrics
\ No newline at end of file
+  tags:
+    - gather-pod-logs
+
+- hosts: primary
+  vars:
+    work_dir: "{{ zuul.project.src_dir }}/{{ zuul_osh_infra_relative_path | default('') }}"
+    logs_dir: "/tmp/logs"
+  roles:
+    - gather-prom-metrics
+  tags:
+    - gather-prom-metrics
diff --git a/tools/gate/playbooks/osh-infra-deploy-docker.yaml b/tools/gate/playbooks/osh-infra-deploy-docker.yaml
index 4c543245..7bf66fa2 100644
--- a/tools/gate/playbooks/osh-infra-deploy-docker.yaml
+++ b/tools/gate/playbooks/osh-infra-deploy-docker.yaml
@@ -35,9 +35,9 @@
     - setup-firewall
     - deploy-python-pip
     - deploy-docker
-    - deploy-yq
+    - deploy-jq
   tags:
     - setup-firewall
     - deploy-python-pip
     - deploy-docker
-    - deploy-yq
+    - deploy-jq