| === tds8 is now known as tds | ||
| rharper | blackboxsw: Sounds good, I'll +1 the branch | 01:59 |
|---|---|---|
| rharper | blackboxsw: it looks like there's a package build failure related to pytest not in the build-reqs ... | 02:01 |
| rharper | do we need to sort that out ? | 02:01 |
| blackboxsw | rharper: we do unfortunately | 02:33 |
| blackboxsw | I'm trying to work that now | 02:33 |
| Goneri | rharper, I just tested on the 3 BSD, if two interfaces use DHCP, the system uses the default route of the first NIC. | 02:37 |
| blackboxsw | rharper: yeah I think we also need to cherry-pick the tox pytest deps changes | 02:41 |
| blackboxsw | cherry-pick 986f37b01 | 02:42 |
| blackboxsw | redoing that branch now to test | 02:42 |
| blackboxsw | rharper: finally repushed PR 303. and added new manual steps to the PR description. basically I cherry-pick the already released 6600c642, then the tox pytest 986f37b01, then the rest of the picks | 02:52 |
| blackboxsw | hrm I think the build fails again the issue is that sbuild "Install cloud-init build dependencies (apt-based resolver)" gets dependencies direct from test-requirements.txt before the cpick is applied to drop nose and add pytest. So, it's not present in the sbuild image. | 03:08 |
| blackboxsw | even though the end result has a proper test-requirements.txt file once patches are applied | 03:09 |
| blackboxsw | bummer, may have to fix this tomorrow. | 03:09 |
| === tds1 is now known as tds | ||
| === tds4 is now known as tds | ||
| === hjensas|afk is now known as hjensas | ||
| rharper | blackboxsw: I think the github CI build is just a package/bddeb; so I doesn't have any patches applied, so I think it's a funny state; | 14:44 |
| === hjensas is now known as hjensas|afk | ||
| === hggdh is now known as hggdh_ | ||
| === hggdh_ is now known as hggdh__ | ||
| === hggdh__ is now known as hggdh-msft | ||
| === eggbean is now known as paradroid | ||
| === paradroid is now known as delta2 | ||
| === delta2 is now known as eggbean | ||
| === eggbean is now known as paradroid_ | ||
| rharper | blackboxsw: https://github.com/canonical/cloud-init/pull/306 is up | 16:57 |
| blackboxsw | ahh that makes sense rharper | 17:14 |
| blackboxsw | maybe we can change that too in a separate pr against cloud-init | 17:14 |
| blackboxsw | looking over 306 | 17:14 |
| PodioSpaz | When using cloud-init multi-part MIME with multipass, I receive "error loading cloud-init config: yaml-cpp: error at line 5, column 13: illegal map value". | 17:15 |
| PodioSpaz | 1 Content-Type: multipart/mixed; boundary="===============8832723955843212272=="2 MIME-Version: 1.03 4 --===============8832723955843212272==5 Content-Type: text/cloud-config; charset="utf-8"6 MIME-Version: 1.07 Content-Transfer-Encoding: base64 | 17:17 |
| Saviq | hi PodioSpaz, we only currently support plain user data in the --cloud-init argument | 17:23 |
| Saviq | there's a handful of feature requests for more complex scenarios on our github | 17:25 |
| Saviq | https://github.com/canonical/multipass/issues/557 | 17:25 |
| Saviq | https://github.com/canonical/multipass/issues/1295 | 17:25 |
| Saviq | https://github.com/canonical/multipass/issues/1040 | 17:26 |
| Saviq | https://github.com/canonical/multipass/issues?q=is%3Aissue+is%3Aopen+cloud-init | 17:26 |
| Saviq | please file one for multi-part if none of those fits your use case | 17:26 |
| PodioSpaz | Thanks | 17:27 |
| blackboxsw | rharper: approved 306, needs a rebase against master | 17:30 |
| blackboxsw | and can land | 17:30 |
| blackboxsw | rharper: I'll rebase and push. | 17:30 |
| rharper | blackboxsw: thanks! | 17:34 |
| blackboxsw | ci running on it. will merge it when I see that green | 17:35 |
| blackboxsw | almost have new manual steps for you on release (it'll take into account your PR which we will land momentarily | 17:35 |
| rharper | OK | 17:36 |
| blackboxsw | rharper: just landed https://github.com/canonical/cloud-init/pull/306 | 17:58 |
| blackboxsw | I'll get you the steps for focal release | 17:58 |
| blackboxsw | okay rharper new manual steps and push for focal release to include your 306 https://github.com/canonical/cloud-init/pull/303 | 18:11 |
| rharper | blackboxsw: ok, running them now | 19:06 |
| blackboxsw | rharper: might want to refresh the pull request UI I updated the description | 19:06 |
| rharper | yes | 19:06 |
| rharper | thx | 19:06 |
| blackboxsw | building package now to test | 19:06 |
| blackboxsw | I had missed a couple things in adding my additional quilt patch | 19:06 |
| rharper | what's the ./picks.sh ?? is that our wrapper you're working on ? | 19:10 |
| blackboxsw | rharper: that is just a script to automate the first half of the manual operations to avoid having to cut and paste each step | 19:11 |
| blackboxsw | so you should be able to run that directly as is.... and manually continue with = cd cloud-init and beyond | 19:11 |
| rharper | hrm | 19:11 |
| blackboxsw | cd /tmp; bash ./picks.sh | 19:11 |
| rharper | why do I need it? I've created all of the cpicks; then I push them on | 19:11 |
| rharper | fix up the unittest | 19:12 |
| rharper | etc. | 19:12 |
| rharper | I don't see why I need it? (or is it automating all of the cpick work I did following your steps?) | 19:12 |
| rharper | sorry, I see it now | 19:12 |
| blackboxsw | if you've already created the cpicks. then you only need additionally to: | 19:12 |
| blackboxsw | cherry-pick 09fea85fd1f6fd944f4cdd8b97e283090178ae88 # your PR 306 | 19:12 |
| blackboxsw | and the quilt push -a .... .steps below | 19:13 |
| rharper | gotcha | 19:13 |
| blackboxsw | the problem you have with your branch is that you've already updated and commited for release in debian/changelog. so you might was to get reset HEAD~1 to back off of that | 19:13 |
| rharper | You forgot an EOF | 19:13 |
| rharper | that's why | 19:13 |
| blackboxsw | ahh bad paste. | 19:13 |
| rharper | I reset to upstream/ubuntu/devel first | 19:13 |
| rharper | so I was replaying all of the picks from the beginning but I didn't notice it was a heredoc ... | 19:14 |
| rharper | no worries. I'm on it now | 19:14 |
| rharper | did you delete the trailing whitespace after removing the unittest ? | 19:14 |
| rharper | oh there's the EOF ... hehe | 19:14 |
| blackboxsw | rharper: my EOF is middle of that description as I kicked it out during the quilt header as I figured there'd be some other wrangling | 19:14 |
| rharper | picks calls itself =) | 19:14 |
| blackboxsw | rharper: picks doesn't call itself the EOF was above that just before calling bash ./picks.sh | 19:16 |
| blackboxsw | I'll update the description and include the entire script within the picks.sh | 19:16 |
| rharper | your last git commit -am pulls in local cruft, lemme try again | 19:18 |
| rharper | blackboxsw: I'm pretty close; the only delta I have is in the last quilt patch (how you describe editing the unittest file) | 19:29 |
| rharper | https://paste.ubuntu.com/p/PDmfQ2HQwv/ | 19:30 |
| rharper | blackboxsw: ^ | 19:30 |
| blackboxsw | rharper: I just finally pushed again | 19:30 |
| blackboxsw | and updated description | 19:30 |
| rharper | ok, let me replay pick.sh | 19:30 |
| rharper | it does speed things up =) | 19:31 |
| blackboxsw | rharper: man , lintian is still comiing up with an error on the branch :/ | 19:31 |
| blackboxsw | E: cloud-init changes: inconsistent-maintainer Chad Smith <chad.smith@canonical.com> (changes vs. source) Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> | 19:31 |
| blackboxsw | E: cloud-init: mismatch-translated-choices cloud-init/datasources choices-c | 19:31 |
| rharper | eww | 19:31 |
| blackboxsw | I'll try applying that Author instead of me | 19:31 |
| blackboxsw | when editing the header | 19:32 |
| rharper | oh, I bet you missed a file | 19:34 |
| rharper | the datasources choices breaks when the distro values aren't matching | 19:34 |
| rharper | we pulled out netbsd/openbsd from the unittst | 19:34 |
| rharper | but where else are they ? | 19:34 |
| rharper | oh, datasource isn't distro, but when we add/remove a datasource; isn't there some manual release branch updates ? | 19:35 |
| rharper | blackboxsw: ok, diff looks good, once you sort out the lintian failure | 19:36 |
| rharper | testing out my source package build right now | 19:38 |
| blackboxsw | great rharper, I'm rebuilding now with Author: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> in the dep3 header | 19:41 |
| blackboxsw | to check | 19:41 |
| rharper | that's what I've got in mine now after your update | 19:42 |
| blackboxsw | rharper: looks like this https://bugs.launchpad.net/ubuntu/+source/lintian/+bug/1862787 | 19:43 |
| ubot5 | Ubuntu bug 1862787 in lintian (Ubuntu) "inconsistent-maintainer error not applicable to Ubuntu" [Undecided,Fix released] | 19:43 |
| rharper | ah, yes | 19:44 |
| blackboxsw | hrm, what does this 'mean'. does it mean our focal images in sbuild don't yet have that released version of lintian? | 19:45 |
| blackboxsw | I'll ask in ubuntu-devel | 19:47 |
| rharper | not sure | 19:51 |
| rharper | Lintian: fail | 19:51 |
| rharper | Status: successful | 19:51 |
| rharper | Version: 20.1-10-g71af48df-0ubuntu13 | 19:51 |
| rharper | 19:51 | |
| rharper | the package builds just fine | 19:52 |
| rharper | lintial errors are non-fatal to package builds | 19:52 |
| rharper | I know I recently asked about this when I was testing out probert packaging changes | 19:52 |
| rharper | blackboxsw: so, I can reproduce your branch, git diff is OK, and sbuild is OK from my perspective; | 19:52 |
| rharper | is your build-and-push sbuild completing with Success ? | 19:53 |
| blackboxsw | ahh right. ok cool. I was worried this'd break things | 19:53 |
| rharper | me too | 19:53 |
| blackboxsw | rharper: ok. then I think we are good | 19:53 |
| blackboxsw | I will build-and-push | 19:54 |
| rharper | one sec | 19:54 |
| blackboxsw | I have commented those operations out | 19:54 |
| rharper | are you going to leave the author as you or ubuntu ? | 19:54 |
| blackboxsw | ok holding. (and reperforming changes to track Author: chad.smith@c.com | 19:54 |
| rharper | I'd like to get a clean diff against your branch and I'll comment with that | 19:54 |
| rharper | ok | 19:54 |
| rharper | I'll replay and diff | 19:54 |
| blackboxsw | yeah that was unrelated change that didn't fix anything | 19:54 |
| blackboxsw | same | 19:54 |
| blackboxsw | the issue was related the the generate *dsc file I think not the dep3 header on the patch | 19:55 |
| blackboxsw | sooo many cherry-picks | 19:55 |
| blackboxsw | rharper: force pushed and updated PR description | 19:59 |
| blackboxsw | building oone more time | 19:59 |
| blackboxsw | rharper: +1 successful build. with latest changes. | 20:03 |
| blackboxsw | I won't build-and-push until you compare diffs against what I've pushed | 20:03 |
| rharper | blackboxsw: same here, I'm approving ; but you push from cli, not from gui. Do we mark approved or something else in the UI ? | 20:04 |
| blackboxsw | rharper: yep we push releases from cli, not github | 20:04 |
| rharper | is marking approve OK? it won't autoland | 20:04 |
| blackboxsw | to perform dput, tag and push to origin/ubuntu/devel | 20:04 |
| blackboxsw | correct, no auto-land in github | 20:05 |
| blackboxsw | ... YET. muhahhaa | 20:05 |
| rharper | heh, also CI will fail due to the no-patch-bddeb | 20:05 |
| rharper | so that'll block merging via UI | 20:05 |
| rharper | ok, I've Approved it | 20:05 |
| rharper | thanks for working on this | 20:05 |
| blackboxsw | schweet. rharper thanks for the counsel here. also, I'm thinking I'll put up a tiny separate PR against ubuntu/devel now to add the debian/cloud-init-cherry-picks so we can use the uss-tableflip 'cherry-pick --pop-all' to fix daily builds | 20:07 |
| rharper | nice | 20:08 |
| blackboxsw | merged thx rharper https://github.com/canonical/cloud-init/pull/303 | 20:16 |
| blackboxsw | powersj: rharper [ubuntu/focal-proposed] cloud-init 20.1-10-g71af48df-0ubuntu3 (Waiting for approval) | 20:18 |
| rharper | \o/ | 20:23 |
| powersj | sweet | 20:23 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!