Jürgen Gmach has proposed merging ~jugmac00/launchpad-buildd:adjust-to-updated-ci-runner-option into launchpad-buildd:master.
Commit message: Adjust to updated CI runner option Requested reviews: Launchpad code reviewers (launchpad-reviewers) For more details, see: https://code.launchpad.net/~jugmac00/launchpad-buildd/+git/launchpad-buildd/+merge/415201 Corresponding MP in lpcraft: https://code.launchpad.net/~jugmac00/lpcraft/+git/lpcraft/+merge/415195 -- Your team Launchpad code reviewers is requested to review the proposed merge of ~jugmac00/launchpad-buildd:adjust-to-updated-ci-runner-option into launchpad-buildd:master.
diff --git a/debian/changelog b/debian/changelog index b178963..b744c2c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +launchpad-buildd (207ubuntu1) UNRELEASED; urgency=medium + + * Adjust updated command line option for the CI runner. + + -- Jürgen Gmach <[email protected]> Mon, 07 Feb 2022 15:17:09 +0000 + launchpad-buildd (207) bionic; urgency=medium * Return results from individual CI jobs. diff --git a/lpbuildd/target/run_ci.py b/lpbuildd/target/run_ci.py index 1fb6b0f..0dac760 100644 --- a/lpbuildd/target/run_ci.py +++ b/lpbuildd/target/run_ci.py @@ -103,7 +103,7 @@ class RunCI(BuilderProxyOperationMixin, Operation): output_path = os.path.join("/build", "output", job_id) self.backend.run(["mkdir", "-p", output_path]) lpcraft_args = [ - "lpcraft", "-v", "run-one", "--output", output_path, + "lpcraft", "-v", "run-one", "--output-directory", output_path, self.args.job_name, str(self.args.job_index), ] tee_args = ["tee", "%s.log" % output_path] diff --git a/lpbuildd/target/tests/test_run_ci.py b/lpbuildd/target/tests/test_run_ci.py index aad9e54..9c6621e 100644 --- a/lpbuildd/target/tests/test_run_ci.py +++ b/lpbuildd/target/tests/test_run_ci.py @@ -313,7 +313,7 @@ class TestRunCI(TestCase): RanCommand(["mkdir", "-p", "/build/output/test:0"]), RanBuildCommand([ "/bin/bash", "-o", "pipefail", "-c", - "lpcraft -v run-one --output /build/output/test:0 test 0 2>&1 " + "lpcraft -v run-one --output-directory /build/output/test:0 test 0 2>&1 " # noqa: E501 "| tee /build/output/test:0.log", ], cwd="/build/tree"), ])) @@ -337,7 +337,7 @@ class TestRunCI(TestCase): RanCommand(["mkdir", "-p", "/build/output/test:0"]), RanBuildCommand([ "/bin/bash", "-o", "pipefail", "-c", - "lpcraft -v run-one --output /build/output/test:0 test 0 2>&1 " + "lpcraft -v run-one --output-directory /build/output/test:0 test 0 2>&1 " # noqa: E501 "| tee /build/output/test:0.log", ], cwd="/build/tree", **env), ]))
_______________________________________________ Mailing list: https://launchpad.net/~launchpad-reviewers Post to : [email protected] Unsubscribe : https://launchpad.net/~launchpad-reviewers More help : https://help.launchpad.net/ListHelp
