Fix regression in list-changes

Recent merging of the liaison-loading code in list-changes makes
most list-changes job fail due to error in YAML loading code.

Beyond that YAML loading issue, the code assumes getting a dictionary
with team names as keys and an array of liaisons dictionary as values.
Fix the release_liaisons.yaml and schema to match.

Change-Id: I94fa41862d37aaf0535d64afd00b2bd55bb4649a

data/release_liaisons.yaml

@@ -1,181 +1,181 @@
-- barbican:
+barbican:
   - name: 'Dave McCowan'
     irc: dave-mccowan
     email: dmccowan@cisco.com
-- ceilometer:
+ceilometer:
   - name: 'gordon chung'
     irc: gordc
     email: gord@live.ca
-- cinder:
+cinder:
   - name: 'Sean McGinnis'
     irc: smcginnis
     email: sean.mcginnis@gmail.com
-- congress:
+congress:
   - name: 'Eric Kao'
     irc: ekcs
     email: ekcs.openstack@gmail.com
-- cyborg:
+cyborg:
   - name: 'Howard Huang'
     irc: zhipeng
     email: huangzhipeng@huawei.com
-- designate:
+designate:
   - name: 'Graham Hayes'
     irc: mugsie
     email: graham+designateci@hayes.ie
-- documentation:
+documentation:
   - name: 'Stephen Finucane'
     irc: stephenfin
     email: stephenfin@redhat.com
-- freezer:
+freezer:
   - name: 'Saad Zaher'
     irc: szaher
     email: eng.szaher@gmail.com
-- glance:
+glance:
   - name: 'Brian Rosmaita'
     irc: rosmaita
     email: rosmaita.fossdev@gmail.com
-- heat:
+heat:
   - name: 'Thomas Herve'
     irc: therve
     email: therve@redhat.com
-- horizon:
+horizon:
   - name: 'Akihiro Motoki'
     irc: amotoki
     email: amotoki@gmail.com
-- i18n:
+i18n:
   - name: 'Frank Kloeker'
     irc: eumel8
     email: f.kloeker@telekom.de
-- ironic:
+ironic:
   - name: 'Dmitry Tantsur'
     irc: dtantsur
     email: dtantsur@protonmail.com
-- keystone:
+keystone:
   - name: 'Kristi Nikolla'
     irc: knikolla
     email: kristi@nikolla.me
-- kolla:
+kolla:
   - name: 'Mark Goddard'
     irc: mgoddard
     email: mark@stackhpc.com
-- magnum:
+magnum:
   - name: 'Spyros Trigazis'
     irc: strigazi
     email: strigazi@gmail.com
-- manila:
+manila:
   - name: 'Tom Barron'
     irc: tbarron
     email: tpb@dyncloud.net
-- mistral:
+mistral:
   - name: 'Renat Akhmerov'
     irc: rakhmerov
     email: renat.akhmerov@gmail.com
-- murano:
+murano:
   - name: 'Felipe Monteiro'
     irc: felipemonteiro
     email: felipe.monteiro@att.com
-- neutron:
+neutron:
   - name: 'Akihiro Motoki'
     irc: amotoki
     email: amotoki@gmail.com
-- nova:
+nova:
   - name: 'Sylvain Bauza'
     irc: bauzas
     email: sbauza@redhat.com
   - name: 'Matt Riedemann'
     irc: mriedem
     email: mriedem.os@gmail.com
-- octavia:
+octavia:
   - name: 'Michael Johnson'
     irc: johnsom
     email: johnsmor@gmail.com
   - name: 'Carlos Goncalves'
     irc: cgoncalves
     email: cgoncalves@redhat.com
-- openstackansible:
+openstackansible:
   - name: 'Jean-Philippe Evrard'
     irc: evrardjp
     email: jean-philippe@evrard.me
-- openstackclient:
+openstackclient:
   - name: 'Doug Hellmann'
     irc: dhellmann
     email: doug@doughellmann.com
-- oslo:
+oslo:
   - name: 'Doug Hellmann'
     irc: dhellmann
     email: doug@doughellmann.com
   - name: 'Herve Beraud'
     irc: hberaud
     email: hberaud@redhat.com
