Merge "Implement distributed leadership in tools and schema"

doc/source/_exts/tc_liaisons.py

@@ -71,8 +71,9 @@ class TCLiaisonsTable(tables.Table):
         data_iter = projects.load_project_file(filename)
         liaisons = {}
         for project_name, project in data_iter.items():
+            proj_liaisons = project.get('liaisons', {})
 
-            for liaison in project.get('liaisons', []):
+            for liaison in proj_liaisons.get('tc_members', []):
                 try:
                     liaisons[liaison].extend([project_name])
                 except KeyError:

doc/source/_exts/teams.py

@@ -43,6 +43,10 @@ def _team_to_rst(name, info):
     yield ''
     yield ':Home Page: ' + info.get('url', '')
     ptl = info.get('ptl', {'name': '', 'irc': '', 'email': ''})
+    leadership_type = info.get('leadership_type')
+    if leadership_type:
+        yield ':Leadership Type: ' + leadership_type
+    else:
         yield ':PTL: %(name)s (``%(irc)s``) <%(email)s>' % ptl
     irc_channel = info.get('irc-channel')
     if irc_channel:
@@ -53,7 +57,50 @@ def _team_to_rst(name, info):
         yield ':Service: ' + service
     liaisons = info.get('liaisons')
     if liaisons:
-        yield ':TC Liaisons: ' + ", ".join(liaisons)
+        contact_format = {'name': '', 'irc': '', 'email': ''}
+        tc_members = liaisons.get('tc_members')
+        if tc_members:
+            yield ':TC Members Liaisons: ' + ", ".join(tc_members)
+        release = liaisons.get('release', contact_format)
+        if release != contact_format:
+            yield ':Release Liaisons: ' + ', '.join(
+                '%(name)s (``%(irc)s``) <%(email)s>' % rl
+                for rl in release)
+        tact_sig = liaisons.get('tact-sig', contact_format)
+        if tact_sig != contact_format:
+            yield ':TACT SIG Liaisons: ' + ', '.join(
+                '%(name)s (``%(irc)s``) <%(email)s>' % tl
+                for tl in tact_sig)
+        security = liaisons.get('security', contact_format)
+        if security != contact_format:
+            yield ':Security Liaisons: ' + ', '.join(
+                '%(name)s (``%(irc)s``) <%(email)s>' % sl
+                for sl in security)
+        events = liaisons.get('events', contact_format)
+        if events != contact_format:
+            yield ':Events Liaisons: ' + ', '.join(
+                '%(name)s (``%(irc)s``) <%(email)s>' % el
+                for el in events)
+        project_update_onboarding = liaisons.get('project_update_onboarding', contact_format)
+        if project_update_onboarding != contact_format:
+            yield ':Project Update Onboarding Liaisons: ' + ', '.join(
+                '%(name)s (``%(irc)s``) <%(email)s>' % pl
+                for pl in project_update_onboarding)
+        meeting_facilitator = liaisons.get('meeting_facilitator', contact_format)
+        if meeting_facilitator != contact_format:
+            yield ':Meeting Facilitator Liaisons: ' + ', '.join(
+                '%(name)s (``%(irc)s``) <%(email)s>' % ml
+                for ml in meeting_facilitator)
+        bug_deputy = liaisons.get('bug_deputy', contact_format)
+        if bug_deputy != contact_format:
+            yield ':Bug Deputy Liaisons: ' + ', '.join(
+                '%(name)s (``%(irc)s``) <%(email)s>' % bl
+                for bl in bug_deputy)
+        rfe_coordinator = liaisons.get('rfe_coordinator', contact_format)
+        if rfe_coordinator != contact_format:
+            yield ':RFE Coordinator Liaisons: ' + ', '.join(
+                '%(name)s (``%(irc)s``) <%(email)s>' % rcl
+                for rcl in rfe_coordinator)
     yield ''
     mission = info.get('mission', '').rstrip()
     if mission:

openstack_governance/projects_schema.yaml

