diff --git a/modules/gerritbot/files/gerritbot_channel_config.yaml b/modules/gerritbot/files/gerritbot_channel_config.yaml index 796bf27b02..eb42346fdb 100644 --- a/modules/gerritbot/files/gerritbot_channel_config.yaml +++ b/modules/gerritbot/files/gerritbot_channel_config.yaml @@ -278,6 +278,7 @@ openstack-swift: - x-vrif-minus-2 projects: - openstack/swift + - openstack/swift-bench - openstack/python-swiftclient branches: - master diff --git a/modules/openstack_project/files/gerrit/acls/openstack/swift-bench.config b/modules/openstack_project/files/gerrit/acls/openstack/swift-bench.config new file mode 100644 index 0000000000..d205888e8d --- /dev/null +++ b/modules/openstack_project/files/gerrit/acls/openstack/swift-bench.config @@ -0,0 +1,18 @@ +[access "refs/for/refs/*"] + pushMerge = group swift-milestone +[access "refs/heads/*"] + label-Code-Review = -2..+2 group swift-core + label-Approved = +0..+1 group swift-core +[access "refs/heads/milestone-proposed"] + label-Code-Review = -2..+2 group swift-milestone + label-Approved = +0..+1 group swift-milestone +[access "refs/tags/*"] + create = group swift-ptl + pushTag = group swift-ptl +[project] + state = active +[receive] + requireChangeId = true + requireContributorAgreement = true +[submit] + mergeContent = true diff --git a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml index 7f08fb5454..8edc32fdb9 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml @@ -911,6 +911,19 @@ # No one is interested in stable/ branches on swift, so don't run bitrot jobs +- project: + name: swift-bench + github-org: openstack + node: precise + tarball-site: tarballs.openstack.org + doc-publisher-site: docs.openstack.org + + jobs: + - python-jobs + - openstack-publish-jobs + - pypi-jobs + + - project: name: devstack-jobs diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml index 0ae6ebc32d..a1aa70973f 100644 --- a/modules/openstack_project/files/zuul/layout.yaml +++ b/modules/openstack_project/files/zuul/layout.yaml @@ -1074,6 +1074,12 @@ projects: - swift-docs - swift-merge-release-tags + - name: openstack/swift-bench + check: + - gate-noop + gate: + - gate-noop + - name: openstack/python-ceilometerclient check: - gate-python-ceilometerclient-requirements diff --git a/modules/openstack_project/templates/review.projects.yaml.erb b/modules/openstack_project/templates/review.projects.yaml.erb index 0c9ced1f20..06993fd5b7 100644 --- a/modules/openstack_project/templates/review.projects.yaml.erb +++ b/modules/openstack_project/templates/review.projects.yaml.erb @@ -128,6 +128,9 @@ - project: openstack/neutron - project: openstack/requirements - project: openstack/swift +- project: openstack/swift-bench + description: Benchmarking tool for OpenStack Swift + upstream: git://github.com/jeblair/swift-bench.git - project: openstack/tempest - project: openstack/volume-api - project: stackforge/clouddocs-maven-plugin