| smoser | blackboxsw: still there? | 00:03 |
|---|---|---|
| smoser | i just uploaded. | 00:04 |
| smoser | only difference from yours is the order of the cherry picks (and teh quilt/git diffs mentioen dpreviouisly) | 00:05 |
| smoser | http://paste.ubuntu.com/p/8cMxzs2yjK/ <-- blackboxsw that is what i think we need to debian/cherry-pick | 01:04 |
| smoser | and i think we should probably move that out of debian/ and next to new-upstream-snapshot | 01:04 |
| blackboxsw | smoser: back from kiddo bedtime routine. | 01:12 |
| blackboxsw | smoser: yeah let's move it out into qa-scripts instead of trying to fixup each series | 01:13 |
| smoser | i'm here for abit. | 01:13 |
| blackboxsw | I'll repost then | 01:14 |
| blackboxsw | with 8 char comitish | 01:14 |
| blackboxsw | or smoser looks like you merged it, or your version of it into ubuntu/xenial | 01:16 |
| blackboxsw | so we need SRU templates on those two bugs right for the xenial update | 01:17 |
| smoser | ah. yeah, i did merge and uploaded. | 01:17 |
| smoser | so yeah.. we do need sru templates. | 01:17 |
| blackboxsw | ok I'll add them | 01:18 |
| smoser | yeah, i just skipped the round trip with you | 01:20 |
| blackboxsw | yeah, since I hadn't yet fixed my env up. | 01:24 |
| blackboxsw | sorry for that | 01:24 |
| blackboxsw | *wasted time | 01:24 |
| === r-daneel_ is now known as r-daneel | ||
| === shardy_afk is now known as shardy | ||
| === gin is now known as ginsul_ | ||
| smoser | blackboxsw: you did not write/start any sru templates did you ? for | 14:48 |
| smoser | bug 1766401 | 14:48 |
| ubot5 | bug 1766401 in cloud-init (Ubuntu Xenial) "full config file wiped after apt-upgrade issued" [High,In progress] https://launchpad.net/bugs/1766401 | 14:48 |
| smoser | or | 14:48 |
| smoser | bug 1767166 | 14:48 |
| ubot5 | bug 1767166 in cloud-init (Ubuntu Xenial) "IBMCloud datasource does not recognize provisioning in debug mode." [Medium,In progress] https://launchpad.net/bugs/1767166 | 14:48 |
| smoser | just wondering. i will start them, but didn't want to duplicate work. | 14:49 |
| smoser | ah. i see you did. good work. | 14:50 |
| blackboxsw | started, but didn't get through many | 15:38 |
| blackboxsw | artful SRU up for review https://code.launchpad.net/~chad.smith/cloud-init/+git/cloud-init/+merge/344901 | 16:20 |
| smoser | blackboxsw: the quitl refresh didn't seem to stick | 16:21 |
| smoser | stick/take | 16:21 |
| smoser | i wanted a/<path> and b/<path> in the patches/ | 16:21 |
| smoser | not cloud-inti.orig/ and cloud-init/ | 16:21 |
| smoser | i expected QUILT_REFRESH_PASTCH_ARGS to do that | 16:22 |
| * blackboxsw checks the patch to make sure I applied it . this was from running the script I hoisted over into qa-scripts (with the patch I think, because commitish is now 8 chars). I'll try peeking at quilt args on my env to see | 16:23 | |
| smoser | er.. QUILT_REFRESH_ARGS= | 16:23 |
| smoser | i spelled it correctly in the patch i think | 16:24 |
| blackboxsw | seems to match the man page | 16:25 |
| blackboxsw | trying on the cli | 16:25 |
| smoser | well... QUILT_REFRESH_ARGS | 16:25 |
| smoser | is not actually documented in man page itself | 16:25 |
| smoser | only by reference | 16:25 |
| blackboxsw | ahh right, and the man page seems to state adding those params to both QUILT_REFRESH_ARGS. and QUILT_DIFF_ARGS | 16:26 |
| blackboxsw | I'll re-run with both exported to see if if behaves differently | 16:27 |
| blackboxsw | nope, no change here with both exports | 16:29 |
| smoser | you have a ~/.quiltrc ? | 16:29 |
| blackboxsw | ENOEXIST | 16:29 |
| smoser | can you try this: | 16:32 |
| smoser | https://hastebin.com/raw/uxunixiyad | 16:32 |
| blackboxsw | trying | 16:32 |
| smoser | c-i is finally happy with me at https://code.launchpad.net/~smoser/cloud-init/+git/cloud-init/+merge/344894 | 16:33 |
| blackboxsw | --- a/cloudinit/sources/DataSourceConfigDrive.py | 16:33 |
| blackboxsw | +++ b/cloudinit/sources/DataSourceConfigDrive.py | 16:33 |
| blackboxsw | looks good smoser | 16:33 |
| blackboxsw | will pull that into qa-scripts | 16:34 |
| blackboxsw | smoser: re-pushed artful branch | 16:37 |
| blackboxsw | https://code.launchpad.net/~chad.smith/cloud-init/+git/cloud-init/+merge/344901 is updated and qa-scripts docs are updates for cherry-pick script | 17:00 |
| blackboxsw | grabbing collect-logs branch | 17:00 |
| smoser | blackboxsw: neither here nor there... but other times when i'd copied one of the cherry-picks across, i'd cherry-picked from the first branch | 17:10 |
| smoser | ie, you could have: | 17:10 |
| smoser | cherry-pick 44a44ae18e7ee51322110dc66107d2a58f5ff304 | 17:10 |
| smoser | err.. | 17:11 |
| smoser | git cherry-pick -x 44a44ae18e7ee51322110dc66107d2a58f5ff304 | 17:11 |
| blackboxsw | ahh I see, so I could have pulled the ubuntu/xenial commit into ubuntu/artful too | 17:18 |
| blackboxsw | shall I do that instead and push again | 17:19 |
| smoser | this is fine. i just pushed | 17:20 |
| smoser | the value in git cherry-pick is the '-x' | 17:20 |
| smoser | then the commit message gives a reference to the original | 17:20 |
| smoser | but only realy in text form | 17:20 |
| blackboxsw | smoser: couple comments https://code.launchpad.net/~smoser/cloud-init/+git/cloud-init/+merge/344894 | 17:31 |
| blackboxsw | can you update the description to describe how this fixes (avoids) the traceback in chrooted envs that don't have a /run directory | 17:31 |
| smoser | oh. i didn'teven thikn of that. i was just tyring to run it on my desktop :) | 17:32 |
| blackboxsw | fixes the world without a 2nd thought | 17:34 |
| blackboxsw | I added the bug to your descr, just didn't update the text beyond that | 17:34 |
| smoser | blackboxsw: updated... thanks. updated description and pushed a "drop which" commit. | 17:46 |
| blackboxsw | sorry was just invalidating another collect-logs bug | 18:12 |
| blackboxsw | landed | 18:37 |
| jocha | blackboxsw: raharper: Hey, I just added a new iteration on this merge request: https://code.launchpad.net/~jocha/cloud-init/+git/cloud-init/+merge/344192 :) | 18:37 |
| blackboxsw | ahh blah jocha, on it :) | 18:37 |
| blackboxsw | thanks | 18:37 |
| jocha | no problem! | 18:38 |
| smoser | blackboxsw: https://code.launchpad.net/~smoser/cloud-init/+git/cloud-init/+merge/343846 updated | 18:51 |
| blackboxsw | jocha:thanks for working the unit test isolation stuff in the azure branch. minor unit test update request posted to your branch, if there is a way to tease apart some of those unit tests into separate focused test classes, we won't have to append *args to each test case to ignore unneeded mocks | 19:00 |
| blackboxsw | adding comment now per something like this http://paste.ubuntu.com/p/gXNTdj4rq5/ | 19:00 |
| blackboxsw | I'd like to see us separate a lot of those test cases so we don't have superfluous mocks being setup (and subsequently ignored) by specific unit tests | 19:01 |
| blackboxsw | so if there are some easy cases where your branch can do that excellent. | 19:01 |
| blackboxsw | if it's too much work, you can say that in the branch too. I just dont want to add more tests cases that have to pass and ignore *args if we can avoid it | 19:02 |
| jocha | alright sure, let me take a look into this! | 19:02 |
| === r-daneel_ is now known as r-daneel | ||
| smoser | cosmic | 20:36 |
| smoser | https://launchpad.net/ubuntu/cosmic | 20:36 |
| blackboxsw | sure enough! long live cosmic | 21:17 |
| blackboxsw | minor comment here https://code.launchpad.net/~smoser/cloud-init/+git/cloud-init/+merge/344544 | 21:54 |
| jocha | blackboxsw: I've updated the unit tests: https://code.launchpad.net/~jocha/cloud-init/+git/cloud-init/+merge/344192 :) | 22:19 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!