diff --git a/gerrit/acls/openstack/networking-powervm.config b/gerrit/acls/openstack/networking-powervm.config new file mode 100644 index 0000000000..f802b2a3b7 --- /dev/null +++ b/gerrit/acls/openstack/networking-powervm.config @@ -0,0 +1,15 @@ +[access "refs/heads/*"] +abandon = group networking-powervm-core +create = group networking-powervm-core +label-Code-Review = -2..+2 group networking-powervm-core +label-Workflow = -1..+1 group networking-powervm-core + +[access "refs/tags/*"] +pushSignedTag = group networking-powervm-release + +[receive] +requireChangeId = true +requireContributorAgreement = true + +[submit] +mergeContent = true diff --git a/gerrit/acls/stackforge/neutron-powervm.config b/gerrit/acls/stackforge/neutron-powervm.config deleted file mode 100644 index 1f25cb759b..0000000000 --- a/gerrit/acls/stackforge/neutron-powervm.config +++ /dev/null @@ -1,15 +0,0 @@ -[access "refs/heads/*"] -abandon = group neutron-powervm-core -create = group neutron-powervm-core -label-Code-Review = -2..+2 group neutron-powervm-core -label-Workflow = -1..+1 group neutron-powervm-core - -[access "refs/tags/*"] -pushSignedTag = group neutron-powervm-release - -[receive] -requireChangeId = true -requireContributorAgreement = true - -[submit] -mergeContent = true diff --git a/gerrit/projects.yaml b/gerrit/projects.yaml index c1c4c2f762..a14c0e1545 100755 --- a/gerrit/projects.yaml +++ b/gerrit/projects.yaml @@ -1208,6 +1208,8 @@ description: Neutron integration with OVN - project: openstack/networking-plumgrid description: PLUMgrid driver for OpenStack Neutron +- project: openstack/networking-powervm + description: Neutron drivers for PowerVM network management. - project: openstack/networking-sfc description: API's and implementations to support Service Function Chaining in Neutron. - project: openstack/networking-vsphere @@ -2489,9 +2491,6 @@ - project: stackforge/networking-zvm description: Implements zVM ML2 mechanism driver and zVM neutron agent for OpenStack Neutron. -- project: stackforge/neutron-powervm - description: ML2 compatible PowerVM Shared Ethernet Adapter agent for OpenStack - Neutron - project: stackforge/neutron-salt-formula description: SaltStack formula used for installing OpenStack Neutron acl-config: /home/gerrit2/acls/stackforge/salt-formula.config diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml index 94286a308c..63bfcc155d 100755 --- a/jenkins/jobs/projects.yaml +++ b/jenkins/jobs/projects.yaml @@ -917,6 +917,14 @@ jobs: - python-jobs +- project: + name: networking-powervm + node: 'bare-precise || bare-trusty' + tarball-site: tarballs.openstack.org + + jobs: + - python-jobs + - project: name: networking-sfc node: 'bare-precise || bare-trusty' @@ -5762,14 +5770,6 @@ jobs: - python-jobs -- project: - name: neutron-powervm - node: 'bare-precise || bare-trusty' - tarball-site: tarballs.openstack.org - - jobs: - - python-jobs - - project: name: nova-docker node: 'bare-precise || bare-trusty' diff --git a/zuul/layout.yaml b/zuul/layout.yaml index b3d0d5fec1..f63f6eb30a 100755 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -2703,6 +2703,11 @@ projects: - name: merge-check - name: python-jobs + - name: openstack/networking-powervm + template: + - name: merge-check + - name: python-jobs + - name: openstack/networking-sfc template: - name: merge-check @@ -7995,11 +8000,6 @@ projects: - name: merge-check - name: python-jobs - - name: stackforge/neutron-powervm - template: - - name: merge-check - - name: python-jobs - - name: stackforge/neutron-salt-formula template: - name: merge-check