@@ -3,15 +3,41 @@ $schema: "http://json-schema.org/schema#"
 $id: "https://opendev.org/openstack/releases/src/branch/master/README.rst"
 
 
+contact_schema: &contact_schema
+  type: "array"
+  items:
+    type: "object"
+    required:
+      - name
+      - email
+    additionalProperties: false
+    properties:
+      name:
+        type: "string"
+      irc:
+        type: "string"
+      email:
+        type: "string"
+        format: "email"
+  minItems: 1
+  uniqueItems: true
+
 additionalProperties:
   # Do not allow any properties not defined here. This lets us catch
   # typos.
   additionalProperties: false
-  required:
+  oneOf:
+    - required:
         - ptl
         - deliverables
         - url
         - mission
+    - required:
+        - leadership_type
+        - liaisons
+        - deliverables
+        - url
+        - mission
   properties:
     ptl:
       type: "object"
@@ -27,6 +53,10 @@ additionalProperties:
         email:
           type: "string"
           format: "email"
+    leadership_type:
+      type: "string"
+      enum:
+        - distributed
     appointed:
       type: "array"
       items:
@@ -38,10 +68,25 @@ additionalProperties:
     url:
       type: "string"
     liaisons:
+      type: "object"
+      properties:
+        tc_members:
           type: "array"
-      uniqueItems: true
           items:
             type: "string"
+          uniqueItems: true
+        # TODO(gmann): Make release, tact-sig,
+        # and, security liaison as required for
+        # distributed leadership type.
+        release: *contact_schema
+        tact-sig: *contact_schema
+        security: *contact_schema
+        events: *contact_schema
+        project_update_onboarding: *contact_schema
+        meeting_facilitator: *contact_schema
+        bug_deputy: *contact_schema
+        rfp_coordinator: *contact_schema
+        additionalProperties: false
     mission:
       type: "string"
     deliverables:

openstack_governance/tests/test_governance.py

@@ -32,8 +32,24 @@ Release Management:
     their own releases.
   url: https://wiki.openstack.org/wiki/Release_Management
   liaisons:
+    tc_members:
       - zaneb
       - ttx
+    release:
+      - name: Hervé Beraud
+        irc: hberaud
+        email: hberaud@redhat.com
+    tact-sig:
+      - name: Hervé Beraud
+        irc: hberaud
+        email: hberaud@redhat.com
+      - name: Daniel Bengtsson
+        irc: damani
+        email: dbengt@redhat.com
+    security:
+      - name: Daniel Bengtsson
+        irc: damani
+        email: dbengt@redhat.com
   tags:
     - team:diverse-affiliation
   deliverables:

reference/projects.yaml

@@ -24,6 +24,7 @@ adjutant:
       repos:
         - openstack/python-adjutantclient
   liaisons:
+      tc_members:
         - knikolla
         - mnaser
 barbican:
@@ -74,6 +75,7 @@ barbican:
       tags:
         - vulnerability:managed
   liaisons:
+      tc_members:
         - knikolla
         - cloudnull
 blazar:
@@ -110,6 +112,7 @@ blazar:
       repos:
         - openstack/python-blazarclient
   liaisons:
+      tc_members:
         - mugsie
         - belmoreira
 cinder:
@@ -164,6 +167,7 @@ cinder:
         - vulnerability:managed
         - stable:follows-policy
   liaisons:
+      tc_members:
         - cloudnull
         - mugsie
 cloudkitty:
@@ -199,6 +203,7 @@ cloudkitty:
       repos:
         - openstack/cloudkitty-tempest-plugin
   liaisons:
+      tc_members:
         - evrardjp
         - knikolla
 cyborg:
@@ -229,6 +234,7 @@ cyborg:
       repos:
         - openstack/cyborg-tempest-plugin
   liaisons:
+      tc_members:
         - njohnston
         - cloudnull
 designate:
@@ -272,6 +278,7 @@ designate:
       tags:
         - stable:follows-policy
   liaisons:
