Ubuntu CI Services

Merge lp:~cjohnston/ubuntu-ci-services-itself/tenant-issues into lp:ubuntu-ci-services-itself

  1. tenant-issues
  2. Merge into trunk
Proposed by Chris Johnston
Status: Merged
Approved by: Francis Ginther
Approved revision: 235
Merged at revision: 235
Proposed branch: lp:~cjohnston/ubuntu-ci-services-itself/tenant-issues
Merge into: lp:ubuntu-ci-services-itself
Diff against target: 69 lines (+6/-5)
5 files modified
ci-utils/ci_utils/data_store/__init__.py (+1/-1)
ci-utils/ci_utils/tests/test_data_store.py (+1/-1)
cli/ci_libs/utils.py (+1/-1)
cli/tests/__init__.py (+1/-1)
cli/tests/test_utils.py (+2/-1)
To merge this branch: bzr merge lp:~cjohnston/ubuntu-ci-services-itself/tenant-issues
Reviewer Review Type Date Requested Status
Ursula Junque (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+206046@code.launchpad.net

Commit message

Fix auth_tenant/auth_tenant_name issues

Description of the change

Previously our code had been using auth_tenant_name. In a recent MP auth_tenant was mistakenly introduced. This clearly caused issues.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:235
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/145/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/145/rebuild

review: Approve (continuous-integration)
Revision history for this message
Ursula Junque (ursinha) wrote :

Looks good to me, tests pass (locally) and so on.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'ci-utils/ci_utils/data_store/__init__.py'
--- ci-utils/ci_utils/data_store/__init__.py 2014-02-11 16:26:02 +0000
+++ ci-utils/ci_utils/data_store/__init__.py 2014-02-12 20:43:20 +0000
@@ -38,7 +38,7 @@
3838
39 @staticmethod39 @staticmethod
40 def validate_auth_config(auth_config):40 def validate_auth_config(auth_config):
41 required_fields = ['auth_user', 'auth_password', 'auth_tenant',41 required_fields = ['auth_user', 'auth_password', 'auth_tenant_name',
42 'auth_url', 'auth_region']42 'auth_url', 'auth_region']
4343
44 missing_fields = []44 missing_fields = []
4545
=== modified file 'ci-utils/ci_utils/tests/test_data_store.py'
--- ci-utils/ci_utils/tests/test_data_store.py 2014-02-11 16:26:02 +0000
+++ ci-utils/ci_utils/tests/test_data_store.py 2014-02-12 20:43:20 +0000
@@ -21,7 +21,7 @@
21 'auth_url': 'http://example.com',21 'auth_url': 'http://example.com',
22 'auth_user': 'user',22 'auth_user': 'user',
23 'auth_password': 'pass',23 'auth_password': 'pass',
24 'auth_tenant': 'tenant',24 'auth_tenant_name': 'tenant',
25 'auth_region': 'region',25 'auth_region': 'region',
26}26}
2727
2828
=== modified file 'cli/ci_libs/utils.py'
--- cli/ci_libs/utils.py 2014-02-11 16:26:02 +0000
+++ cli/ci_libs/utils.py 2014-02-12 20:43:20 +0000
@@ -46,7 +46,7 @@
46 data_store.DataStore.validate_auth_config(AUTH_CONFIG)46 data_store.DataStore.validate_auth_config(AUTH_CONFIG)
47 except IOError:47 except IOError:
48 r = ['ci_url', 'auth_url', 'auth_user', 'auth_password',48 r = ['ci_url', 'auth_url', 'auth_user', 'auth_password',
49 'auth_region', 'auth_tenant']49 'auth_region', 'auth_tenant_name']
50 error_msg = ("ERROR: Missing YAML config in {}:\n {}"50 error_msg = ("ERROR: Missing YAML config in {}:\n {}"
51 "\n\nThis can be created by running: {} auto_config")51 "\n\nThis can be created by running: {} auto_config")
52 sys.exit(error_msg.format(config_file, "\n ".join(r), sys.argv[0]))52 sys.exit(error_msg.format(config_file, "\n ".join(r), sys.argv[0]))
5353
=== modified file 'cli/tests/__init__.py'
--- cli/tests/__init__.py 2014-01-29 18:14:33 +0000
+++ cli/tests/__init__.py 2014-02-12 20:43:20 +0000
@@ -47,7 +47,7 @@
47 "auth_url": "test",47 "auth_url": "test",
48 "auth_user": "test",48 "auth_user": "test",
49 "auth_password": "test",49 "auth_password": "test",
50 "auth_tenant": "test",50 "auth_tenant_name": "test",
51 }51 }
52 utils.CI_URL = utils.AUTH_CONFIG['ci_url']52 utils.CI_URL = utils.AUTH_CONFIG['ci_url']
5353
5454
=== modified file 'cli/tests/test_utils.py'
--- cli/tests/test_utils.py 2014-02-11 16:26:02 +0000
+++ cli/tests/test_utils.py 2014-02-12 20:43:20 +0000
@@ -26,11 +26,12 @@
26config_contents = """auth_url: http://example.com26config_contents = """auth_url: http://example.com
27auth_user: user27auth_user: user
28auth_password: pass28auth_password: pass
29auth_tenant: user_project29auth_tenant_name: user_project
30auth_region: region130auth_region: region1
31ci_url: http://example.com/ci31ci_url: http://example.com/ci
32"""32"""
3333
34
34class UtilsTestCase(CLITestCase):35class UtilsTestCase(CLITestCase):
35 def test_parse_id(self):36 def test_parse_id(self):
36 location = 'http://www.example.com/api/v1/ticket/5/'37 location = 'http://www.example.com/api/v1/ticket/5/'

Subscribers

People subscribed via source and target branches