Merge ~sylvain-pineau/checkbox-ng:c3url_envar into checkbox-ng:master

Proposed by Sylvain Pineau
Status: Merged
Approved by: Sylvain Pineau
Approved revision: ae41b2e45c71871f8a4870a44da396e77ecdefd5
Merged at revision: 6c98d1f7a9db752fa343ba20e0176ca8fcb4ebdc
Proposed branch: ~sylvain-pineau/checkbox-ng:c3url_envar
Merge into: checkbox-ng:master
Diff against target: 27 lines (+5/-0)
2 files modified
checkbox_ng/launcher/stages.py (+3/-0)
checkbox_ng/launcher/subcommands.py (+2/-0)
Reviewer Review Type Date Requested Status
Sheila Miguez (community) Approve
Review via email: mp+387672@code.launchpad.net

Description of the change

Provide a way to modify the C3 url submission endpoint via this env variable.

To post a comment you must log in.
Revision history for this message
Sheila Miguez (codersquid) wrote :

lgtm

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/checkbox_ng/launcher/stages.py b/checkbox_ng/launcher/stages.py
index 62633b2..380c22b 100644
--- a/checkbox_ng/launcher/stages.py
+++ b/checkbox_ng/launcher/stages.py
@@ -415,6 +415,9 @@ class ReportsStage(CheckboxUiStage):
415 if self.sa.config.transports[transport].get('staging', False):415 if self.sa.config.transports[transport].get('staging', False):
416 url = ('https://certification.staging.canonical.com/'416 url = ('https://certification.staging.canonical.com/'
417 'api/v1/submission/{}/'.format(secure_id))417 'api/v1/submission/{}/'.format(secure_id))
418 elif os.getenv('C3_URL'):
419 url = (
420 '{}/{}/'.format(os.getenv('C3_URL'), ctx.args.secure_id))
418 else:421 else:
419 url = ('https://certification.canonical.com/'422 url = ('https://certification.canonical.com/'
420 'api/v1/submission/{}/'.format(secure_id))423 'api/v1/submission/{}/'.format(secure_id))
diff --git a/checkbox_ng/launcher/subcommands.py b/checkbox_ng/launcher/subcommands.py
index 0432cdb..8c61c5d 100644
--- a/checkbox_ng/launcher/subcommands.py
+++ b/checkbox_ng/launcher/subcommands.py
@@ -105,6 +105,8 @@ class Submit():
105 if ctx.args.staging:105 if ctx.args.staging:
106 url = ('https://certification.staging.canonical.com/'106 url = ('https://certification.staging.canonical.com/'
107 'api/v1/submission/{}/'.format(ctx.args.secure_id))107 'api/v1/submission/{}/'.format(ctx.args.secure_id))
108 elif os.getenv('C3_URL'):
109 url = ('{}/{}/'.format(os.getenv('C3_URL'), ctx.args.secure_id))
108 from checkbox_ng.certification import SubmissionServiceTransport110 from checkbox_ng.certification import SubmissionServiceTransport
109 transport_cls = SubmissionServiceTransport111 transport_cls = SubmissionServiceTransport
110 transport = transport_cls(url, options_string)112 transport = transport_cls(url, options_string)

Subscribers

People subscribed via source and target branches