Merge "Add rally job for Watcher service and support for rally-gate"

jenkins/jobs/projects.yaml

@@ -8456,6 +8456,7 @@
       - gate-rally-dsvm-neutron-existing-users-{name}
       - gate-rally-dsvm-zaqar-{name}
       - gate-rally-dsvm-senlin-{name}
+      - gate-rally-dsvm-watcher-{name}
       - gate-rally-dsvm-magnum-{name}{job-suffix}:
           job-suffix: '-nv'
 
@@ -9985,6 +9986,7 @@
       - translation-jobs
       - pypi-jobs
       - openstack-releasenotes-jobs
+      - gate-rally-dsvm-watcher-{name}
       - '{pipeline}-watcher-dsvm-multinode{job-suffix}':
           pipeline: gate
           node: ubuntu-trusty-2-node

jenkins/jobs/rally.yaml

@@ -57,6 +57,7 @@
           export DEVSTACK_GATE_IRONIC={ironic}
           export DEVSTACK_GATE_ZAQAR={zaqar}
           export DEVSTACK_GATE_SENLIN={senlin}
+          export DEVSTACK_GATE_WATCHER={watcher}
           export DEVSTACK_GATE_MAGNUM={magnum}
           export DEVSTACK_GATE_TEMPEST_LARGE_OPS={large_ops}
           export DEVSTACK_GATE_EXERCISES=0
@@ -108,6 +109,12 @@
               export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin senlin git://git.openstack.org/openstack/senlin"
               export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_service sl-api sl-eng"
           fi
+          if [ $DEVSTACK_GATE_WATCHER -ne 0 ]; then
+              export PROJECTS="openstack/watcher $PROJECTS"
+              export PROJECTS="openstack/python-watcherclient $PROJECTS"
+              export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin watcher git://git.openstack.org/openstack/watcher"
+              export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_service watcher-api watcher-decision-engine watcher-applier"
+          fi
           if [ $DEVSTACK_GATE_MAGNUM -ne 0 ]||[ $RALLY_SCENARIO = "magnum" ]; then
               export PROJECTS="openstack/magnum $PROJECTS"
               export PROJECTS="openstack/python-magnumclient $PROJECTS"
@@ -377,6 +384,7 @@
             senlin: '0'
             magnum: '0'
             prepopulate_users: '0'
+            watcher: '0'
 
     publishers:
       - devstack-logs
@@ -525,6 +533,7 @@
           senlin: '0'
           magnum: '0'
           prepopulate_users: '0'
+          watcher: '0'
 
     publishers:
       - devstack-logs
@@ -552,6 +561,7 @@
           senlin: '0'
           magnum: '0'
           prepopulate_users: '0'
+          watcher: '0'
 
     publishers:
       - devstack-logs
@@ -579,6 +589,7 @@
           senlin: '0'
           magnum: '0'
           prepopulate_users: '1'
+          watcher: '0'
 
     publishers:
       - devstack-logs
@@ -606,6 +617,7 @@
           senlin: '0'
           magnum: '0'
           prepopulate_users: '0'
+          watcher: '0'
 
     publishers:
       - devstack-logs
@@ -633,6 +645,7 @@
           senlin: '0'
           magnum: '0'
           prepopulate_users: '0'
+          watcher: '0'
 
     publishers:
       - devstack-logs
@@ -659,6 +672,7 @@
           senlin: '0'
           magnum: '0'
           prepopulate_users: '0'
+          watcher: '0'
 
     publishers:
       - devstack-logs
@@ -913,6 +927,7 @@
             senlin: '0'
             magnum: '0'
             prepopulate_users: '0'
+            watcher: '0'
 
     publishers:
       - devstack-logs
@@ -939,6 +954,35 @@
           senlin: '1'
           magnum: '0'
           prepopulate_users: '0'
+          watcher: '0'
+
+    publishers:
+      - devstack-logs
+      - rally-plot
+      - console-log
+
+
+- job-template:
+    name: 'gate-rally-dsvm-watcher-{name}'
+    node: ubuntu-trusty
+
+    wrappers:
+      - build-timeout:
+          timeout: 130
+      - timestamps
+
+    builders:
+      - devstack-rally-gate:
+          scenario: '{name}-watcher'
+          ironic: '0'
+          neutron: '0'
+          zaqar: '0'
+          large_ops: '0'
+          keystone_use_v2api: '0'
+          senlin: '0'
+          magnum: '0'
+          prepopulate_users: '0'
+          watcher: '1'
 
     publishers:
       - devstack-logs
@@ -966,6 +1010,7 @@
           senlin: '0'
           magnum: '1'
           prepopulate_users: '0'
+          watcher: '0'
 
     publishers:
       - devstack-logs

zuul/layout.yaml

@@ -2825,6 +2825,12 @@ jobs:
   - name: python-watcherclient-coverage
     voting: false
 
+  - name: gate-rally-dsvm-watcher-watcher
+    voting: false
+
+  - name: gate-rally-dsvm-watcher-rally
+    voting: false
+
   - name: gate-tooz-tox-db-py27-consul
     branch: ^(?!stable/liberty).*$
 
@@ -11196,6 +11202,7 @@ projects:
       - gate-rally-dsvm-designate-rally
       - gate-rally-dsvm-zaqar-rally
       - gate-rally-dsvm-senlin-rally
+      - gate-rally-dsvm-watcher-rally
 
   - name: openstack/ramdisk-func-test
     template:
@@ -12664,6 +12671,8 @@ projects:
     check:
       - watcher-coverage
       - gate-watcher-dsvm-multinode-nv
+    experimental:
+      - gate-rally-dsvm-watcher-watcher
 
   - name: openstack/watcher-dashboard
     template: