launchpad-buildd

Merge ~jugmac00/launchpad-buildd:adjust-to-updated-ci-runner-option into launchpad-buildd:master

  1. Git
  2. lp:~jugmac00/launchpad-buildd
  3. adjust-to-updated-ci-runner-option
  4. Merge into master
Proposed by Jürgen Gmach
Status: Merged
Approved by: Jürgen Gmach
Approved revision: 90f3d3daf3b85e98dc0f96da6737630c37f47ffc
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~jugmac00/launchpad-buildd:adjust-to-updated-ci-runner-option
Merge into: launchpad-buildd:master
Diff against target: 49 lines (+9/-3)
3 files modified
debian/changelog (+6/-0)
lpbuildd/target/run_ci.py (+1/-1)
lpbuildd/target/tests/test_run_ci.py (+2/-2)
Reviewer Review Type Date Requested Status
Colin Watson (community) Approve
Review via email: mp+415201@code.launchpad.net

Commit message

Adjust to updated CI runner option

Description of the change

Corresponding MP in lpcraft:
https://code.launchpad.net/~jugmac00/lpcraft/+git/lpcraft/+merge/415195

To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) wrote :

This mustn't land until the lpcraft change is on the stable channel in the snap store.

review: Approve
Revision history for this message
Jürgen Gmach (jugmac00) wrote :

I just promoted the latest lpcraft snap build (incl. the updated option) to stable.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index b178963..bdca50b 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,9 @@
6+launchpad-buildd (208) UNRELEASED; urgency=medium
7+
8+ * Adjust updated command line option for the CI runner.
9+
10+ -- Jürgen Gmach <juergen.gmach@canonical.com> Mon, 07 Feb 2022 15:17:09 +0000
11+
12 launchpad-buildd (207) bionic; urgency=medium
13
14 * Return results from individual CI jobs.
15diff --git a/lpbuildd/target/run_ci.py b/lpbuildd/target/run_ci.py
16index 1fb6b0f..0dac760 100644
17--- a/lpbuildd/target/run_ci.py
18+++ b/lpbuildd/target/run_ci.py
19@@ -103,7 +103,7 @@ class RunCI(BuilderProxyOperationMixin, Operation):
20 output_path = os.path.join("/build", "output", job_id)
21 self.backend.run(["mkdir", "-p", output_path])
22 lpcraft_args = [
23- "lpcraft", "-v", "run-one", "--output", output_path,
24+ "lpcraft", "-v", "run-one", "--output-directory", output_path,
25 self.args.job_name, str(self.args.job_index),
26 ]
27 tee_args = ["tee", "%s.log" % output_path]
28diff --git a/lpbuildd/target/tests/test_run_ci.py b/lpbuildd/target/tests/test_run_ci.py
29index aad9e54..9c6621e 100644
30--- a/lpbuildd/target/tests/test_run_ci.py
31+++ b/lpbuildd/target/tests/test_run_ci.py
32@@ -313,7 +313,7 @@ class TestRunCI(TestCase):
33 RanCommand(["mkdir", "-p", "/build/output/test:0"]),
34 RanBuildCommand([
35 "/bin/bash", "-o", "pipefail", "-c",
36- "lpcraft -v run-one --output /build/output/test:0 test 0 2>&1 "
37+ "lpcraft -v run-one --output-directory /build/output/test:0 test 0 2>&1 " # noqa: E501
38 "| tee /build/output/test:0.log",
39 ], cwd="/build/tree"),
40 ]))
41@@ -337,7 +337,7 @@ class TestRunCI(TestCase):
42 RanCommand(["mkdir", "-p", "/build/output/test:0"]),
43 RanBuildCommand([
44 "/bin/bash", "-o", "pipefail", "-c",
45- "lpcraft -v run-one --output /build/output/test:0 test 0 2>&1 "
46+ "lpcraft -v run-one --output-directory /build/output/test:0 test 0 2>&1 " # noqa: E501
47 "| tee /build/output/test:0.log",
48 ], cwd="/build/tree", **env),
49 ]))

Subscribers

People subscribed via source and target branches