diff --git a/gerrit/acls/stackforge/rally.config b/gerrit/acls/openstack/rally.config similarity index 100% rename from gerrit/acls/stackforge/rally.config rename to gerrit/acls/openstack/rally.config diff --git a/gerrit/projects.yaml b/gerrit/projects.yaml index 9fc98e8866..7a83842fcc 100755 --- a/gerrit/projects.yaml +++ b/gerrit/projects.yaml @@ -1057,6 +1057,9 @@ groups: - tempest description: OpenStack QA Specifications +- project: openstack/rally + description: Rally provides a framework for performance analysis and benchmarking of + individual OpenStack components as well as full production OpenStack cloud deployments - project: openstack/requirements description: Global requirements for OpenStack - project: openstack/sahara @@ -2138,8 +2141,6 @@ in a variety of programming languages on OpenStack. - project: stackforge/radar description: dashboard for ci reporting -- project: stackforge/rally - description: Benchmark System for OpenStack - project: stackforge/refstack description: Vendor-facing API for registration of interop-compliance use-storyboard: true diff --git a/gerritbot/channels.yaml b/gerritbot/channels.yaml index b81dfcedc8..e59e52d966 100644 --- a/gerritbot/channels.yaml +++ b/gerritbot/channels.yaml @@ -987,7 +987,7 @@ openstack-rally: - change-merged - x-vrif-minus-2 projects: - - stackforge/rally + - openstack/rally - stackforge/python-rallyclient branches: - master diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml index 7bb24c9d6c..57d535a73a 100755 --- a/jenkins/jobs/projects.yaml +++ b/jenkins/jobs/projects.yaml @@ -1639,6 +1639,26 @@ jobs: - specs-jobs +- project: + name: rally + node: 'bare-precise || bare-trusty' + tarball-site: tarballs.openstack.org + + jobs: + - python-jobs + - pypi-jobs + - rally-jobs + - hook-{name}-rtfd + - gate-rally-install-{node}: + node: bare-precise + - gate-rally-install-{node}: + node: bare-centos6 + - gate-rally-dsvm-verify + - gate-{name}-tox-{envlist}: + envlist: self + - gate-rally-dsvm-neutron-{name}: + name: unstable + - project: name: requirements node: 'bare-precise || bare-trusty' @@ -4974,26 +4994,6 @@ jobs: - python-jobs -- project: - name: rally - node: 'bare-precise || bare-trusty' - tarball-site: tarballs.openstack.org - - jobs: - - python-jobs - - pypi-jobs - - rally-jobs - - hook-{name}-rtfd - - gate-rally-install-{node}: - node: bare-precise - - gate-rally-install-{node}: - node: bare-centos6 - - gate-rally-dsvm-verify - - gate-{name}-tox-{envlist}: - envlist: self - - gate-rally-dsvm-neutron-{name}: - name: unstable - - project: name: refstack node: 'bare-precise || bare-trusty' diff --git a/jenkins/jobs/rally.yaml b/jenkins/jobs/rally.yaml index 948cdf7e1d..7081d24201 100644 --- a/jenkins/jobs/rally.yaml +++ b/jenkins/jobs/rally.yaml @@ -48,7 +48,7 @@ - devstack-checkout - shell: | #!/bin/bash -xe - export PROJECTS="stackforge/rally $PROJECTS" + export PROJECTS="openstack/rally $PROJECTS" export PROJECTS="openstack/ceilometer $PROJECTS" export CEILOMETER_NOTIFICATION_TOPICS=notifications,profiler export DEVSTACK_GATE_NEUTRON={neutron} @@ -86,7 +86,7 @@ - devstack-checkout - shell: | #!/bin/bash -xe - export PROJECTS="stackforge/rally $PROJECTS" + export PROJECTS="openstack/rally $PROJECTS" export PROJECTS="openstack/ceilometer $PROJECTS" export PROJECTS="openstack/designate $PROJECTS" export PROJECTS="openstack/python-designateclient $PROJECTS" @@ -129,7 +129,7 @@ - devstack-checkout - shell: | #!/bin/bash -xe - export PROJECTS="stackforge/rally $PROJECTS" + export PROJECTS="openstack/rally $PROJECTS" export PROJECTS="stackforge/murano $PROJECTS" export PROJECTS="stackforge/murano-dashboard $PROJECTS" export PROJECTS="stackforge/python-muranoclient $PROJECTS" @@ -167,7 +167,7 @@ - devstack-checkout - shell: | #!/bin/bash -xe - export PROJECTS="stackforge/rally $PROJECTS" + export PROJECTS="openstack/rally $PROJECTS" export PROJECTS="stackforge/mistral $PROJECTS" export PROJECTS="stackforge/python-mistralclient $PROJECTS" @@ -362,7 +362,7 @@ - devstack-checkout - shell: | #/bin/bash -xe - export PROJECTS="stackforge/rally $PROJECTS" + export PROJECTS="openstack/rally $PROJECTS" export ENABLED_SERVICES=rally function pre_test_hook { @@ -411,7 +411,7 @@ - devstack-checkout - shell: | #/bin/bash -xe - export PROJECTS="stackforge/rally $PROJECTS" + export PROJECTS="openstack/rally $PROJECTS" export DEVSTACK_GATE_EXERCISES=0 export DEVSTACK_GATE_TIMEOUT=120 export ENABLED_SERVICES=rally diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 1a1f9abb5c..28f8ff9797 100755 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -2917,6 +2917,40 @@ projects: post: - static-ossa-publish + - name: openstack/rally + template: + - name: merge-check + - name: python-jobs + - name: python26-jobs + - name: python3-jobs + - name: check-requirements + - name: docs-on-rtfd + - name: publish-to-pypi + check: + - rally-coverage + - gate-rally-install-bare-centos6 + - gate-rally-install-bare-precise + - gate-rally-dsvm-rally + - gate-rally-dsvm-neutron-rally + - gate-rally-dsvm-neutron-unstable + - gate-rally-dsvm-cli + - gate-rally-dsvm-verify + - gate-rally-tox-self + gate: + - gate-rally-install-bare-centos6 + - gate-rally-install-bare-precise + - gate-rally-dsvm-rally + - gate-rally-dsvm-neutron-rally + - gate-rally-dsvm-cli + - gate-rally-dsvm-verify + post: + - rally-coverage + experimental: + - gate-rally-dsvm-murano-rally + - gate-rally-dsvm-mistral-rally + - gate-rally-dsvm-designate-rally + - gate-rally-dsvm-zaqar-rally + - name: openstack/requirements template: - name: merge-check @@ -6622,40 +6656,6 @@ projects: - name: merge-check - name: noop-jobs - - name: stackforge/rally - template: - - name: merge-check - - name: python-jobs - - name: python26-jobs - - name: python3-jobs - - name: check-requirements - - name: docs-on-rtfd - - name: publish-to-pypi - check: - - rally-coverage - - gate-rally-install-bare-centos6 - - gate-rally-install-bare-precise - - gate-rally-dsvm-rally - - gate-rally-dsvm-neutron-rally - - gate-rally-dsvm-neutron-unstable - - gate-rally-dsvm-cli - - gate-rally-dsvm-verify - - gate-rally-tox-self - gate: - - gate-rally-install-bare-centos6 - - gate-rally-install-bare-precise - - gate-rally-dsvm-rally - - gate-rally-dsvm-neutron-rally - - gate-rally-dsvm-cli - - gate-rally-dsvm-verify - post: - - rally-coverage - experimental: - - gate-rally-dsvm-murano-rally - - gate-rally-dsvm-mistral-rally - - gate-rally-dsvm-designate-rally - - gate-rally-dsvm-zaqar-rally - - name: stackforge/refstack template: - name: merge-check