launchpad-reviewers team mailing list archive

[Colin Watson <mp+426984@xxxxxxxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/launchpad-buildd:secret-arg-spelling into launchpad-buildd:master.

Commit message:
lpbuildd.ci: Fix spelling of --secret argument

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad-buildd/+git/launchpad-buildd/+merge/426984

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.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad-buildd:secret-arg-spelling into launchpad-buildd:master.

diff --git a/lpbuildd/ci.py b/lpbuildd/ci.py
index c420b9a..8ffd506 100644
--- a/lpbuildd/ci.py
+++ b/lpbuildd/ci.py
@@ -152,8 +152,7 @@ class CIBuildManager(BuildManagerProxyMixin, DebianBuildManager):
                     ["--plugin-setting", f"{key}={value}"])
         if self.secrets is not None:
             for key, value in self.secrets.items():
-                args.extend(
-                    ["--secrets", f"{key}={value}"])
+                args.extend(["--secret", f"{key}={value}"])
         job_name, job_index = self.current_job
         self.current_job_id = _make_job_id(job_name, job_index)
         args.extend([job_name, str(job_index)])
diff --git a/lpbuildd/tests/test_ci.py b/lpbuildd/tests/test_ci.py
index 4e17860..ab397e8 100644
--- a/lpbuildd/tests/test_ci.py
+++ b/lpbuildd/tests/test_ci.py
@@ -275,7 +275,7 @@ class TestCIBuildManagerIteration(TestCase):
             "--environment-variable", "PATH=foo",
             "--plugin-setting", "miniconda_conda_channel=https://user:pass@xxxxxxxxxxxxxxxxxxxxx/artifactory/soss-conda-stable-local/";,  # noqa: E501
             "--plugin-setting", "foo=bar",
-            "--secrets", "auth=user:pass"
+            "--secret", "auth=user:pass"
             ]
         yield self.expectRunJob("lint", "0", options=expected_job_options)
         self.buildmanager.backend.add_file(