Merge "Add integration tests between system-config and logstash-filters"

jenkins/jobs/infra.yaml

@@ -141,24 +141,15 @@
       - gate-{name}-bindep-fallback-{node}{job-suffix}
 
 - builder:
-    name: infra-puppet-apply
+    name: infra-puppet-apply-prep
     builders:
       - shell: |
           #!/bin/bash -xe
           /usr/zuul-env/bin/zuul-cloner --cache-dir /opt/git git://git.openstack.org openstack-infra/system-config
           cd openstack-infra/system-config
-          ./tools/apply-test.sh
-
-- job-template:
-    name: 'gate-infra-puppet-apply-{node}'
-    node: '{node}'
-
-    builders:
-      - print-template-name:
-          template-name: "{template-name}"
-      - net-info
-      - infra-puppet-apply
 
+- publisher:
+    name: infra-puppet-apply-logs
     publishers:
       - scp:
           site: 'static.openstack.org'
@@ -169,6 +160,38 @@
               copy-after-failure: true
       - console-log
 
+- job-template:
+    name: 'gate-infra-puppet-apply-{node}'
+    node: '{node}'
+
+    builders:
+      - print-template-name:
+          template-name: "{template-name}"
+      - net-info
+      - infra-puppet-apply-prep
+      - shell: |
+          #!/bin/bash -xe
+          ./tools/apply-test.sh
+
+    publishers:
+      - infra-puppet-apply-logs
+
+- job-template:
+    name: 'gate-logstash-filters-{node}'
+    node: '{node}'
+
+    builders:
+      - print-template-name:
+          template-name: "{template-name}"
+      - net-info
+      - infra-puppet-apply-prep
+      - shell: |
+          #!/bin/bash -xe
+          ./tools/logstash-filter-test.sh
+
+    publishers:
+      - infra-puppet-apply-logs
+
 - job-template:
     name: 'gate-openstackci-beaker-{node}'
     node: '{node}'

jenkins/jobs/projects.yaml

@@ -13400,6 +13400,10 @@
           node:
             - ubuntu-trusty
             - ubuntu-xenial
+      - gate-logstash-filters-{node}:
+          node:
+            - ubuntu-trusty
+            - ubuntu-xenial
 
 - project:
     name: tacker

zuul/layout.yaml

@@ -1051,6 +1051,14 @@ project-templates:
       - gate-openstackci-beaker-centos-7
       - gate-openstackci-beaker-ubuntu-trusty
 
+  - name: infra-logstash-filter-jobs
+    check:
+      - gate-logstash-filters-ubuntu-trusty
+      - gate-logstash-filters-ubuntu-xenial
+    gate:
+      - gate-logstash-filters-ubuntu-trusty
+      - gate-logstash-filters-ubuntu-xenial
+
   - name: check-tripleo-jobs
     check-tripleo:
       - gate-tripleo-ci-centos-7-ovb-ha
@@ -1205,6 +1213,10 @@ jobs:
   - name: ^gate-tempest-dsvm-lxc-ubuntu-trusty$
     branch: master
 
+  # Make sure we run ubuntu-trusty on master for logstash-filters.
+  - name: ^gate-logstash-filters-ubuntu-trusty$
+    branch: master
+
   # because of global requirements overrides, there is no reason to
   # run tempest/grenade tests after a requirements sync, as they've
   # already been run in the requirements job with the override.
@@ -3929,7 +3941,7 @@ projects:
   - name: openstack-infra/logstash-filters
     template:
       - name: merge-check
-      - name: noop-jobs
+      - name: infra-logstash-filter-jobs
 
   - name: openstack-infra/lpmqtt
     template:
@@ -4859,6 +4871,7 @@ projects:
       - name: merge-check
       - name: infra-puppet-apply-jobs
       - name: infra-publish-jobs
+      - name: infra-logstash-filter-jobs
     check:
       - gate-system-config-linters-ubuntu-trusty
       - gate-system-config-linters-ubuntu-xenial