Merge "Add basic integration AIO gate to OpenStack-Helm"

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:

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}:

zuul/layout.yaml

@@ -14258,7 +14258,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