diff --git a/modules/gerritbot/files/gerritbot_channel_config.yaml b/modules/gerritbot/files/gerritbot_channel_config.yaml index 9a3b9cef84..a4cee23119 100644 --- a/modules/gerritbot/files/gerritbot_channel_config.yaml +++ b/modules/gerritbot/files/gerritbot_channel_config.yaml @@ -456,9 +456,21 @@ openstack-climate: - change-merged - x-vrif-minus-2 projects: - - stackforge/climate - - stackforge/climate-nova - - stackforge/python-climateclient + - stackforge/blazar + - stackforge/blazar-nova + - stackforge/python-blazarclient + branches: + - master + +openstack-blazar: + events: + - patchset-created + - change-merged + - x-vrif-minus-2 + projects: + - stackforge/blazar + - stackforge/blazar-nova + - stackforge/python-blazarclient branches: - master diff --git a/modules/openstack_project/files/accessbot/channels.yaml b/modules/openstack_project/files/accessbot/channels.yaml index 625e3eccc0..ef18ad41a8 100644 --- a/modules/openstack_project/files/accessbot/channels.yaml +++ b/modules/openstack_project/files/accessbot/channels.yaml @@ -64,6 +64,7 @@ channels: - name: openstack-anvil - name: openstack-bacon - name: openstack-barbican + - name: openstack-blazar - name: openstack-board - name: openstack-ceilometer - name: openstack-chef diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/blazar.config b/modules/openstack_project/files/gerrit/acls/stackforge/blazar.config new file mode 100644 index 0000000000..facb450fbc --- /dev/null +++ b/modules/openstack_project/files/gerrit/acls/stackforge/blazar.config @@ -0,0 +1,14 @@ +[access "refs/heads/*"] + label-Code-Review = -2..+2 group blazar-core + label-Workflow = -1..+1 group blazar-core + abandon = group blazar-core +[access "refs/tags/*"] + create = group blazar-core + pushSignedTag = group blazar-core +[project] + state = active +[receive] + requireChangeId = true + requireContributorAgreement = true +[submit] + mergeContent = true diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/climate.config b/modules/openstack_project/files/gerrit/acls/stackforge/climate.config deleted file mode 100644 index 023cc058ca..0000000000 --- a/modules/openstack_project/files/gerrit/acls/stackforge/climate.config +++ /dev/null @@ -1,14 +0,0 @@ -[access "refs/heads/*"] - label-Code-Review = -2..+2 group climate-core - label-Workflow = -1..+1 group climate-core - abandon = group climate-core -[access "refs/tags/*"] - create = group climate-core - pushSignedTag = group climate-core -[project] - state = active -[receive] - requireChangeId = true - requireContributorAgreement = true -[submit] - mergeContent = true diff --git a/modules/openstack_project/files/jenkins_job_builder/config/climate.yaml b/modules/openstack_project/files/jenkins_job_builder/config/blazar.yaml similarity index 55% rename from modules/openstack_project/files/jenkins_job_builder/config/climate.yaml rename to modules/openstack_project/files/jenkins_job_builder/config/blazar.yaml index 97bdd0f929..ae05b6e2b5 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/climate.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/blazar.yaml @@ -1,5 +1,5 @@ - job: - name: gate-climate-devstack-dsvm + name: gate-blazar-devstack-dsvm node: devstack-precise wrappers: @@ -16,17 +16,17 @@ #!/bin/bash -xe export PYTHONUNBUFFERED=true export DEVSTACK_GATE_TIMEOUT=60 - export ENABLED_SERVICES=climate,climate-a,climate-m - export PROJECTS="stackforge/climate $PROJECTS" - export PROJECTS="stackforge/climate-nova $PROJECTS" - export PROJECTS="stackforge/python-climateclient $PROJECTS" + export ENABLED_SERVICES=blazar,blazar-a,blazar-m + export PROJECTS="stackforge/blazar $PROJECTS" + export PROJECTS="stackforge/blazar-nova $PROJECTS" + export PROJECTS="stackforge/python-blazarclient $PROJECTS" function pre_test_hook { - # Install climate devstack integration - CLIMATE_BASE=/opt/stack/new/climate/contrib/devstack + # Install blazar devstack integration + BLAZAR_BASE=/opt/stack/new/blazar/contrib/devstack DEVSTACK_BASE=/opt/stack/new/devstack - cp $CLIMATE_BASE/lib/* $DEVSTACK_BASE/lib - cp $CLIMATE_BASE/extras.d/* $DEVSTACK_BASE/extras.d + cp $BLAZAR_BASE/lib/* $DEVSTACK_BASE/lib + cp $BLAZAR_BASE/extras.d/* $DEVSTACK_BASE/extras.d } export -f pre_test_hook 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 3f6a36a9a8..1c86c4e4b4 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml @@ -126,7 +126,7 @@ - pypi-jobs - project: - name: climate + name: blazar github-org: stackforge node: bare-precise tarball-site: tarballs.openstack.org @@ -135,7 +135,7 @@ - python-jobs - project: - name: climate-nova + name: blazar-nova github-org: stackforge node: bare-precise tarball-site: tarballs.openstack.org @@ -144,7 +144,7 @@ - python-jobs - project: - name: python-climateclient + name: python-blazarclient github-org: stackforge node: bare-precise tarball-site: tarballs.openstack.org diff --git a/modules/openstack_project/files/review.projects.yaml b/modules/openstack_project/files/review.projects.yaml index fdeb409ac8..5542a0e91c 100644 --- a/modules/openstack_project/files/review.projects.yaml +++ b/modules/openstack_project/files/review.projects.yaml @@ -462,19 +462,19 @@ - project: stackforge/bindep description: Binary dependency automation upstream: git://github.com/rbtcollins/bindep.git +- project: stackforge/blazar + description: Reservation Service for OpenStack + upstream: git://github.com/jd/climate.git + acl-config: /home/gerrit2/acls/stackforge/blazar.config +- project: stackforge/blazar-nova + description: Specific Nova part of the Blazar Reservation Service for OpenStack + upstream: git://github.com/scroiset/climate-nova.git + acl-config: /home/gerrit2/acls/stackforge/blazar.config - project: stackforge/bufunfa upstream: git://github.com/ekarlso/bufunfa.git - project: stackforge/cl-openstack-client description: Common Lisp OpenStack client libraries upstream: git://github.com/jd/cl-openstack-client.git -- project: stackforge/climate - description: Reservation Service for OpenStack - upstream: git://github.com/jd/climate.git - acl-config: /home/gerrit2/acls/stackforge/climate.config -- project: stackforge/climate-nova - description: Specific Nova part of the Climate Reservation Service for OpenStack - upstream: git://github.com/scroiset/climate-nova.git - acl-config: /home/gerrit2/acls/stackforge/climate.config - project: stackforge/cloudcafe upstream: https://github.com/samu4924/cloudcafe description: OpenStack based test automation framework. Based on OpenCAFE engine @@ -875,9 +875,9 @@ - project: stackforge/pyghmi description: A Pure python IPMI library upstream: git://git.code.sf.net/p/xcat/python-ipmi -- project: stackforge/python-climateclient - description: Client for OpenStack Climate - acl-config: /home/gerrit2/acls/stackforge/climate.config +- project: stackforge/python-blazarclient + description: Client for OpenStack Blazar + acl-config: /home/gerrit2/acls/stackforge/blazar.config - project: stackforge/python-designateclient - project: stackforge/python-jenkins upstream: git://github.com/jeblair/python-jenkins.git diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml index d3d607edae..05fa8bea5e 100644 --- a/modules/openstack_project/files/zuul/layout.yaml +++ b/modules/openstack_project/files/zuul/layout.yaml @@ -562,7 +562,7 @@ jobs: voting: false - name: gate-manila-tempest-dsvm-neutron voting: false - - name: gate-climate-devstack-dsvm + - name: gate-blazar-devstack-dsvm voting: false - name: gate-storyboard-python33 voting: false @@ -3401,34 +3401,34 @@ projects: post: - hook-bufunfa-rtfd - - name: stackforge/climate + - name: stackforge/blazar template: - name: python-jobs - name: check-requirements check: - - gate-climate-devstack-dsvm + - gate-blazar-devstack-dsvm pre-release: - - climate-tarball + - blazar-tarball release: - - climate-tarball + - blazar-tarball - - name: stackforge/climate-nova + - name: stackforge/blazar-nova template: - name: check-requirements check: - - gate-climate-nova-pep8 - - gate-climate-nova-python26 - - gate-climate-nova-python27 + - gate-blazar-nova-pep8 + - gate-blazar-nova-python26 + - gate-blazar-nova-python27 gate: - - gate-climate-nova-pep8 - - gate-climate-nova-python26 - - gate-climate-nova-python27 + - gate-blazar-nova-pep8 + - gate-blazar-nova-python26 + - gate-blazar-nova-python27 post: - - climate-nova-branch-tarball + - blazar-nova-branch-tarball pre-release: - - climate-nova-tarball + - blazar-nova-tarball release: - - climate-nova-tarball + - blazar-nova-tarball - name: stackforge/cl-openstack-client check: @@ -4478,23 +4478,23 @@ projects: - post-mirror-python27 - post-mirror-python33 - - name: stackforge/python-climateclient + - name: stackforge/python-blazarclient template: - name: check-requirements check: - - gate-python-climateclient-pep8 - - gate-python-climateclient-python26 - - gate-python-climateclient-python27 + - gate-python-blazarclient-pep8 + - gate-python-blazarclient-python26 + - gate-python-blazarclient-python27 gate: - - gate-python-climateclient-pep8 - - gate-python-climateclient-python26 - - gate-python-climateclient-python27 + - gate-python-blazarclient-pep8 + - gate-python-blazarclient-python26 + - gate-python-blazarclient-python27 post: - - python-climateclient-branch-tarball + - python-blazarclient-branch-tarball pre-release: - - python-climateclient-tarball + - python-blazarclient-tarball release: - - python-climateclient-tarball + - python-blazarclient-tarball - name: stackforge/python-designateclient check: