From 99af365c9c460b02405bdaa57eb82c8357b02f94 Mon Sep 17 00:00:00 2001
From: Tin Lam <tin@irrational.io>
Date: Fri, 5 May 2017 16:54:30 -0500
Subject: [PATCH] Add basic integration AIO gate to OpenStack-Helm

This patch set adds in the ability to start up basic gate.

Change-Id: I93c80488bb9f3eebb59cf993e91dc2ed33025bcf
---
 jenkins/jobs/openstack-helm.yaml | 4 +++-
 jenkins/jobs/projects.yaml       | 9 ++++++++-
 zuul/layout.yaml                 | 3 ++-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/jenkins/jobs/openstack-helm.yaml b/jenkins/jobs/openstack-helm.yaml
index d0d9ebd450..07c289bb5d 100644
--- a/jenkins/jobs/openstack-helm.yaml
+++ b/jenkins/jobs/openstack-helm.yaml
@@ -1,5 +1,5 @@
 - job-template:
-    name: 'gate-openstack-helm-{node}{suffix}'
+    name: 'gate-openstack-helm-{integration}-{type}-{node}{suffix}'
     node: '{node}'
 
     wrappers:
@@ -16,6 +16,8 @@
       - install-distro-packages
       - shell: |
           #!/bin/bash -xe
+          export INTEGRATION={integration}
+          export INTEGRATION_TYPE={type}
           tools/gate/setup_gate.sh {node}
 
     publishers:
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index b5c51b3569..1cb55e9852 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -9406,7 +9406,14 @@
     name: openstack-helm
 
     jobs:
-      - gate-openstack-helm-{node}{suffix}:
+      - gate-openstack-helm-{integration}-{type}-{node}{suffix}:
+          integration: nocluster
+          type: linter
+          node: ubuntu-xenial
+          suffix: '-nv'
+      - gate-openstack-helm-{integration}-{type}-{node}{suffix}:
+          integration: aio
+          type: basic
           node: ubuntu-xenial
           suffix: '-nv'
       - gate-{name}-docs-{node}:
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index b325231b05..c0239e21d1 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -14255,7 +14255,8 @@ projects:
       - name: merge-check
     check:
       - gate-openstack-helm-docs-ubuntu-xenial
-      - gate-openstack-helm-ubuntu-xenial-nv
+      - gate-openstack-helm-nocluster-linter-ubuntu-xenial-nv
+      - gate-openstack-helm-aio-basic-ubuntu-xenial-nv
     gate:
       - gate-openstack-helm-docs-ubuntu-xenial