Zun: rename higgins to zun (2)

As due to project name conflicts, rename higgins to zun.

Change-Id: I16c9aa7ff6ccc583d8a1d0da4838947acc672b8b

gerrit/acls/openstack/higgins.config

@@ -1,15 +0,0 @@
-[access "refs/heads/*"]
-abandon = group higgins-core
-create = group higgins-release
-label-Code-Review = -2..+2 group higgins-core
-label-Workflow = -1..+1 group higgins-core
-
-[access "refs/tags/*"]
-pushSignedTag = group higgins-release
-
-[receive]
-requireChangeId = true
-requireContributorAgreement = true
-
-[submit]
-mergeContent = true

gerrit/acls/openstack/zun.config

@@ -0,0 +1,15 @@
+[access "refs/heads/*"]
+abandon = group zun-core
+create = group zun-release
+label-Code-Review = -2..+2 group zun-core
+label-Workflow = -1..+1 group zun-core
+
+[access "refs/tags/*"]
+pushSignedTag = group zun-release
+
+[receive]
+requireChangeId = true
+requireContributorAgreement = true
+
+[submit]
+mergeContent = true

gerrit/projects.yaml

@@ -3301,10 +3301,6 @@
   description: OpenStack Orchestration (Heat) Templates
 - project: openstack/heat-translator
   description: Translate non-heat templates to Heat Orchestration Template.
-- project: openstack/higgins
-  description: Container Management Service for OpenStack
-  groups:
-    - python-higgins
 - project: openstack/horizon
   description: OpenStack Dashboard (Horizon)
   options:
@@ -4739,7 +4735,7 @@
   description: OpenStack Messaging (Zaqar) Client
 - project: openstack/python-zunclient
   description: Container Management Service (Zun) Client
-  acl-config: /home/gerrit2/acls/openstack/higgins.config
+  acl-config: /home/gerrit2/acls/openstack/zun.config
 - project: openstack/qa-specs
   groups:
     - tempest
@@ -5341,6 +5337,8 @@
   description: The UI component for Zaqar
   options:
     - translate
+- project: openstack/zun
+  description: Container Management Service for OpenStack
 - project: stackforge-attic/cookbook-ceph
 - project: stackforge-attic/cookbook-monasca-agent
 - project: stackforge-attic/cookbook-monasca-api

gerritbot/channels.yaml

@@ -2249,15 +2249,14 @@ openstack-zaqar:
   branches:
     - master
 
-# rename from higgins to zun after infra team rename higgins
 openstack-zun:
   events:
     - patchset-created
     - change-merged
     - x-vrif-minus-2
   projects:
-    - openstack/higgins
     - openstack/python-zunclient
+    - openstack/zun
   branches:
     - master
 

jenkins/jobs/projects.yaml

@@ -4859,15 +4859,6 @@
             - ubuntu-trusty
             - ubuntu-xenial
 
-- project:
-    name: higgins
-    tarball-site: tarballs.openstack.org
-
-    jobs:
-      - python-jobs
-      - 'gate-{name}-python35{suffix}':
-          suffix: '-nv'
-
 - project:
     name: horizon
     tarball-site: tarballs.openstack.org
@@ -13904,6 +13895,16 @@
     jobs:
       - jenkins-plugin-jobs
 
+- project:
+    name: zun
+    tarball-site: tarballs.openstack.org
+
+    jobs:
+      - python-jobs
+      - 'gate-{name}-python35{suffix}':
+          suffix: '-nv'
+
+
 - project:
     name: zuul
     tarball-site: tarballs.openstack.org

jenkins/jobs/zun.yaml

@@ -1,5 +1,5 @@
 - job:
-    name: 'gate-higgins-devstack-dsvm'
+    name: 'gate-zun-devstack-dsvm'
     node: ubuntu-xenial
 
     wrappers:
@@ -18,15 +18,15 @@
           export DEVSTACK_GATE_TEMPEST=0
           export DEVSTACK_GATE_NEUTRON=1
 
-          export PROJECTS="openstack/higgins $PROJECTS"
+          export PROJECTS="openstack/zun $PROJECTS"
           export PROJECTS="openstack/python-zunclient $PROJECTS"
-          export DEVSTACK_LOCAL_CONFIG="enable_plugin higgins git://git.openstack.org/openstack/higgins"
+          export DEVSTACK_LOCAL_CONFIG="enable_plugin zun git://git.openstack.org/openstack/zun"
 
           # Keep localrc to be able to set some vars in post_test_hook
           export KEEP_LOCALRC=1
 
           function gate_hook {
-               cd /opt/stack/new/higgins/
+               cd /opt/stack/new/zun/
               ./devstack/gate_hook.sh
           }
           export -f gate_hook

zuul/layout.yaml

@@ -9326,18 +9326,6 @@ projects:
     check:
       - gate-heat-translator-tox-py27-tp-ubuntu-xenial
 
-  - name: openstack/higgins
-    template:
-      - name: merge-check
-      - name: python-jobs
-      - name: python34-jobs
-      - name: python35-jobs-nv
-      - name: check-requirements
-    check:
-      - gate-higgins-devstack-dsvm
-    gate:
-      - gate-higgins-devstack-dsvm
-
   - name: openstack/horizon
     template:
       - name: merge-check
@@ -16422,6 +16410,18 @@ projects:
       - name: openstack-server-release-jobs
       - name: translation-jobs
 
+  - name: openstack/zun
+    template:
+      - name: merge-check
+      - name: python-jobs
+      - name: python34-jobs
+      - name: python35-jobs-nv
+      - name: check-requirements
+    check:
+      - gate-zun-devstack-dsvm
+    gate:
+      - gate-zun-devstack-dsvm
+
   - name: z/tempest
     gate:
       - gate-tempest-dsvm-full-ubuntu-trusty