+      tc_members:
         - evrardjp
         - jungleboyj
 ec2-api:
@@ -292,6 +299,7 @@ ec2-api:
       repos:
         - openstack/ec2api-tempest-plugin
   liaisons:
+      tc_members:
         - jungleboyj
         - mnaser
 freezer:
@@ -328,6 +336,7 @@ freezer:
       repos:
         - openstack/python-freezerclient
   liaisons:
+      tc_members:
         - ricolin
         - jungleboyj
 glance:
@@ -370,6 +379,7 @@ glance:
         - vulnerability:managed
         - stable:follows-policy
   liaisons:
+      tc_members:
         - mnaser
         - njohnston
 heat:
@@ -429,7 +439,8 @@ heat:
     tosca-parser:
       repos:
         - openstack/tosca-parser
-  liaisons: [ricolin, jungleboyj]
+  liaisons:
+      tc_members: [ricolin, jungleboyj]
 horizon:
   ptl:
     name: Ivan Kolodyazhny
@@ -549,6 +560,7 @@ horizon:
       repos:
         - openstack/xstatic-spin
   liaisons:
+      tc_members:
         - mnaser
         - mugsie
 ironic:
@@ -656,6 +668,7 @@ ironic:
       email: jay@jvf.cc
       expires-in: July 2019
   liaisons:
+      tc_members:
         - mnaser
         - knikolla
 karbor:
@@ -680,6 +693,7 @@ karbor:
       repos:
         - openstack/python-karborclient
   liaisons:
+      tc_members:
         - mugsie
         - belmoreira
 keystone:
@@ -737,6 +751,7 @@ keystone:
       repos:
         - openstack/ldappool
   liaisons:
+      tc_members:
         - mnaser
         - knikolla
 kolla:
@@ -768,6 +783,7 @@ kolla:
         - openstack/kayobe-config
         - openstack/kayobe-config-dev
   liaisons:
+      tc_members:
         - evrardjp
         - mugsie
 kuryr:
@@ -797,6 +813,7 @@ kuryr:
       repos:
         - openstack/kuryr-tempest-plugin
   liaisons:
+      tc_members:
         - belmoreira
         - njohnston
 magnum:
@@ -827,7 +844,8 @@ magnum:
     python-magnumclient:
       repos:
         - openstack/python-magnumclient
-  liaisons: [ricolin, belmoreira]
+  liaisons:
+      tc_members: [ricolin, belmoreira]
 manila:
   ptl:
     name: Goutham Pacha Ravi
@@ -870,7 +888,8 @@ manila:
     python-manilaclient:
       repos:
         - openstack/python-manilaclient
-  liaisons: [gmann, cloudnull]
+  liaisons:
+      tc_members: [gmann, cloudnull]
 masakari:
   ptl:
     name: Radosław Piliszek
@@ -902,6 +921,7 @@ masakari:
       repos:
         - openstack/masakari-dashboard
   liaisons:
+      tc_members:
         - evrardjp
         - cloudnull
 mistral:
@@ -940,7 +960,8 @@ mistral:
     mistral-extra:
       repos:
         - openstack/mistral-extra
-  liaisons: [ricolin, jungleboyj]
+  liaisons:
+      tc_members: [ricolin, jungleboyj]
 monasca:
   ptl:
     name: Martin Chacon Piza
@@ -1012,6 +1033,7 @@ monasca:
       repos:
         - openstack/monasca-kibana-plugin
   liaisons:
+      tc_members:
         - ricolin
         - belmoreira
 murano:
@@ -1065,6 +1087,7 @@ murano:
       repos:
         - openstack/murano-tempest-plugin
   liaisons:
+      tc_members:
         - cloudnull
         - njohnston
 neutron:
@@ -1164,7 +1187,8 @@ neutron:
     os-ken:
       repos:
         - openstack/os-ken
-  liaisons: [njohnston, mnaser]
+  liaisons:
+      tc_members: [njohnston, mnaser]
 nova:
   ptl:
     name: Balazs Gibizer
