Merge "Add test job for watcher with split tempest plugin"

jenkins/jobs/projects.yaml

@@ -15486,6 +15486,12 @@
           node: ubuntu-xenial-2-node
           suffix: '-nv'
           branch-override: default
+      - '{pipeline}-watcher-dsvm-multinode-split-{node-release}{suffix}':
+          pipeline: gate
+          node-release: ubuntu-xenial
+          node: ubuntu-xenial-2-node
+          suffix: '-nv'
+          branch-override: default
 
 - project:
     name: watcher-dashboard

jenkins/jobs/watcher.yaml

@@ -87,3 +87,51 @@
       - test-results
       - devstack-logs
       - console-log
+
+- job-template:
+    name: '{pipeline}-watcher-dsvm-multinode-split-{node-release}{suffix}'
+    node: '{node}'
+
+    wrappers:
+      - build-timeout:
+          timeout: 70
+      - timestamps
+
+    builders:
+      - link-logs
+      - net-info
+      - devstack-checkout
+      - local_conf:
+          conf: |
+            [[local|localrc]]
+            TEMPEST_PLUGINS='/opt/stack/new/watcher-tempest-plugin'
+            enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer
+            # Enable watcher devstack plugin.
+            enable_plugin watcher git://git.openstack.org/openstack/watcher
+
+      - shell: |
+          #!/bin/bash -xe
+
+          export DEVSTACK_SUBNODE_CONFIG=" "
+          export PYTHONUNBUFFERED=true
+          export DEVSTACK_GATE_TEMPEST=1
+          export DEVSTACK_GATE_NEUTRON=1
+          export DEVSTACK_GATE_TOPOLOGY="multinode"
+          export PROJECTS="openstack/watcher $PROJECTS"
+          export PROJECTS="openstack/python-watcherclient $PROJECTS"
+          export PROJECTS="openstack/watcher-tempest-plugin $PROJECTS"
+
+          export DEVSTACK_GATE_TEMPEST_REGEX="watcher_tempest_plugin"
+
+          export BRANCH_OVERRIDE={branch-override}
+          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
+              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
+          fi
+
+          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
+          ./safe-devstack-vm-gate-wrap.sh
+
+    publishers:
+      - test-results
+      - devstack-logs
+      - console-log

zuul/layout.yaml

@@ -18519,6 +18519,7 @@ projects:
       - watcher-coverage-ubuntu-xenial-nv
       - gate-rally-dsvm-watcher-watcher-ubuntu-xenial-nv
       - gate-watcher-dsvm-multinode-ubuntu-xenial-nv
+      - gate-watcher-dsvm-multinode-split-ubuntu-xenial-nv
 
   - name: openstack/watcher-dashboard
     template: