Advertisement
Guest User

Untitled

a guest
Jun 23rd, 2016
98
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 2.40 KB | None | 0 0
  1. diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
  2. index ae07d37..1ddf272 100644
  3. --- a/jenkins/jobs/projects.yaml
  4. +++ b/jenkins/jobs/projects.yaml
  5. @@ -9566,6 +9566,7 @@
  6. - python-jobs
  7. - openstack-publish-jobs
  8. - pypi-jobs
  9. + - gate-rally-dsvm-{name}
  10. - '{pipeline}-watcher-dsvm-multinode{job-suffix}':
  11. pipeline: gate
  12. node: ubuntu-trusty-2-node
  13. diff --git a/jenkins/jobs/rally.yaml b/jenkins/jobs/rally.yaml
  14. index 88bf30e..96b1918 100644
  15. --- a/jenkins/jobs/rally.yaml
  16. +++ b/jenkins/jobs/rally.yaml
  17. @@ -57,6 +57,7 @@
  18. export DEVSTACK_GATE_IRONIC={ironic}
  19. export DEVSTACK_GATE_ZAQAR={zaqar}
  20. export DEVSTACK_GATE_SENLIN={senlin}
  21. + export DEVSTACK_GATE_WATCHER={watcher}
  22. export DEVSTACK_GATE_MAGNUM={magnum}
  23. export DEVSTACK_GATE_TEMPEST_LARGE_OPS={large_ops}
  24. export DEVSTACK_GATE_EXERCISES=0
  25. @@ -107,6 +108,12 @@
  26. export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin senlin git://git.openstack.org/openstack/senlin"
  27. export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_service sl-api sl-eng"
  28. fi
  29. + if [ $DEVSTACK_GATE_WATCHER -ne 0 ]; then
  30. + export PROJECTS="openstack/watcher $PROJECTS"
  31. + export PROJECTS="openstack/python-watcherclient $PROJECTS"
  32. + export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin watcher git://http://git.openstack.org/cgit/openstack/watcher/"
  33. + export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable watcher-api watcher-decision-engine watcher-applier"
  34. + fi
  35. if [ $DEVSTACK_GATE_MAGNUM -ne 0 ]||[ $RALLY_SCENARIO = "magnum" ]; then
  36. export PROJECTS="openstack/magnum $PROJECTS"
  37. export PROJECTS="openstack/python-magnumclient $PROJECTS"
  38. diff --git a/zuul/layout.yaml b/zuul/layout.yaml
  39. index 3a6204d..87ba31c 100755
  40. --- a/zuul/layout.yaml
  41. +++ b/zuul/layout.yaml
  42. @@ -2836,6 +2836,9 @@ jobs:
  43. - name: python-watcherclient-coverage
  44. voting: false
  45.  
  46. + - name: gate-rally-dsvm-watcher
  47. + voting: false
  48. +
  49. - name: gate-tooz-tox-db-py27-consul
  50. branch: ^(?!stable/(?:kilo|liberty)).*$
  51.  
  52. @@ -12470,6 +12473,8 @@ projects:
  53. check:
  54. - watcher-coverage
  55. - gate-watcher-dsvm-multinode-nv
  56. + experimental:
  57. + - gate-rally-dsvm-watcher
  58.  
  59. - name: openstack/watcher-dashboard
  60. template:
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement