Merge ~cjwatson/launchpad-buildd:secret-arg-spelling into launchpad-buildd:master

Proposed by Colin Watson
Status: Merged
Approved by: Jürgen Gmach
Approved revision: 995cfc001e41ea0b41beaea17773314cda8b9253
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~cjwatson/launchpad-buildd:secret-arg-spelling
Merge into: launchpad-buildd:master
Diff against target: 27 lines (+2/-3)
2 files modified
lpbuildd/ci.py (+1/-2)
lpbuildd/tests/test_ci.py (+1/-1)
Reviewer Review Type Date Requested Status
Jürgen Gmach Approve
Review via email: mp+426984@code.launchpad.net

Commit message

lpbuildd.ci: Fix spelling of --secret argument

Description of the change

https://code.launchpad.net/~jugmac00/launchpad-buildd/+git/launchpad-buildd/+merge/426955 changed the spelling of `run-ci`'s `--secrets` argument to `--secret`. Keep `lpbuildd.ci` in sync with this.

To post a comment you must log in.
Revision history for this message
Jürgen Gmach (jugmac00) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/lpbuildd/ci.py b/lpbuildd/ci.py
2index c420b9a..8ffd506 100644
3--- a/lpbuildd/ci.py
4+++ b/lpbuildd/ci.py
5@@ -152,8 +152,7 @@ class CIBuildManager(BuildManagerProxyMixin, DebianBuildManager):
6 ["--plugin-setting", f"{key}={value}"])
7 if self.secrets is not None:
8 for key, value in self.secrets.items():
9- args.extend(
10- ["--secrets", f"{key}={value}"])
11+ args.extend(["--secret", f"{key}={value}"])
12 job_name, job_index = self.current_job
13 self.current_job_id = _make_job_id(job_name, job_index)
14 args.extend([job_name, str(job_index)])
15diff --git a/lpbuildd/tests/test_ci.py b/lpbuildd/tests/test_ci.py
16index 4e17860..ab397e8 100644
17--- a/lpbuildd/tests/test_ci.py
18+++ b/lpbuildd/tests/test_ci.py
19@@ -275,7 +275,7 @@ class TestCIBuildManagerIteration(TestCase):
20 "--environment-variable", "PATH=foo",
21 "--plugin-setting", "miniconda_conda_channel=https://user:pass@canonical.example.com/artifactory/soss-conda-stable-local/", # noqa: E501
22 "--plugin-setting", "foo=bar",
23- "--secrets", "auth=user:pass"
24+ "--secret", "auth=user:pass"
25 ]
26 yield self.expectRunJob("lint", "0", options=expected_job_options)
27 self.buildmanager.backend.add_file(

Subscribers

People subscribed via source and target branches