Add a few folks from the ansible ecosystem

Also, adjust the jsonschema email definition. '+' is allowed in an email
address, and some people use it to separate out email from different
places.

Change-Id: I62803e83efc46ae6e708736b9fc613c64fe2c995
This commit is contained in:
Monty Taylor 2015-04-02 09:33:47 -04:00 committed by Ilya Shakhat
parent 8da5f13f89
commit 501d646e6c
3 changed files with 43 additions and 2 deletions

View File

@ -123,6 +123,17 @@
"user_name": "Aaron Greengrass",
"emails": ["aaron@greenbtn.com"]
},
{
"github_id": "abadger",
"companies": [
{
"company_name": "RedHat",
"end_date": null
}
],
"user_name": "Toshio Kuratomi",
"emails": ["toshio@fedoraproject.org", "a.badger@gmail.com"]
},
{
"launchpad_id": "abhijeet-jain",
"gerrit_id": "Abhijeet.Jain",
@ -978,6 +989,17 @@
"user_name": "Basil Baby",
"emails": ["basilbaby@gmail.com"]
},
{
"github_id": "bcoca",
"companies": [
{
"company_name": "Ansible",
"end_date": null
}
],
"user_name": "Brian Coca",
"emails": ["bcoca@ansible.com", "brian.coca+git@gmail.com"]
},
{
"launchpad_id": "bcwaldon",
"companies": [
@ -6255,6 +6277,18 @@
"user_name": "Thiago Morello",
"emails": ["thiago.morello@locaweb.com.br"]
},
{
"launchpad_id": "mpdehaan",
"github_id": "mpdehaan",
"companies": [
{
"company_name": "Ansible",
"end_date": "2015-Jan-30"
}
],
"user_name": "Michael DeHaan",
"emails": ["michael.dehaan@gmail.com","michael.dehaan@ansible.com"]
},
{
"launchpad_id": "mpmsimo",
"companies": [
@ -10422,6 +10456,10 @@
"domains": ["anl.gov"],
"company_name": "Argonne National Laboratory"
},
{
"domains": ["ansible.com"],
"company_name": "Ansible"
},
{
"domains": ["apple.com"],
"company_name": "Apple, Inc."

View File

@ -28,7 +28,7 @@
"type": "array",
"items": {
"type": "string",
"pattern": "^[a-z\\d_\\.-]+@([a-z\\d\\.-]+\\.)+(([a-z]+)|\\(none\\))$"
"pattern": "^[a-z\\d_\\.\\+-]+@([a-z\\d\\.-]+\\.)+(([a-z]+)|\\(none\\))$"
},
"minItems": 1
},

View File

@ -82,7 +82,10 @@ class TestConfigFiles(testtools.TestCase):
def _verify_default_data_by_schema(self, file_name):
default_data = self._read_file(file_name)
schema = self._read_file('etc/default_data.schema.json')
jsonschema.validate(default_data, schema)
try:
jsonschema.validate(default_data, schema)
except jsonschema.ValidationError as e:
self.fail(e)
def test_default_data_schema_conformance(self):
self._verify_default_data_by_schema('etc/default_data.json')