@@ -1204,7 +1228,8 @@ nova:
     os-vif:
       repos:
         - openstack/os-vif
-  liaisons: [gmann, cloudnull]
+  liaisons:
+      tc_members: [gmann, cloudnull]
 octavia:
   ptl:
     name: APPOINTMENT NEEDED
@@ -1259,6 +1284,7 @@ octavia:
       tags:
         - stable:follows-policy
   liaisons:
+      tc_members:
         - cloudnull
         - mugsie
 OpenStack Charms:
@@ -1786,6 +1812,7 @@ OpenStack Charms:
       repos:
         - openstack/charm-watcher-dashboard
   liaisons:
+      tc_members:
         - evrardjp
         - gmann
 openstack-chef:
@@ -1881,6 +1908,7 @@ openstack-chef:
       repos:
         - openstack/openstack-chef-specs
   liaisons:
+      tc_members:
         - njohnston
         - ricolin
 OpenStack-Helm:
@@ -1926,6 +1954,7 @@ OpenStack-Helm:
       repos:
         - openstack/loci
   liaisons:
+      tc_members:
         - evrardjp
         - njohnston
 OpenStackAnsible:
@@ -2020,6 +2049,7 @@ OpenStackAnsible:
       repos:
         - openstack/openstack-ansible-specs
   liaisons:
+      tc_members:
         - evrardjp
         - knikolla
 OpenStackSDK:
@@ -2075,7 +2105,8 @@ OpenStackSDK:
         - openstack/shade
       tags:
         - assert:follows-standard-deprecation
-  liaisons: [diablo_rojo, cloudnull]
+  liaisons:
+      tc_members: [diablo_rojo, cloudnull]
 oslo:
   ptl:
     name: APPOINTMENT NEEDED
@@ -2292,7 +2323,8 @@ oslo:
       repos:
         - openstack/whereto
 
-  liaisons: [ricolin, belmoreira]
+  liaisons:
+      tc_members: [ricolin, belmoreira]
 placement:
   ptl:
     name: APPOINTMENT NEEDED
@@ -2324,6 +2356,7 @@ placement:
       repos:
         - openstack/os-resource-classes
   liaisons:
+      tc_members:
         - gmann
         - njohnston
 Puppet OpenStack:
@@ -2483,6 +2516,7 @@ Puppet OpenStack:
         - openstack/puppet-zaqar
 
   liaisons:
+      tc_members:
         - evrardjp
         - ricolin
 qinling:
@@ -2508,6 +2542,7 @@ qinling:
         - openstack/qinling-dashboard
 
   liaisons:
+      tc_members:
         - mugsie
         - jungleboyj
 Quality Assurance:
@@ -2612,7 +2647,8 @@ Quality Assurance:
       release-management: none
       repos:
         - openstack/whitebox-tempest-plugin
-  liaisons: [gmann, jungleboyj]
+  liaisons:
+      tc_members: [gmann, jungleboyj]
 rally:
   ptl:
     name: Andrey Kurilin
@@ -2640,6 +2676,7 @@ rally:
         - openstack/performance-docs
 
   liaisons:
+      tc_members:
         - knikolla
         - diablo_rojo
 Release Management:
@@ -2670,6 +2707,7 @@ Release Management:
       repos:
         - openstack/specs-cookiecutter
   liaisons:
+      tc_members:
         - diablo_rojo
         - evrardjp
 requirements:
@@ -2689,6 +2727,7 @@ requirements:
       repos:
         - openstack/requirements
   liaisons:
+      tc_members:
         - diablo_rojo
         - belmoreira
 sahara:
@@ -2792,6 +2831,7 @@ sahara:
         - openstack/sahara-specs
 
   liaisons:
+      tc_members:
         - gmann
         - njohnston
 searchlight:
@@ -2825,6 +2865,7 @@ searchlight:
         - openstack/searchlight-ui
 
   liaisons:
