Merge ~falcojr/curtin:update-manager-in-docs into curtin:master

Proposed by James Falcon
Status: Merged
Approved by: Paride Legovini
Approved revision: ae20073ecc964eb08e96ac625b441065d4ae56ad
Merge reported by: Server Team CI bot
Merged at revision: not available
Proposed branch: ~falcojr/curtin:update-manager-in-docs
Merge into: curtin:master
Diff against target: 17 lines (+2/-2)
1 file modified
HACKING.rst (+2/-2)
Reviewer Review Type Date Requested Status
Server Team CI bot continuous-integration Approve
Chad Smith Approve
Ryan Harper (community) Needs Fixing
Review via email: mp+383601@code.launchpad.net

Commit message

Replace references to old team manager with new team manager

Description of the change

Replace references to old team manager with new team manager

To post a comment you must log in.
Revision history for this message
Ryan Harper (raharper) wrote :

Thanks for the Merge Proposal (MP). I failed to bring up how we land changes, so this is my fault.

1) Please move your Description into the 'Set Commit Message' box; the autolander here won't use the description and complains when it's set at landing time.

2) The format for the commit message is:

oneliner

Longer description here with details on what
changed. Including addition changes in the merge

 - I also updated the .gitignore file

LP: #NNNNNNN if this was fixing a bug

review: Needs Fixing
Revision history for this message
James Falcon (falcojr) wrote :

What is the purpose of the "Set Commit Message" box? Is it the text for a merge commit? If my other commits live on their own, what text would we want for an additional commit? I don't want them squashed.

As far as commit format, I saw that, but there's no LP, and no additional explanation needed for these commits, right? I would normally add more info, but these don't need any more explanation than the one-liners they are, correct?

Revision history for this message
Ryan Harper (raharper) wrote :

We do squash merge commits (for historic reasons that have to do with bazaar; which did squash merges, but kept the original commit history "hidden"). So the box is what's going into the commit history for this item.

w.r.t the format, yeah, no LP and single line commit is ok, just needs to be under 76 chars

Revision history for this message
Chad Smith (chad.smith) wrote :

James, thanks for the patch/fix. I think if you can drop your commit 5a0c88c and propose that as a separate branch with an explanation of the intent there, it'd be easier to digest since we try to avoid placing unrelated changes into a squashed commit.

review: Needs Fixing
Revision history for this message
James Falcon (falcojr) wrote :

Sure. Makes sense. Didn't really all branches got squashed when I pushed this.

Revision history for this message
Chad Smith (chad.smith) wrote :

Thanks for that James! LGTM!

review: Approve
Revision history for this message
Server Team CI bot (server-team-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Server Team CI bot (server-team-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Server Team CI bot (server-team-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Server Team CI bot (server-team-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Server Team CI bot (server-team-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Server Team CI bot (server-team-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Server Team CI bot (server-team-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Server Team CI bot (server-team-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Server Team CI bot (server-team-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Server Team CI bot (server-team-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Server Team CI bot (server-team-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Server Team CI bot (server-team-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Server Team CI bot (server-team-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Ryan Harper (raharper) wrote :

py3-flake8 runtests: commands[0] | /jenkins/servers/server/workspace/curtin-autoland-test/nodes/metal-amd64/curtin/.tox/py3-flake8/bin/python -m flake8 curtin tests/
curtin/block/bcache.py:322:31: E741 ambiguous variable name 'l'
curtin/block/bcache.py:323:30: E741 ambiguous variable name 'l'
curtin/block/lvm.py:26:40: E741 ambiguous variable name 'l'
curtin/block/__init__.py:1319:17: E741 ambiguous variable name 'l'
tests/unittests/test_block_dasd.py:20:21: E741 ambiguous variable name 'l'
tests/unittests/test_apt_source.py:961:26: E741 ambiguous variable name 'l'
tests/vmtests/test_fs_battery.py:168:27: E741 ambiguous variable name 'l'
tests/vmtests/test_network.py:111:28: E741 ambiguous variable name 'l'

is what autoland is showing.

@Chad we need to manually queue James's branch in CI, or add him to the correct lp group to have automatic CI.

I cannot reproduce the tox failure locally so something is different for autolander tox =(

Revision history for this message
Paride Legovini (paride) wrote :

The autoland job just runs a plain 'tox' on the source tree [1], and I can reproduce that problem locally on my Groovy system.

It's annoying when the autolander job runs in this kind of loop. One easy way to prevent it would be to have the autolander job to set the MP back to "Needs review" on failure. What do you think?

It would be nice to have it set the MP back to "Needs review" after e.g. 3 failures. I was thinking of doing this using the Jenkins "unstable" state, but this is not possible as the status of job is not per-MP.

[1] https://github.com/canonical/server-jenkins-jobs/blob/master/curtin/jobs-ci.yaml#L187

Revision history for this message
Ryan Harper (raharper) wrote :

> The autoland job just runs a plain 'tox' on the source tree [1], and I
> can reproduce that problem locally on my Groovy system.

Looks like tox.ini needs a tip-flake8 so we can reproduce this elsewhere.

>
> It's annoying when the autolander job runs in this kind of loop. One
> easy way to prevent it would be to have the autolander job to set the
> MP back to "Needs review" on failure. What do you think?

+1 on moving back to needs review.

> It would be nice to have it set the MP back to "Needs review" after e.g. 3
> failures. I was thinking of doing this using the Jenkins "unstable" state, but
> this is not possible as the status of job is not per-MP.
>
> [1] https://github.com/canonical/server-jenkins-jobs/blob/master/curtin/jobs-ci.yaml#L187

So can it be done in our jobs or not?

Revision history for this message
Ryan Harper (raharper) wrote :
Revision history for this message
Server Team CI bot (server-team-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Chad Smith (chad.smith) wrote :

I think this should land now that paride's branch is approved (once it merges)
 https://code.launchpad.net/~legovini/curtin/+git/curtin/+merge/383861

Revision history for this message
Server Team CI bot (server-team-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Server Team CI bot (server-team-bot) :
review: Approve (continuous-integration)
Revision history for this message
Server Team CI bot (server-team-bot) wrote :

Autolanding: FAILED
Approved revid is not set in launchpad. This is most likely a launchpad issue and re-approve should fix it. There is also a chance (although a very small one) this is a permission problem of the ps-jenkins bot
https://jenkins.ubuntu.com/server/job/curtin-autoland-test/186/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-autoland-test/nodes=metal-amd64/186/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-autoland-test/nodes=metal-arm64/186/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-autoland-test/nodes=metal-ppc64el/186/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-autoland-test/nodes=metal-s390x/186/

review: Needs Fixing (continuous-integration)
Revision history for this message
Server Team CI bot (server-team-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Server Team CI bot (server-team-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/HACKING.rst b/HACKING.rst
2index 58adf76..f2b618d 100644
3--- a/HACKING.rst
4+++ b/HACKING.rst
5@@ -15,11 +15,11 @@ Do these things once
6 be listed in the `contributor-agreement-canonical`_ group. Unfortunately
7 there is no easy way to check if an organization or company you are doing
8 work for has signed. If you are unsure or have questions, email
9- `Josh Powers <mailto:josh.powers@canonical.com>` or ping powersj in
10+ `Rick Harding <mailto:rick.harding@canonical.com>` or ping rick_h in
11 ``#curtin`` channel via Freenode IRC.
12
13 When prompted for 'Project contact' or 'Canonical Project Manager' enter
14- 'Josh Powers'.
15+ 'Rick Harding'.
16
17 * Configure git with your email and name for commit messages.
18

Subscribers

People subscribed via source and target branches