-- packaging_rpm:
+packaging_rpm:
   - name: 'Dirk Mueller'
     irc: dirk
     email: dirk@dmllr.de
-- placement:
+placement:
   - name: 'Chris Dent'
     irc: cdent
     email: cdent@anticdent.org
-- puppet openstack:
+puppet openstack:
   - name: 'Alex Schultz'
     irc: mwhahaha
     email: aschultz@redhat.com
-- qinling:
+qinling:
   - name: 'Lingxian Kong'
     irc: lxkong
     email: anlin.kong@gmail.com
-- rally:
+rally:
   - name: 'Andrey Kurilin'
     irc: andreykurilin
     email: andr.kurilin@gmail.com
-- sahara:
+sahara:
   - name: 'Telles Nobrega'
     irc: tenobreg/tellesnobrega
     email:
-- searchlight:
+searchlight:
   - name: 'Trinh Nguyen'
     irc: dangtrinhnt
     email: dangtrinhnt@gmail.com
-- senlin:
+senlin:
   - name: 'Qiming Teng'
     irc: Qiming
     email: tengqim@cn.ibm.com
-- solum:
+solum:
   - name: 'Devdatta Kulkarni'
     irc: devkulkarni
     email: kulkarni.devdatta@gmail.com
-- storlets:
+storlets:
   - name: 'Kota Tsuyuzaki'
     irc: kota_
     email: tsuyuzaki.kota@lab.ntt.co.jp
-- swift:
+swift:
   - name: 'John Dickinson'
     irc: notmyname
     email: me@not.mn
-- tricircle:
+tricircle:
   - name: 'Zhiyuan Cai'
     irc: zhiyuan
     email: luckyvega.g@gmail.com
-- tripleo:
+tripleo:
   - name: 'Emilien Macchi'
     irc: EmilienM
     email: emilien@redhat.com
-- trove:
+trove:
   - name: 'Lingxian Kong'
     irc: lxkong
     email: anlin.kong@gmail.com
-- watcher:
+watcher:
   - name: 'Canwei Li'
     irc: licanwei
     email: li.canwei2@zte.com.cn
-- winstackers:
+winstackers:
   - name: 'Claudiu Belu'
     irc: claudiub
     email: cbelu@cloudbasesolutions.com
-- zaqar:
+zaqar:
   - name: 'Fei Long Wang'
     irc: flwang
     email: flwang@catalyst.net.nz
-- zun:
+zun:
   - name: 'Hongbin Lu'
     irc: hongbin
     email: hongbin.lu@huawei.com

openstack_releases/cmds/list_changes.py

@@ -260,7 +260,8 @@ def main():
         False,
     )
 
-    liaison_data = yaml.load("../../data/release_liaisons.yaml", "r")
+    with open("./data/release_liaisons.yaml", "r") as f:
+        liaison_data = yaml.safe_load(f)
 
     # Remove any inherited PAGER environment variable to avoid
     # blocking the output waiting for input.
@@ -291,7 +292,7 @@ def main():
                 print('found team %s' % team_name)
                 print('  PTL    : %(name)s (%(irc)s)' % team.ptl)
                 for liaison in liaison_data.get(team.name.lower(), []):
-                    print('Liaison: %(name)s (%(irc)s)' % liaison)
+                    print('  Liaison: %(name)s (%(irc)s)' % liaison)
                 team_deliv = team.deliverables.get(deliv.name)
                 if team_deliv:
                     print('found deliverable %s' % deliv.name)

openstack_releases/liaisons_schema.yaml

@@ -5,10 +5,10 @@ $id: "https://opendev.org/openstack/releases/src/branch/master/README.rst"
 # Do not allow any properties not defined here. This lets us catch
 # typos.
 
-type: "array"
+type: "object"
-items:
+additional_properties:
-  type: "object"
+  type: "array"
-  name:
+  items:
     type: "object"
     additionalProperties: false
     required:
@@ -20,4 +20,4 @@ items:
         irc:
            type: "string"
         email:
-           type: "string"
+           type: "string"