+      tc_members:
         - mugsie
         - belmoreira
 senlin:
@@ -2852,7 +2893,8 @@ senlin:
       repos:
         - openstack/senlin-tempest-plugin
 
-  liaisons: [ricolin, mnaser]
+  liaisons:
+      tc_members: [ricolin, mnaser]
 solum:
   ptl:
     name: Rong Zhu
@@ -2884,6 +2926,7 @@ solum:
         - openstack/solum-tempest-plugin
 
   liaisons:
+      tc_members:
         - jungleboyj
         - belmoreira
 storlets:
@@ -2904,6 +2947,7 @@ storlets:
         - openstack/storlets
 
   liaisons:
+      tc_members:
         - jungleboyj
         - knikolla
 swift:
@@ -2949,6 +2993,7 @@ swift:
         - openstack/swift-bench
 
   liaisons:
+      tc_members:
         - cloudnull
         - diablo_rojo
 tacker:
@@ -2980,7 +3025,8 @@ tacker:
       repos:
         - openstack/tacker-specs
 
-  liaisons: [gmann, knikolla]
+  liaisons:
+      tc_members: [gmann, knikolla]
 Telemetry:
   ptl:
     name: Matthias Runge
@@ -3031,6 +3077,7 @@ Telemetry:
         - openstack/telemetry-tempest-plugin
 
   liaisons:
+      tc_members:
         - cloudnull
         - gmann
 
@@ -3169,6 +3216,7 @@ tripleo:
         - openstack/tripleo-ha-utils
 
   liaisons:
+      tc_members:
         - diablo_rojo
         - jungleboyj
 trove:
@@ -3212,6 +3260,7 @@ trove:
         - openstack/trove-tempest-plugin
 
   liaisons:
+      tc_members:
         - gmann
         - diablo_rojo
 vitrage:
@@ -3263,6 +3312,7 @@ vitrage:
         - openstack/xstatic-moment-timezone
 
   liaisons:
+      tc_members:
         - belmoreira
         - mugsie
 watcher:
@@ -3297,6 +3347,7 @@ watcher:
         - openstack/watcher-dashboard
 
   liaisons:
+      tc_members:
         - mugsie
         - mnaser
 winstackers:
@@ -3329,6 +3380,7 @@ winstackers:
         - openstack/compute-hyperv
 
   liaisons:
+      tc_members:
         - mnaser
         - jungleboyj
 zaqar:
@@ -3368,7 +3420,8 @@ zaqar:
       repos:
         - openstack/zaqar-ui
 
-  liaisons: [njohnston, evrardjp]
+  liaisons:
+      tc_members: [njohnston, evrardjp]
 zun:
   ptl:
     name: Feng Shengqin
@@ -3394,5 +3447,6 @@ zun:
       repos:
         - openstack/zun-ui
   liaisons:
+      tc_members:
         - mugsie
         - diablo_rojo

tools/assign_liaisons.py

@@ -61,7 +61,8 @@ def main():
 
     if not args.replace_all:
         for _, team in project_data.items():
-            for member in team.get('liaisons', []):
+            proj_liaisons = team.get('liaisons', {})
+            for member in proj_liaisons.get('tc_members', []):
                 member_counts.update({member: 1})
 
     choices = []
@@ -71,9 +72,10 @@ def main():
     # person to a team twice.
 
     for name, team in project_data.items():
-        liaisons = team.get('liaisons', [])
+        proj_liaisons = team.get('liaisons', {})
+        liaisons = proj_liaisons.get('tc_members', [])
         if args.remove_all:
-            team['liaisons'] = []
+            team['liaisons']['tc_members'] = []
             continue
         if args.replace_all:
             liaisons = []
@@ -84,7 +86,7 @@ def main():
                 choices.insert(0, next_choice)
                 next_choice = choices.pop()
             liaisons.append(next_choice)
-        team['liaisons'] = liaisons
+        team['liaisons']['tc_members'] = liaisons
 
     projects.write_project_file(project_data, args.projects_file)