rosmaita | smcginnis unfortunately, the title of "stable genius" is already taken | 00:02 |
---|---|---|
mriedem | will take a look in a bit | 00:03 |
*** kumarmn has joined #openstack-stable | 00:23 | |
*** kumarmn has quit IRC | 00:29 | |
mriedem | rosmaita: in https://review.openstack.org/#/c/540490/ it says there are 2 changes squashed in here, | 00:52 |
mriedem | but only links to https://review.openstack.org/#/c/537951/ by commit | 00:52 |
mriedem | is "fixtures must be imported absolutely or they aren't monkey patched" the other fix that's squashed in there? and if so, can the git hash it's cherry picked from be added to the commit message? | 00:52 |
mriedem | heh, i said that? https://review.openstack.org/#/c/540490/3/glance/tests/functional/__init__.py | 00:54 |
rosmaita | mriedem yes you did | 01:15 |
rosmaita | the fixture part wasn't cherry picked, because it was already in master from a separate change that wasn't decomposable | 01:16 |
mriedem | but i don't see those same lines of code in the same modules on master | 01:19 |
rosmaita | shoot, and it looks like it's from a patch that wasn't merged? | 01:19 |
rosmaita | jeez | 01:19 |
mriedem | ...yeah... | 01:19 |
rosmaita | i'll have to find it, it | 01:20 |
rosmaita | s sean's patch to add the logging fixture | 01:20 |
rosmaita | mriedem check out line 14: https://review.openstack.org/#/c/523530/5/glance/tests/unit/fixtures.py | 01:22 |
mriedem | rosmaita: i fail to see what that has to do with this change https://review.openstack.org/#/c/540490/3/glance/tests/functional/__init__.py | 01:23 |
rosmaita | well, without that i was getting the "has no attribute monkey_patch" error in stable/pike and stable/ocata | 01:24 |
*** kumarmn has joined #openstack-stable | 01:27 | |
smcginnis | I've seen that elsewhere. I forget what patch I was working on, but I was only seeing a problem without that on older branches. | 01:27 |
rosmaita | i think the fixtures are used differently in master | 01:27 |
smcginnis | Maybe on older fixture package needed it? | 01:28 |
rosmaita | https://github.com/openstack/glance/blob/master/glance/tests/unit/fixtures.py#L15 | 01:28 |
rosmaita | here's sean's commit adding that line: https://github.com/openstack/glance/commit/96334ad9517a6fa4cf675b34ebf5772824856872 | 01:29 |
rosmaita | i didn't want to backport all the other stuff, so that's why i didn't cherry-pick it | 01:29 |
smcginnis | Borrowed (stolen) from Nova. | 01:29 |
mriedem | i'll have to dig a bit after i'm off this call | 01:36 |
rosmaita | sure, thanks | 01:36 |
rosmaita | mriedem i think i figured it out, see my response on https://review.openstack.org/#/c/540490/ before you start digging | 01:51 |
mriedem | replied inline | 01:53 |
mriedem | "In pike, the BaseTestCase doesn't use glance_fixtures, so we need the import here." | 01:53 |
mriedem | would backporting that be non-trivial/risky? | 01:53 |
rosmaita | yes | 01:54 |
mriedem | ok | 01:54 |
rosmaita | i mean, if it wasn't rc week and the gates were lightning fast | 01:54 |
rosmaita | but my stable czar will def object if i try that | 01:54 |
mriedem | ok, just update the commit message with that info, update the change id, and i'll +W | 01:55 |
rosmaita | cool, ty | 01:55 |
rosmaita | mriedem see if you like the new commit message. in the meantime i will update the ocata change to have the same change-id | 01:58 |
mriedem | it's weird, when i click on the change id it only takes me to https://review.openstack.org/#/c/537951/ | 02:00 |
mriedem | but should show me both changes | 02:00 |
rosmaita | you may have clicked too soon | 02:00 |
rosmaita | i just updated the ocata one | 02:00 |
mriedem | https://review.openstack.org/#/q/Ib9f8a52136e25d1cb609d465ca5d859523d9acc6 | 02:01 |
rosmaita | hmm ... that is weird | 02:02 |
*** kumarmn has quit IRC | 02:04 | |
mriedem | clarkb in infra is saying the query might be cached | 02:05 |
smcginnis | Probably better to just have the commit message say something like "Would have been cherry-picked from Ib9f8a52136e25d1cb609d465ca5d859523d9acc6" or something. | 02:05 |
mriedem | so if the changes are submitted far apart that might be why it doesn't show the stable/pike one | 02:06 |
smcginnis | But I really don't think that matters. | 02:06 |
mriedem | +W on the pike one | 02:06 |
rosmaita | ty | 02:07 |
rosmaita | it took a few minutes before those patches showed up on the zuul status page, maybe the indexing is running slow | 02:08 |
mriedem | and ocata | 02:10 |
mriedem | zuul has been wayyyyy backed up today | 02:11 |
mriedem | http://grafana.openstack.org/dashboard/db/zuul-status | 02:11 |
rosmaita | mriedem i'm going to have to push a new commit message to ocata, i forgot to change the commit hash for the cherry pick from pike, which changed when i updated that one | 02:17 |
mriedem | ok push it real quick before i sign off | 02:17 |
mriedem | smcginnis: push it how? | 02:18 |
smcginnis | push it real good | 02:18 |
mriedem | that's right | 02:18 |
mriedem | rosmaita: got it | 02:19 |
rosmaita | salt 'n' peppa | 02:19 |
rosmaita | thanks | 02:19 |
smcginnis | Ooh baby baby | 02:19 |
rosmaita | smcginnis i thought you'd be too young to know that song | 02:19 |
smcginnis | rosmaita: Hah, I'm deceptively old(er). | 02:20 |
mriedem | i'm the youngest here and i know it | 02:22 |
smcginnis | rosmaita: I think he just called you old. | 02:22 |
mriedem | i called you both old | 02:23 |
rosmaita | i'm not sensitive | 02:23 |
mriedem | alright, time for me to get into some elastic waistband pants and prepare for bed time | 02:23 |
mriedem | o/ | 02:23 |
smcginnis | Sounds like a good idea. | 02:23 |
rosmaita | mriedem thanks for the help | 02:23 |
rosmaita | smcginnis don't you ever sleep? you've been online for like 20 hours today | 02:24 |
smcginnis | rosmaita: That's a very good point. I should rectify that situation. | 02:24 |
smcginnis | rosmaita: Leave a note if you need anything else and I'll try to get to it in the morning. | 02:24 |
rosmaita | i think i'm good ... thanks for your help, too | 02:24 |
*** mriedem has quit IRC | 02:24 | |
*** kumarmn has joined #openstack-stable | 02:30 | |
*** kumarmn has quit IRC | 02:45 | |
*** kumarmn has joined #openstack-stable | 02:47 | |
*** kumarmn has quit IRC | 03:07 | |
*** kumarmn has joined #openstack-stable | 03:12 | |
*** kumarmn has quit IRC | 03:24 | |
*** kumarmn has joined #openstack-stable | 03:37 | |
*** udesale has joined #openstack-stable | 03:56 | |
*** kumarmn has quit IRC | 03:57 | |
*** kumarmn has joined #openstack-stable | 03:57 | |
*** kumarmn has quit IRC | 04:04 | |
*** kumarmn has joined #openstack-stable | 04:05 | |
*** kumarmn has quit IRC | 04:09 | |
*** rosmaita has quit IRC | 04:14 | |
*** e0ne has joined #openstack-stable | 06:11 | |
*** e0ne has quit IRC | 06:17 | |
*** e0ne has joined #openstack-stable | 06:48 | |
*** e0ne has quit IRC | 06:54 | |
*** udesale has quit IRC | 07:02 | |
*** udesale has joined #openstack-stable | 07:05 | |
*** udesale has quit IRC | 07:06 | |
*** udesale has joined #openstack-stable | 07:06 | |
*** udesale_ has joined #openstack-stable | 07:48 | |
*** rcernin has quit IRC | 07:48 | |
*** pabelanger has quit IRC | 07:50 | |
*** udesale has quit IRC | 07:51 | |
*** pabelanger has joined #openstack-stable | 08:02 | |
*** tesseract has joined #openstack-stable | 08:24 | |
*** pcaruana has joined #openstack-stable | 08:38 | |
*** jpich has joined #openstack-stable | 08:59 | |
*** kumarmn has joined #openstack-stable | 09:05 | |
*** kumarmn has quit IRC | 09:10 | |
*** e0ne has joined #openstack-stable | 09:26 | |
*** derekh has joined #openstack-stable | 09:44 | |
*** pcaruana has quit IRC | 09:57 | |
*** pcaruana has joined #openstack-stable | 10:13 | |
*** strigazi_ has joined #openstack-stable | 10:16 | |
*** strigazi has quit IRC | 10:19 | |
*** strigazi_ is now known as strigazi | 10:19 | |
*** dtantsur|afk is now known as dtantsur | 10:26 | |
*** gcb has quit IRC | 10:29 | |
*** udesale_ is now known as udesale | 10:41 | |
*** pcaruana has quit IRC | 11:09 | |
*** udesale has quit IRC | 11:30 | |
*** edmondsw has joined #openstack-stable | 12:02 | |
*** pcaruana has joined #openstack-stable | 12:13 | |
*** dave-mcc_ has joined #openstack-stable | 12:15 | |
*** udesale has joined #openstack-stable | 12:58 | |
*** rosmaita has joined #openstack-stable | 13:06 | |
*** kumarmn has joined #openstack-stable | 13:22 | |
*** kumarmn has quit IRC | 13:27 | |
*** eharney has quit IRC | 13:37 | |
*** e0ne has quit IRC | 14:17 | |
*** surya has joined #openstack-stable | 14:18 | |
*** kumarmn has joined #openstack-stable | 14:22 | |
*** eharney has joined #openstack-stable | 14:24 | |
*** surya is now known as dementor | 14:53 | |
*** dementor is now known as surya | 14:53 | |
*** e0ne has joined #openstack-stable | 14:56 | |
*** mriedem has joined #openstack-stable | 15:26 | |
*** pcaruana has quit IRC | 16:03 | |
*** surya has quit IRC | 16:06 | |
*** e0ne has quit IRC | 16:49 | |
*** udesale has quit IRC | 17:13 | |
*** mriedem has quit IRC | 17:14 | |
*** mriedem has joined #openstack-stable | 17:15 | |
*** tesseract has quit IRC | 17:27 | |
*** dtantsur is now known as dtantsur|afk | 17:33 | |
*** jpich has quit IRC | 17:37 | |
*** derekh has quit IRC | 17:59 | |
*** e0ne has joined #openstack-stable | 18:04 | |
*** mriedem has quit IRC | 18:14 | |
*** e0ne has quit IRC | 18:59 | |
*** e0ne has joined #openstack-stable | 19:10 | |
*** mriedem has joined #openstack-stable | 19:35 | |
*** pcaruana has joined #openstack-stable | 19:52 | |
*** jpich has joined #openstack-stable | 20:04 | |
*** pcaruana has quit IRC | 20:07 | |
*** eharney has quit IRC | 20:24 | |
*** kumarmn_ has joined #openstack-stable | 20:37 | |
*** kumarmn has quit IRC | 20:41 | |
*** dave-mcc_ has quit IRC | 20:49 | |
*** dave-mccowan has joined #openstack-stable | 20:50 | |
*** jpich has quit IRC | 21:04 | |
*** eharney has joined #openstack-stable | 21:20 | |
*** e0ne has quit IRC | 21:23 | |
*** e0ne has joined #openstack-stable | 21:27 | |
*** mriedem has quit IRC | 21:53 | |
*** rcernin has joined #openstack-stable | 22:25 | |
*** e0ne has quit IRC | 22:47 | |
*** edmondsw has quit IRC | 23:37 | |
*** kumarmn_ has quit IRC | 23:38 | |
*** kumarmn has joined #openstack-stable | 23:39 | |
*** kumarmn has quit IRC | 23:43 | |
*** dave-mccowan has quit IRC | 23:45 | |
*** dave-mccowan has joined #openstack-stable | 23:46 |
Generated by irclog2html.py 2.15.3 by Marius Gedminas - find it at mg.pov.lt!