[00:07:07] hey awight, did you figure anything out about perms on github? it should be public... [00:07:27] I think I just don't know how to use github... [00:07:36] :D [00:14:07] awight: if you'd like me to find a place for this on gerrit that'd be fine [00:14:14] definitely want your input [00:16:56] Fundraising-Backlog, Wikimedia-Fundraising-CiviCRM: Civi error while running module schema upgrade - https://phabricator.wikimedia.org/T116877#1760304 (awight) NEW [00:18:28] cwd: GH is great, no worries! I just haven't had time to figure out how to double-click [00:18:37] Fundraising-Backlog, Wikimedia-Fundraising-CiviCRM: Civi error while running module schema upgrade - https://phabricator.wikimedia.org/T116877#1760319 (Eileenmcnaughton) It needs a civicrm_initialize() call first [00:18:54] Fundraising-Backlog, Wikimedia-Fundraising-CiviCRM: Civi error while running module schema upgrade - https://phabricator.wikimedia.org/T116877#1760320 (Eileenmcnaughton) a:Eileenmcnaughton [00:20:16] awight: word, won't be ready for prime time for awhile anyway [00:20:28] gonna head to the bar and catch game 1 [00:20:30] later! [00:20:33] see ya [00:20:54] Fundraising-Backlog, Wikimedia-Fundraising-CiviCRM: Civi error while running module schema upgrade - https://phabricator.wikimedia.org/T116877#1760323 (awight) thanks! [00:21:56] fundraising-tech-ops: Need a dev_fredge database on the staging server - https://phabricator.wikimedia.org/T116879#1760324 (awight) NEW [00:24:21] Fundraising-Backlog, Wikimedia-Fundraising-CiviCRM: Civi error while running module schema upgrade - https://phabricator.wikimedia.org/T116877#1760332 (awight) More errors: ``` Missing argument 6 for CRM_Core_BAO_Navigation::createOrUpdateReportNavItem(), called in... [00:24:51] Fundraising-Backlog, Wikimedia-Fundraising-CiviCRM: Civi error while running module schema upgrade - https://phabricator.wikimedia.org/T116877#1760333 (awight) Fix for the first issue: ``` --- a/sites/all/modules/wmf_civicrm/wmf_civicrm.install +++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.install @@ -... [00:27:19] (PS1) Eileen: Initialize CiviCRM before calling api functions in upgrade [wikimedia/fundraising/crm] (civi-4.6.9) - https://gerrit.wikimedia.org/r/249333 (https://phabricator.wikimedia.org/T1760323) [00:29:13] (PS1) Awight: Add test message fixtures for the fredge queue [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/249334 [00:29:32] (PS2) Awight: Add test message fixtures for the fredge queue [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/249334 (https://phabricator.wikimedia.org/T114466) [00:31:52] (PS3) Awight: Add test message fixtures for the fredge queue [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/249334 (https://phabricator.wikimedia.org/T114466) [00:32:10] Fundraising Sprint UB40, Fundraising Sprint Vengaboys, Fundraising Tech Backlog, Fundraising-Backlog, and 2 others: Prepare queue messages for testing on upgraded Civi. Test them. - https://phabricator.wikimedia.org/T114466#1760351 (awight) [00:43:59] gtg [02:02:15] (CR) AndyRussG: Large banner limit mixin (1 comment) [extensions/CentralNotice] - https://gerrit.wikimedia.org/r/247460 (https://phabricator.wikimedia.org/T90919) (owner: Ejegg) [05:11:02] Wikimedia-Fundraising-CiviCRM: Slow query on deduping 2 contacts - https://phabricator.wikimedia.org/T116886#1760905 (Eileenmcnaughton) NEW [05:33:14] Wikimedia-Fundraising-CiviCRM: Slow query on deduping 2 contacts - https://phabricator.wikimedia.org/T116886#1760932 (Eileenmcnaughton) Here is the JIRA issue https://issues.civicrm.org/jira/browse/CRM-17454 [06:54:57] Wikimedia-Fundraising-CiviCRM: Slow query on deduping 2 contacts - https://phabricator.wikimedia.org/T116886#1761004 (Eileenmcnaughton) Also this link on the metadata_stat setting https://www.percona.com/blog/2013/12/03/innodb_stats_on_metadata-slow-queries-information_schema/ [10:23:23] (CR) Rosalieper: "Yes i will like to do that. Just give me a list them i will fix :)" [extensions/CentralNotice] - https://gerrit.wikimedia.org/r/248612 (https://phabricator.wikimedia.org/T41266) (owner: Rosalieper) [10:32:51] (CR) Siebrand: [C: 1] "i18n/L10n reviewed." [extensions/CentralNotice] - https://gerrit.wikimedia.org/r/248612 (https://phabricator.wikimedia.org/T41266) (owner: Rosalieper) [10:45:31] (CR) Rosalieper: "Siebrand, meaning the patch can still be accepted?" [extensions/CentralNotice] - https://gerrit.wikimedia.org/r/248612 (https://phabricator.wikimedia.org/T41266) (owner: Rosalieper) [10:46:12] (CR) Rosalieper: "Ejegg, said the "uses" key is not used again in CentralNotice :)" [extensions/CentralNotice] - https://gerrit.wikimedia.org/r/248612 (https://phabricator.wikimedia.org/T41266) (owner: Rosalieper) [10:46:29] (CR) Siebrand: "Meaning that there are no objections from an i18n/L10n perspective. Apparently, there's a functional issue, but I haven't reviewed that pa" [extensions/CentralNotice] - https://gerrit.wikimedia.org/r/248612 (https://phabricator.wikimedia.org/T41266) (owner: Rosalieper) [10:48:30] (CR) Rosalieper: "Ok, if you have time, you can review it, then if the patch can be merged, then do it :)" [extensions/CentralNotice] - https://gerrit.wikimedia.org/r/248612 (https://phabricator.wikimedia.org/T41266) (owner: Rosalieper) [11:12:57] Wikimedia-Fundraising, WMF-Design, Wikimedia-General-or-Unknown, Easy, Mobile: [[wmf:Benefactors]] not displaying well on Mobile - https://phabricator.wikimedia.org/T87805#1761390 (Pcoombe) a:Pcoombe @atgo I'll take a crack at making this mobile-friendly when @CaitVirtue sends me the other up... [12:09:43] (CR) Siebrand: [C: 1] "i18n/L10n reviewed." [extensions/CentralNotice] - https://gerrit.wikimedia.org/r/247460 (https://phabricator.wikimedia.org/T90919) (owner: Ejegg) [15:45:52] (CR) Ejegg: "Nice! Should we add a SmashPig patch to make those message classes refer to things that exist?" [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/249334 (https://phabricator.wikimedia.org/T114466) (owner: Awight) [15:57:55] (CR) Ejegg: "Rosalie, we should not add i18n keys that we are not going to use. Every key that we add to a Wikimedia project makes more work for our v" [extensions/CentralNotice] - https://gerrit.wikimedia.org/r/248612 (https://phabricator.wikimedia.org/T41266) (owner: Rosalieper) [16:33:52] (CR) Ejegg: [C: 2] "That wrapper sounds like a great idea!" [wikimedia/fundraising/crm] (civi-4.6.9) - https://gerrit.wikimedia.org/r/249333 (https://phabricator.wikimedia.org/T1760323) (owner: Eileen) [16:35:56] (PS3) Ejegg: Set search to default to contribution date range [wikimedia/fundraising/crm] (civi-4.6.9) - https://gerrit.wikimedia.org/r/249071 (https://phabricator.wikimedia.org/T116420) (owner: Eileen) [16:36:36] Fundraising Sprint Kraftwerk, Fundraising Sprint Lou Reed, Fundraising Tech Backlog, Fundraising-Backlog, and 3 others: Verify kafkatee use for fundraising logs on erbium - https://phabricator.wikimedia.org/T97676#1762316 (ellery) I have never used data on landing page impressions (I only use ban... [16:42:29] trying to diagnose a bent axle... be back in time for retro! [16:46:29] (PS10) Ejegg: Add banner history log ID processor [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/244109 (https://phabricator.wikimedia.org/T112022) (owner: AndyRussG) [16:48:11] (CR) Ejegg: [C: 2] "Looks good and works as advertised. I notice there's nothing to prevent queuing up duplicate messages on refresh, but I think duplicates " (1 comment) [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/244109 (https://phabricator.wikimedia.org/T112022) (owner: AndyRussG) [16:48:34] (Merged) jenkins-bot: Add banner history log ID processor [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/244109 (https://phabricator.wikimedia.org/T112022) (owner: AndyRussG) [17:01:55] AndyRussG, awight|goofing, cwd - anything for Scrum of Scrums? [17:02:05] ejegg: no, thanks tho! [17:02:17] cool [17:02:26] all good! thanks [17:03:59] ejegg: ah BTW if u have sec, just wanted to clarify "the direct linkage awight moans about - the ContributionTracking extension on payments is using the drupal db" (ur comment from Gerrit) -- [17:04:05] " [17:04:32] AndyRussG: The payments cluster writes directly to the drupal database when it saves contribution tracking [17:04:48] If I understand correctly, then, what I see in vagrant is differnt from what's on production then? [17:05:01] so it's a little misleading to say 'in the paymentswiki db' [17:05:12] awight|goofing, cwd: ...retrospective? [17:05:38] On prod paymentswiki database and drupal DB are one and the same? [17:05:48] cwd - specifically asking for tech's POV on WP integration [17:06:23] be right there! [17:06:46] AndyRussG: nope, paymentswiki has its own normal wiki database, but ContributionTracking makes its own connection to drupal [17:08:32] (CR) Ejegg: "Are banner mixins going away entirely? If so, let's remove the rest of the code." [extensions/CentralNotice] - https://gerrit.wikimedia.org/r/236070 (owner: Awight) [17:09:53] (PS2) Ejegg: Fail gracefully if campaigns were added using the native Civi interface [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/248414 (https://phabricator.wikimedia.org/T116423) (owner: Awight) [17:10:07] (CR) AndyRussG: "There's definitely a use case for them--there are bits of JS (like currency data, for example) currently in banners that should stay there" [extensions/CentralNotice] - https://gerrit.wikimedia.org/r/236070 (owner: Awight) [17:15:03] bassoon! [18:04:38] (CR) Krinkle: [C: 1] Make $wgNoticeCloseButton not load closeWindow19x19.png from upload.wikimedia.org [extensions/CentralNotice] - https://gerrit.wikimedia.org/r/247990 (https://phabricator.wikimedia.org/T72462) (owner: Rosalieper) [18:57:27] Fundraising Sprint UB40, Fundraising Sprint Vengaboys, Fundraising-Backlog, Patch-For-Review: Add "direct mail appeal" column to Trilogy import - https://phabricator.wikimedia.org/T114155#1762841 (XenoRyet) @LeanneS I've been told there's a high priority on getting this data into Civi ASAP. In lie... [19:03:19] (Abandoned) Awight: Disable some unused banner mixin form elements [extensions/CentralNotice] - https://gerrit.wikimedia.org/r/236070 (owner: Awight) [19:11:11] pizzzacat: http://www.thisiscolossal.com/2015/10/shake-cats-carli-davidson/ [19:11:18] Don't miss the slo-mo video [19:12:29] (CR) Ejegg: "merge conflicts on 5 files - want to resubmit without those before the rest of 'em develop conflicts?" [extensions/CentralNotice] - https://gerrit.wikimedia.org/r/235759 (https://phabricator.wikimedia.org/T111387) (owner: AndyRussG) [19:12:48] Fundraising Sprint UB40, Fundraising Sprint Vengaboys, Fundraising-Backlog, Patch-For-Review: Add "direct mail appeal" column to Trilogy import - https://phabricator.wikimedia.org/T114155#1762942 (LeanneS) @XenoRyet thanks, I just imported a couple donations with 2015 SF and it reflected the correc... [19:28:00] Fundraising-Backlog: Amazon donation error after logging in; possible iframe error - https://phabricator.wikimedia.org/T116956#1763054 (MBeat33) NEW [19:37:28] (CR) Ejegg: [C: 2] "Makes things less explody. I like less explody!" [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/248414 (https://phabricator.wikimedia.org/T116423) (owner: Awight) [19:46:39] morning! [19:54:01] awight|fud: are you ready to push the button on civi? How are things going? [19:54:47] Fundraising Sprint UB40, Fundraising Sprint Vengaboys, Fundraising-Backlog, Patch-For-Review: Add "direct mail appeal" column to Trilogy import - https://phabricator.wikimedia.org/T114155#1763174 (LeanneS) @XenoRyet all of our current data is now in Civi. If we can continue this method for any new... [19:56:55] Fundraising Sprint UB40, Fundraising Sprint Vengaboys, Fundraising-Backlog, Patch-For-Review: Add "direct mail appeal" column to Trilogy import - https://phabricator.wikimedia.org/T114155#1763184 (XenoRyet) @LeanneS Great. Yes, this workaround will continue to work until I can get a proper fix in... [19:57:27] Fundraising Sprint UB40, Fundraising Sprint Vengaboys, Fundraising-Backlog, Patch-For-Review: Add "direct mail appeal" column to Trilogy import - https://phabricator.wikimedia.org/T114155#1763185 (XenoRyet) p:Unbreak!>Normal [19:57:54] Fundraising Sprint Vengaboys, Fundraising Tech Backlog, Fundraising-Backlog, Wikimedia-Fundraising-CiviCRM, Unplanned-Sprint-Work: Trilogy Import - Gift Data section didn’t populate - https://phabricator.wikimedia.org/T116446#1763186 (XenoRyet) p:Unbreak!>Normal [19:58:41] Fundraising Sprint UB40, Fundraising Sprint Vengaboys, Fundraising-Backlog, Patch-For-Review: Add "direct mail appeal" column to Trilogy import - https://phabricator.wikimedia.org/T114155#1763187 (atgo) Thanks @xenoryet for the workaround! @leannes @caitvirtue - is this a 1-time event or do you pl... [19:58:57] Fundraising Sprint Vengaboys, Fundraising Tech Backlog, Fundraising-Backlog, Wikimedia-Fundraising-CiviCRM, Unplanned-Sprint-Work: Trilogy Import - Gift Data section didn’t populate - https://phabricator.wikimedia.org/T116446#1749715 (XenoRyet) Setting priority to normal. Bug still exists, bu... [20:01:11] dstrine: just settling down [20:01:14] so the republican debates are in boulder tonight, just saw these downtown: [20:01:16] http://i.imgur.com/6b6chiG.jpg [20:01:23] eileen: Hi! [20:01:23] http://i.imgur.com/br0FXgc.jpg [20:01:43] Jeff_Green: Is this a good time to start? [20:01:49] yup [20:02:01] for bystanders: https://wikitech.wikimedia.org/wiki/CiviCRM_upgrade_4.6 [20:02:02] * Jeff_Green finds checklist... [20:02:13] ha that one :-) [20:02:37] cwd: wow [20:02:38] Fundraising Sprint UB40, Fundraising Sprint Vengaboys, Fundraising-Backlog, Patch-For-Review: Add "direct mail appeal" column to Trilogy import - https://phabricator.wikimedia.org/T114155#1763197 (CaitVirtue) We have a contract with Trilogy to use this tool at least once more and up to 4 times more. [20:02:51] awight: Jeff_Green good luck! [20:03:03] thanks [20:03:07] eileen: looks like the civi-4.6.9 branches are caught up with no outstanding stuff [20:03:18] awight: I'm going to stop mysql replication monitoring for the two slave dbs [20:03:20] (PS2) Awight: Revert "CRM-17075 further fix to handling entity reference in search form" [wikimedia/fundraising/crm/civicrm] (civi-4.6.9) - https://gerrit.wikimedia.org/r/249007 (owner: Eileen) [20:03:31] (CR) Awight: [C: 2] Revert "CRM-17075 further fix to handling entity reference in search form" [wikimedia/fundraising/crm/civicrm] (civi-4.6.9) - https://gerrit.wikimedia.org/r/249007 (owner: Eileen) [20:03:33] (now :) [20:03:40] Jeff_Green: cool [20:04:00] on the note of the debates i might try to get out of boulder before prawning [20:04:07] or i fear i may become stuck here [20:04:20] that's a real term isn't it - prawning [20:04:30] Jeff_Green: You mind if we switch configured deployment branch? [20:04:36] awight: I'm just going to check the submodule version [20:04:38] eileen: only here :P [20:05:04] awight: in the deployment tools? [20:05:41] Oh - I just googled prawning… [20:05:55] (Merged) jenkins-bot: Revert "CRM-17075 further fix to handling entity reference in search form" [wikimedia/fundraising/crm/civicrm] (civi-4.6.9) - https://gerrit.wikimedia.org/r/249007 (owner: Eileen) [20:07:17] eileen: oh wow [20:07:22] we might want to change the name of that meeting [20:07:28] :-) [20:08:26] eileen: yes, good call! [20:08:31] I'm sure it needs a bump. [20:08:43] Jeff_Green: yeah, the fr-upgrade-code config [20:09:16] ok what's the new branch/whatever? [20:09:18] I'd rather do it that way than to manipulate the "deployment" branch, cos they don't share a parent and it will be a hard cut-over to roll back [20:09:45] the new branch is on the same repo, wikimedia/fundraising/crm, called "civi-4.6.9" [20:09:47] omg I just googled that too :( [20:10:03] here was me thinking I was just naive & out-of-touch [20:10:17] (PS8) AndyRussG: Add banner_history module to consume BH log id associations [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/246425 (https://phabricator.wikimedia.org/T112022) [20:10:57] (PS1) Eileen: increment CiviCRM submodule version [wikimedia/fundraising/crm] (civi-4.6.9) - https://gerrit.wikimedia.org/r/249492 [20:11:06] awight I think that will be "fundraising/civi-4.6.9" sound right? [20:11:14] haha, dstrine you prude [20:11:16] ah no just "civi-4.6.9" [20:11:39] eileen: it was a weird twist on "sprint planning" and not anything related to other definitions online [20:11:40] awight: "fundraising/REL1_25" to "civi-4.6.9" ? [20:11:53] Jeff_Green: no, this is the wikimedia/fundraising/crm repo [20:12:20] dstrine: yeah that erstwhile dictionary site has been wrong about everything I know street definitions for [20:12:21] dstrine: :-) [20:13:11] cwd: I think K4-713 can come up with some other silly variations that don't have unintentional extra meanings [20:13:12] awight: oh hell, I'm looking at payments :-P [20:13:16] eileen: p.s. that sort of commit is fine to self-merge [20:13:44] awight: ok - will do [20:13:51] ... anything that doesn't actually change code we review [20:14:04] (CR) Eileen: [C: 2] increment CiviCRM submodule version [wikimedia/fundraising/crm] (civi-4.6.9) - https://gerrit.wikimedia.org/r/249492 (owner: Eileen) [20:14:20] awight: should we warn people to stop using civi or do we just send an email when it's totally down? [20:14:37] dstrine: ...! [20:15:05] i always thought sprint checkin should be spring chicken [20:15:14] (Merged) jenkins-bot: increment CiviCRM submodule version [wikimedia/fundraising/crm] (civi-4.6.9) - https://gerrit.wikimedia.org/r/249492 (owner: Eileen) [20:15:23] dstrine: I should have warned people, but instead I'm gonna watch the weblogs and just shut it down. I did send an email, a millisecond ago. [20:15:46] awight: branch change complete [20:15:58] awight: ah cool I just saw the email. thanks [20:16:30] Last access was 3 minutes ago, not 100% certain everyone got the memo, but that's inactive *enuf* [20:16:44] in terms of adding the triggers [20:16:51] I know you did this a couple of times on staging [20:16:57] did you add the triggers at the end? [20:17:02] or not actually add them? [20:17:16] awight: remember we have the option of blocking them at the proxy layer [20:17:25] Can someone without Civi admin access try logging in now? [20:17:31] Jeff_Green: let's do it! [20:17:49] awight: you'll have to tunnel to the site, you ok with that? [20:18:05] Wikimedia Foundation is currently under maintenance. We should be back shortly. Thank you for your patience. [20:18:20] https://etherpad.wikimedia.org/p/Civi_upgrade_4.6__running_notes [20:18:39] Jeff_Green: yeah, lemme try it to see... [20:18:47] holler when you've made the change [20:18:54] cwd: excellent, thx [20:19:59] awight ok if jenkins comes down too? [20:20:07] Jeff_Green: perfect. [20:20:43] !log Disabled fundraising CiviCRM [20:20:49] Logged the message at https://wikitech.wikimedia.org/wiki/Server_Admin_Log, Master [20:21:32] here goes [20:21:41] jenkins? great [20:21:58] both [20:22:09] it's that knob i build last time we had some kerfuffle [20:22:23] jenkins is sedated [20:22:30] whew! [20:22:44] 503 page is up [20:22:59] Jeff_Green: Can you sudo rm -rf sites/default/files/civicrm/templates_c/ [20:23:29] on boron right? [20:23:30] Jeff_Green: Also, lmk how you want to do/confirm a db backup [20:23:35] Jeff_Green: ba [20:23:45] baaaaa. [20:23:54] hehe I was wondering about that after I said it. [20:23:56] <_< [20:23:57] >_> [20:24:04] On the civi server [20:24:36] templates purged [20:24:51] k. this is a good time to go the kernel + reboot [20:24:51] db backup: my plan is to stop replication on db1008 and start a dump there [20:25:01] ok doing [20:25:13] eileen: Would you mind poking through the db and looking for tables we can purge? [20:26:03] Jeff_Green: ^ heads-up, I'm thinking we can carve off some MB of database before the backup [20:26:31] awight: you sure you don't want to back up first? [20:27:00] It actually looks quite clean, I think the cache-clear was thorough [20:27:05] great [20:27:16] eileen: ^ unless anything jumps out at you [20:27:56] I was just scrolling "show table status", [20:28:08] civicrm_prev_next_cache is empty so my worst fears are allayed [20:28:31] awight: I can't look [20:28:38] ooh [20:28:46] You have shell access yet? [20:29:17] here goes barium reboot [20:29:26] k [20:29:35] pow [20:29:40] AndyRussG: Did PS7 address all your concerns on the new mixin? [20:29:46] awight: hmm - I don't know for sure - I might have it & not be clear about how to use it [20:29:54] ejegg: I think so! I'm actually just smoke testing now :) [20:29:59] thanks! [20:30:03] likewise! [20:30:22] hey pizzzacat! [20:30:28] how's everything? [20:32:03] barium is up [20:32:47] yeah, that was fast [20:33:14] Jeff_Green: so you're saying we don't have to wait for the db backup, it's on a replica? [20:33:29] ... and the moon is made of cheese [20:34:01] yeah once I flip the slave mode db1008 won't receive updates [20:34:13] actually I can do fdb2001 also, so we have two backups [20:35:11] that's neat... [20:35:30] are you ready for me to do that? [20:35:35] yep! [20:36:16] * Jeff_Green is trying to think of a quick way to stop replication at a specific point [20:37:59] eileen: I'm gonna deploy the new code, agreed? I'm at "Run the Upgrade script" in our howto [20:38:53] awight: yes…. using the command that won't stop running if your connection times out [20:39:09] (I use nohup but you had something else) [20:39:48] totally--I'll run it inside of "screen", using the command in that howto [20:39:53] ok so the incoming heavy writes to fundraisingdb turns out to suck for this [20:40:12] because there's no easy way to stop replication at the same point on both slaves [20:40:15] eileen: but I was asking, if I should go ahead and deploy the code now. JGreen just changed the deployment config to use our new branch. [20:40:47] awight: sorry when you say go ahead & deploy - do you mean 'is civi-4.6.9' ready [20:40:52] Jeff_Green: I don't understand--you were gonna leave one replica down and the other running, or something? [20:40:55] eileen: yeah [20:40:57] yes [20:41:02] awesome! [20:41:08] I believe so! [20:41:14] awight I'm going to stop 2 of three replicas, and i want them stopped at the same point in replication [20:41:24] that's so fancy [20:41:31] Well, take yr time, we're way ahead of schedule [20:42:00] as in, only two steps remaining on the tech side [20:42:09] ok get ready for minor carnage [20:42:16] Then it's 11 hours of wait [20:42:19] great :) [20:42:27] * awight grabs popcorn [20:42:50] awight: do you enough popcorn for 11 hours?! [20:42:56] ha that was fun [20:42:58] if so, please share [20:43:06] I'm literally warming a wheel of soft cheese [20:43:29] jfyi I did a "flush tables with read lock" on the master, thus freezing incoming chatter long enough for both slaves to catch up and me to stop them both [20:43:47] we're back to normal on the master and db1008 and fdb2001 are replication-stopped [20:43:50] whoa that's nasty [20:44:06] OK [20:46:23] i'm going to try to get back to longmont, back asap [20:46:38] good luck cwd|afk [20:49:36] Fundraising Sprint UB40, Fundraising Sprint Vengaboys, Fundraising-Backlog, Patch-For-Review: Add "direct mail appeal" column to Trilogy import - https://phabricator.wikimedia.org/T114155#1763370 (atgo) Great, thanks @caitvirtue. @xenoryet let's keep it in the sprint to finish as soon as we can, ju... [20:50:13] Fundraising Sprint UB40, Fundraising Sprint Vengaboys, Fundraising-Backlog, Patch-For-Review: Add "direct mail appeal" column to Trilogy import - https://phabricator.wikimedia.org/T114155#1763372 (XenoRyet) @atgo Sounds good. [20:50:35] go team! [20:51:42] awight: in terms of the branches - are you just 'switching across' - rather than merging into master? I didn't do a merge from master (although as long as that is done before we re-enable that's fine) [20:51:55] eileen: I just realized we have to merge master into civi-4.6.9, doing that now [20:52:01] cool [20:52:15] did you type that before or after I hit enter? [20:52:15] Yeah I was planning to switch rather than do the merge back into master and deployment [20:52:23] hehe both [20:52:53] Realized it's tricky to merge back to master, cos civi-4.6.9 is set up like a deployment branch (missing tests, vendor submodule) [20:53:36] huh? [20:53:56] vendor should be in crm/civicrm civi-4.6.9 [20:54:11] not a submodule tho [20:54:29] oh crm repo [20:55:29] yeah--I'm double-checking now, it looks strange. [20:55:44] I guess civi-4.6.9 was actually based on master, when it split at db122c27505531e751c8e8b3f7c2016a9732087a [20:55:54] sounds righ [20:56:13] only 6 files conflict, seems pretty good [20:56:25] I think I did one merge from master along the way [21:06:42] Fundraising Sprint UB40, Fundraising Sprint Vengaboys, Fundraising Tech Backlog, Fundraising-Backlog, and 2 others: Prepare queue messages for testing on upgraded Civi. Test them. - https://phabricator.wikimedia.org/T114466#1763458 (Ejegg) Benchmarking queue consumption on production: 854 donatio... [21:09:17] (PS1) Awight: Merge master into civi-4.6.9 [wikimedia/fundraising/crm] (civi-4.6.9) - https://gerrit.wikimedia.org/r/249558 [21:09:19] eileen: ^ [21:10:14] (CR) jenkins-bot: [V: -1] Merge master into civi-4.6.9 [wikimedia/fundraising/crm] (civi-4.6.9) - https://gerrit.wikimedia.org/r/249558 (owner: Awight) [21:13:05] Jeff_Green: I was wrong about the deployment branch--now we'll need "civi-4.6.9-deployment" [21:13:45] looks like all the conflicts relate to that fail gracefully on campaigns [21:14:26] I saw some other stuff, but that was a lot of it [21:14:32] awight fixing [21:15:21] thanks! [21:15:30] (PS1) Awight: Merge civi-4.6.9 into deployment [wikimedia/fundraising/crm] (civi-4.6.9-deployment) - https://gerrit.wikimedia.org/r/249559 [21:16:14] awight: jenkins failed because there was a function there that I think wasn't before [21:16:16] (CR) jenkins-bot: [V: -1] Merge civi-4.6.9 into deployment [wikimedia/fundraising/crm] (civi-4.6.9-deployment) - https://gerrit.wikimedia.org/r/249559 (owner: Awight) [21:16:30] (PS2) Awight: Merge civi-4.6.9 into deployment [wikimedia/fundraising/crm] (civi-4.6.9-deployment) - https://gerrit.wikimedia.org/r/249559 [21:17:08] (CR) jenkins-bot: [V: -1] Merge civi-4.6.9 into deployment [wikimedia/fundraising/crm] (civi-4.6.9-deployment) - https://gerrit.wikimedia.org/r/249559 (owner: Awight) [21:19:23] (PS1) Awight: Follow crm/composer.lock [wikimedia/fundraising/crm/vendor] (civi-4.6.9-deployment) - https://gerrit.wikimedia.org/r/249561 [21:19:25] (CR) jenkins-bot: [V: -1] Follow crm/composer.lock [wikimedia/fundraising/crm/vendor] (civi-4.6.9-deployment) - https://gerrit.wikimedia.org/r/249561 (owner: Awight) [21:20:52] (PS1) Awight: Follow crm/composer.lock [wikimedia/fundraising/crm/vendor] - https://gerrit.wikimedia.org/r/249562 [21:21:18] (PS2) Awight: Follow crm/composer.lock [wikimedia/fundraising/crm/vendor] (civi-4.6.9-deployment) - https://gerrit.wikimedia.org/r/249561 [21:21:27] (Abandoned) Awight: Follow crm/composer.lock [wikimedia/fundraising/crm/vendor] (civi-4.6.9-deployment) - https://gerrit.wikimedia.org/r/249561 (owner: Awight) [21:22:11] (PS1) Awight: Follow crm/composer.lock [wikimedia/fundraising/crm/vendor] (civi-4.6.9-deployment) - https://gerrit.wikimedia.org/r/249563 [21:22:20] horrible. [21:22:23] ^ that one [21:22:34] okay, looking at the V-1 now [21:23:28] (CR) jenkins-bot: [V: -1] Follow crm/composer.lock [wikimedia/fundraising/crm/vendor] (civi-4.6.9-deployment) - https://gerrit.wikimedia.org/r/249563 (owner: Awight) [21:23:29] awight: I think I can cherry-pick across what we actually want? [21:23:49] Fundraising Sprint Kraftwerk, Fundraising Sprint Lou Reed, Fundraising Tech Backlog, Fundraising-Backlog, and 3 others: Verify kafkatee use for fundraising logs on erbium - https://phabricator.wikimedia.org/T97676#1763543 (MeganHernandez_WMF) We have used landing page impressions in the past and... [21:23:57] eileen: instead of the merge I did? That's fine [21:26:50] eileen: oooh, yeah it's bad. That was caused by the revert of changes on the wrong branch. [21:27:03] awight: I *though* I'd fixed that all up! [21:27:05] :-( [21:27:12] but I think I can get it now [21:27:16] It was, I think, but the merge from master reapplied it. [21:27:32] (Abandoned) Awight: Follow crm/composer.lock [wikimedia/fundraising/crm/vendor] (civi-4.6.9-deployment) - https://gerrit.wikimedia.org/r/249563 (owner: Awight) [21:27:41] (Abandoned) Awight: Merge civi-4.6.9 into deployment [wikimedia/fundraising/crm] (civi-4.6.9-deployment) - https://gerrit.wikimedia.org/r/249559 (owner: Awight) [21:27:51] (Abandoned) Awight: Merge master into civi-4.6.9 [wikimedia/fundraising/crm] (civi-4.6.9) - https://gerrit.wikimedia.org/r/249558 (owner: Awight) [21:28:50] (PS1) Eileen: Use Civi method to cancel recurring via qc [wikimedia/fundraising/crm] (civi-4.6.9) - https://gerrit.wikimedia.org/r/249564 (https://phabricator.wikimedia.org/T110367) [21:30:34] awight: when I do git cherry -v civi-4.6.9 master [21:30:35] I get about 6 patches [21:30:44] eileen: I put my rough thoughts about how we have to do this under "Branch ballet" in the etherpad [21:30:47] k [21:30:58] & only one of the ones we potentially want doesn't show as empty when I cherry-pick it [21:31:11] ah, that's wrong then [21:31:20] which is this one [21:31:21] ejegg: which do you prefer--teeny nitpick comments w/ or without the +2? [21:31:21] https://gerrit.wikimedia.org/r/#/c/249564/ [21:31:25] is your master branch definitely up-to-date? [21:31:31] I usually say origin/master for that reasoin [21:31:33] let me check!! [21:31:47] AndyRussG: if there's anything more to fix, i'd prefer to roll it into this one rather than a follow-on! [21:32:00] ejegg: K cool... Really small stuff... [21:32:20] right - it's not [21:32:30] so, what say I merge empty up to where I have [21:32:36] & then try to merge the rest? [21:32:55] You shouldn't need that first step--or, what does it do? [21:32:56] ejegg: BTW I smoke tested with the impression diet mixin, woorks gooood :) [21:33:05] nice! [21:34:56] Wikimedia-Fundraising-CiviCRM, fundraising-tech-ops: New SSL cert for Rosie Lewis - https://phabricator.wikimedia.org/T115889#1763601 (atgo) [21:35:03] Wikimedia-Fundraising-CiviCRM, fundraising-tech-ops: URGENT: Renee needs an updated SSL cert for CiviCRM - https://phabricator.wikimedia.org/T115873#1763602 (atgo) [21:35:05] eileen: I do think the commit message in https://gerrit.wikimedia.org/r/#/c/249558/1 has the correct list of patches to apply--with the exception of "Revert commits on wrong branch" [21:35:51] Mind if I try again, or do you have confidence in this merge empty idea? [21:37:26] awight: go ahead - try again [21:38:03] maybe I'll skip this too: Revert "4.6 upgrade preparation, replace contribution_type with financial_type" [21:38:16] (PS1) Eileen: Merge branch 'master' into civi-4.6.9 [wikimedia/fundraising/crm] (civi-4.6.9) - https://gerrit.wikimedia.org/r/249566 [21:38:21] yes! [21:38:35] don't we need to end up with 4.6 + tests in master to keep developing? [21:38:47] ejegg: do you know what the "if ( !mw.centralNotice.data.getVars.banner )" conditional was about in this old script https://meta.wikimedia.org/wiki/MediaWiki:FR2014/Resources/ChangeBucket-AtoC-BtoD.js ? [21:38:57] ejegg: yeah [21:39:13] ejegg: please fix the outline in https://etherpad.wikimedia.org/p/Civi_upgrade_4.6__running_notes if you have ideas! [21:39:21] "branch ballet" [21:39:32] AndyRussG: I think that was testing for the 'banner' override param, right? [21:39:52] ejegg: ah mehbie [21:40:06] awight: ah, I see, merging back to master after verifying sounds like a good plan [21:40:41] unraveling that would probably kill us [21:41:47] ejegg: ah right, yeah I forgot that was the old way of getting url params... sorry 8p [21:45:20] awight: I'm tempted to say we should kick off the upgrade script on civi-4.6.9 branch & then unravel this in the 11 hours [21:45:35] eileen: That's a good idea [21:45:46] because we 'know' the civi-4.6.9 branch is good for running the upgrade against [21:45:59] the vendor/ branch needs to exist tho [21:46:07] we can't live-hack the production code [21:46:32] That's a very very good point, that we don't want to hit a glitch in 10 hours. sold. [21:47:13] I had JGreen point us to a new branch anyway, so let's modify the civi-4.6.9 branch with deployment hacks. doing that now. [21:47:14] what about just merging from 4.6.9 to deployment? [21:47:32] There are only 2 commits between master and deploy right now [21:47:33] ejegg: That's a nice way to do it [21:47:46] ejegg: well, one issue is that civi4.6.9 is pretty far behind master [21:48:17] yeah, I think I'll just chop up civi-4.6.9 to create civi-4.6.9-deployment [21:48:41] still only seeing 6 real conflicts [21:49:17] ejegg: well, I just did that merge and got a V-1 -- it turns out that git will merge our two revert commits, so the codebase is actually broken [21:49:35] ah, phooey [21:49:40] We'll have to do a more surgical MFT [21:51:06] (PS1) Awight: Follow crm/composer.lock [wikimedia/fundraising/crm/vendor] (civi-4.6.9-deployment) - https://gerrit.wikimedia.org/r/249572 [21:51:18] AndyRussG: hi [21:51:24] r054l13: hi [21:51:37] AndyRussG: Krinkle has +1 that my patch i worked with ejegg on [21:51:38] :) [21:51:38] (CR) jenkins-bot: [V: -1] Follow crm/composer.lock [wikimedia/fundraising/crm/vendor] (civi-4.6.9-deployment) - https://gerrit.wikimedia.org/r/249572 (owner: Awight) [21:51:47] so whats moving now, can it be merged ? [21:51:54] r054l13: yes, I saw... I'll take a final look as soon as I can [21:52:28] ok, no problem, i will be waiting :) [21:53:18] awight: perhaps what we need to do on master is revert the revert revert reversions [21:53:20] first [21:54:15] hehe [21:54:22] (PS1) Awight: Deploy-ify the civi-4.6.9 branch [wikimedia/fundraising/crm] (civi-4.6.9-deployment) - https://gerrit.wikimedia.org/r/249574 [21:54:31] ok, that one ^ [21:54:36] and https://gerrit.wikimedia.org/r/249572 [21:54:44] err--in the reverse order [21:54:47] (CR) jenkins-bot: [V: -1] Deploy-ify the civi-4.6.9 branch [wikimedia/fundraising/crm] (civi-4.6.9-deployment) - https://gerrit.wikimedia.org/r/249574 (owner: Awight) [21:54:52] d'oh [21:55:30] real errors [21:55:32] how... [21:56:16] aargh, this must be a zuul-cloner thing, we need the civi-4.6.9-deployment branch on all submodules [21:56:34] yep. [21:56:58] awight: that test error shows a civi-version mismatch [21:57:26] The stupid jenkins clone script makes the assumption that all our submodules have the same branch name--otherwise, it checks out master [21:57:41] I'll... just do that and get through the pain [21:58:53] Do you need this thing to comment out trigger creation? https://gerrit.wikimedia.org/r/246714 [21:59:10] (CR) Awight: "recheck" [wikimedia/fundraising/crm] (civi-4.6.9-deployment) - https://gerrit.wikimedia.org/r/249574 (owner: Awight) [21:59:21] ejegg: so how do i know the key that are not used in CentralNotice extension? [21:59:29] I will like to remove all of them :) [21:59:32] awight: I don't understand enough about the deployment process yet :-( but merging civi-4.6.9 into master seems more manageable [21:59:52] ejegg: definitely--is it missing somewhere? [22:00:06] r054l13: that's the tricky part! Mostly you can search for the strings in code, and note the ones that don't turn up anywhere [22:00:29] but there might be places the strings are put together by concatenation [22:00:39] awight: looks like it never got merged to 4.6.9 [22:01:08] trying to test the direct merge locally and getting the trigger error still [22:01:31] (CR) Awight: [C: 2 V: 2] "Overriding--tests were removed from this branch." [wikimedia/fundraising/crm] (civi-4.6.9-deployment) - https://gerrit.wikimedia.org/r/249574 (owner: Awight) [22:01:55] ejegg: try updating submodules [22:02:04] ejegg: I think the trigger can be merged - but doesn't have to be in terms of it affects new installs not existing ones [22:02:09] anyone want to do some sprint planning? [22:02:10] would you might testing the civi-4.6.9-deployment thing I just made? [22:02:21] hence it didn't cause probs for staging upgrade [22:02:24] dstrine: can't, sorry [22:03:48] (CR) AndyRussG: Large banner limit mixin (4 comments) [extensions/CentralNotice] - https://gerrit.wikimedia.org/r/247460 (https://phabricator.wikimedia.org/T90919) (owner: Ejegg) [22:03:57] eileen: huh, it's breaking my upgrade... [22:04:06] ejegg: did you submodule update? [22:04:11] yeah [22:04:16] crm/civirm was behind until a minute ago [22:04:22] (hour ago) [22:04:44] AndyRussG: wanna join us in sprint planning? [22:04:45] ejegg: oooh sorry [22:04:46] ejegg: ohhh [22:05:03] It's not merged yet, gotcha [22:05:08] thanks for bearing with me ;) [22:05:12] k [22:05:14] (PS3) Awight: Comment out trigger creation [wikimedia/fundraising/crm/civicrm] (civi-4.6.9) - https://gerrit.wikimedia.org/r/246714 (owner: Ejegg) [22:05:28] (CR) Awight: [C: 2] Comment out trigger creation [wikimedia/fundraising/crm/civicrm] (civi-4.6.9) - https://gerrit.wikimedia.org/r/246714 (owner: Ejegg) [22:06:27] (CR) Awight: [V: 2] Comment out trigger creation [wikimedia/fundraising/crm/civicrm] (civi-4.6.9) - https://gerrit.wikimedia.org/r/246714 (owner: Ejegg) [22:08:35] (PS1) Awight: update civicrm submodule [wikimedia/fundraising/crm] (civi-4.6.9-deployment) - https://gerrit.wikimedia.org/r/249582 [22:08:45] (CR) Awight: [C: 2 V: 2] update civicrm submodule [wikimedia/fundraising/crm] (civi-4.6.9-deployment) - https://gerrit.wikimedia.org/r/249582 (owner: Awight) [22:08:58] ejegg: ok, i get the point. I will look at that and submit a patch in some days :) [22:09:13] awesome! [22:10:15] (Abandoned) Awight: Follow crm/composer.lock [wikimedia/fundraising/crm/vendor] - https://gerrit.wikimedia.org/r/249562 (owner: Awight) [22:10:42] (CR) Awight: [C: 2 V: 2] Follow crm/composer.lock [wikimedia/fundraising/crm/vendor] (civi-4.6.9-deployment) - https://gerrit.wikimedia.org/r/249572 (owner: Awight) [22:11:57] !log update fundraising CRM to civi-4.6.9-deployment branch, from f2fa7b942625b34ede520e11f20e7e0835ecb17d to 23d2020448f343c8c1b2f4d779be66f57552f935 [22:12:02] Logged the message at https://wikitech.wikimedia.org/wiki/Server_Admin_Log, Master [22:12:37] eileen: Okay, I'm ready to attempt the schema migration [22:16:23] awight: cool [22:18:21] eileen: it's running! [22:18:40] awight: cool - it is not hard to merge civicrm-4.6.9 back to master [22:19:02] does it work if we do it that way? [22:19:04] great, that sounds easier to me too [22:19:06] totally! [22:19:09] cool [22:19:22] I'm mostly there with that [22:19:35] 3 conflicts left - on refunds import & wmf_campaign [22:28:28] Fundraising Sprint UB40, Fundraising Sprint Vengaboys, Fundraising Tech Backlog, Fundraising-Backlog, and 2 others: [epic] Install 4.6 to staging and test like hell - https://phabricator.wikimedia.org/T99842#1763915 (DStrine) [22:28:29] Fundraising Sprint UB40, Fundraising Sprint Vengaboys, Fundraising-Backlog, Wikimedia-Fundraising-CiviCRM: WMF Civi admins test their normal workflows on the staging server - https://phabricator.wikimedia.org/T114823#1763914 (DStrine) Open>Resolved [22:28:48] Fundraising Sprint Vengaboys, Fundraising-Backlog: Sprint V (10/14 - 10/28) goal: France campaign-ready, prep for Big EN - https://phabricator.wikimedia.org/T112180#1763927 (DStrine) Open>Resolved [22:31:31] !log Fundraising CRM db migration started, estimated completion 10:15 UTC (tomorrow) [22:31:37] Logged the message at https://wikitech.wikimedia.org/wiki/Server_Admin_Log, Master [22:32:10] (PS1) Eileen: Merge branch 'civi-4.6.9' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/249589 [22:32:45] (CR) jenkins-bot: [V: -1] Merge branch 'civi-4.6.9' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/249589 (owner: Eileen) [22:39:38] Fundraising Sprint UB40, Fundraising Sprint Vengaboys, Fundraising-Backlog, Patch-For-Review: Add "direct mail appeal" column to Trilogy import - https://phabricator.wikimedia.org/T114155#1763959 (XenoRyet) Open>Resolved [22:40:46] Fundraising Sprint Vengaboys, Fundraising Tech Backlog, Fundraising-Backlog, Wikimedia-Fundraising-CiviCRM, Unplanned-Sprint-Work: Install Civi 4.6 to production - https://phabricator.wikimedia.org/T99844#1763968 (Ejegg) [22:40:47] Fundraising Sprint Vengaboys, Fundraising Tech Backlog, Fundraising-Backlog, Wikimedia-Fundraising-CiviCRM, Unplanned-Sprint-Work: Pause the queue consumer and build up a big batch, use that batch for benchmarking - https://phabricator.wikimedia.org/T116781#1763965 (Ejegg) Open>Resolved [22:46:29] (PS1) Eileen: Revert "Revert "4.6 upgrade preparation, replace contribution_type with financial_type"" [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/249594 [22:46:56] hehe [22:46:57] (CR) jenkins-bot: [V: -1] Revert "Revert "4.6 upgrade preparation, replace contribution_type with financial_type"" [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/249594 (owner: Eileen) [22:47:10] desperate measures [22:47:25] revert reversion of revertiness [22:48:25] (PS1) Eileen: Revert "Revert commits on wrong branch" [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/249595 [22:48:48] (CR) jenkins-bot: [V: -1] Revert "Revert commits on wrong branch" [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/249595 (owner: Eileen) [22:49:23] awight: ok - master is now failing on the fact its not getting the right civ version [22:50:11] Fundraising-Backlog: Sprint Z goal (12/9-12/23): - https://phabricator.wikimedia.org/T116996#1764022 (atgo) NEW [22:52:02] (PS1) Eileen: Remove trailing spaces [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/249596 [22:55:05] (CR) jenkins-bot: [V: -1] Remove trailing spaces [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/249596 (owner: Eileen) [22:55:16] (PS1) Eileen: Reintroduce minor change lost in merge [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/249597 [22:55:41] (CR) jenkins-bot: [V: -1] Reintroduce minor change lost in merge [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/249597 (owner: Eileen) [22:55:53] eileen: ah, that's pretty much impossible to fix :( Maybe create a new branch like master-plus-4.6.9 :( [22:56:04] and create that same branch in the crm/civicrm repo [22:56:08] Fundraising Dash, Fundraising-Backlog: Spike: What do we need to do to make the Dash useful for December? - https://phabricator.wikimedia.org/T116998#1764052 (atgo) NEW a:atgo [22:56:18] eileen: want me to create the branches? [22:56:28] Fundraising Dash, Fundraising-Backlog: Spike: What do we need to do to make the Dash useful for December? - https://phabricator.wikimedia.org/T116998#1764064 (atgo) a:atgo>None [22:56:38] I'll set the crm branchpoint at current master [22:57:32] eileen: Okay, did that ^ for both crm and crm/civicrm [22:57:47] workarounds for workarounds... [22:58:12] Fundraising-Backlog: Amazon donation error after logging in; possible iframe error - https://phabricator.wikimedia.org/T116956#1764070 (atgo) p:Triage>Low @mbeat33 let us know if you see more weird things like this [22:58:39] awight: branchpoint? [22:58:39] Fundraising Dash, Fundraising Sprint W, Fundraising-Backlog: Spike: What do we need to do to make the Dash useful for December? - https://phabricator.wikimedia.org/T116998#1764072 (DStrine) [22:58:40] Fundraising Sprint Vengaboys, Fundraising Sprint W, Fundraising-Backlog, Wikimedia-Fundraising-CiviCRM, and 3 others: We are failing to send AstroPay stats to Ganglia - https://phabricator.wikimedia.org/T116817#1764073 (DStrine) [22:58:43] Fundraising Sprint Vengaboys, Fundraising Sprint W, Fundraising-Backlog, Analytics, and 3 others: Impression log parsers should get sample rate from filenames - https://phabricator.wikimedia.org/T116800#1764074 (DStrine) [22:58:45] Fundraising Sprint Vengaboys, Fundraising Sprint W, Fundraising Tech Backlog, Fundraising-Backlog, and 2 others: Pause the queue consumer and build up a big batch, use that batch for benchmarking - https://phabricator.wikimedia.org/T116781#1764075 (DStrine) [22:58:47] Fundraising Sprint Vengaboys, Fundraising Sprint W, Fundraising-Backlog, Wikimedia-Fundraising-CiviCRM: Custom group on specific contribution types not working - https://phabricator.wikimedia.org/T116682#1764076 (DStrine) [22:58:48] for which branch [22:58:49] Fundraising Sprint Vengaboys, Fundraising Sprint W, Fundraising Tech Backlog, Fundraising-Backlog, Wikimedia-Fundraising-CiviCRM: Confirm that ecom script is compatible with Civi 4.6 - https://phabricator.wikimedia.org/T116674#1764077 (DStrine) [22:59:50] NB with the fixes - this is the diff against civi-4.6.9 from my merge to master https://etherpad.wikimedia.org/p/diff [23:00:26] Fundraising-Backlog, Wikimedia-Fundraising-CiviCRM: Civi Prospect Field - Saving Error - https://phabricator.wikimedia.org/T107087#1764158 (atgo) @awight are you saying you think this might be fixed in 4.6? [23:00:52] which is actually even harder to read there than in terminal! [23:00:59] Fundraising Sprint Vengaboys, Fundraising-Backlog, Analytics, Analytics-Cluster, and 2 others: Impression log parsers should get sample rate from filenames - https://phabricator.wikimedia.org/T116800#1764161 (DStrine) [23:01:01] Fundraising Sprint Vengaboys, Fundraising Tech Backlog, Fundraising-Backlog, Wikimedia-Fundraising-CiviCRM, Unplanned-Sprint-Work: Pause the queue consumer and build up a big batch, use that batch for benchmarking - https://phabricator.wikimedia.org/T116781#1764162 (DStrine) [23:01:03] Fundraising Sprint Vengaboys, Fundraising Tech Backlog, Fundraising-Backlog, Wikimedia-Fundraising-CiviCRM: Confirm that ecom script is compatible with Civi 4.6 - https://phabricator.wikimedia.org/T116674#1764163 (DStrine) [23:01:05] Fundraising Sprint Vengaboys, Fundraising-Backlog: CiviCRM upgrade: Simple Lookups: timeout attempting to look up matching gifts given in August - https://phabricator.wikimedia.org/T116313#1764165 (DStrine) [23:01:08] Fundraising Sprint Vengaboys, Fundraising-Backlog, MediaWiki-extensions-DonationInterface, Patch-For-Review, WMF-deploy-2015-10-27_(1.27.0-wmf.4): Adyen rejects merchant signature - https://phabricator.wikimedia.org/T116667#1764164 (DStrine) [23:01:10] Fundraising Sprint Vengaboys, Fundraising-Backlog, Unplanned-Sprint-Work, Patch-For-Review: Deploy Media Wiki Interface subject line in French - https://phabricator.wikimedia.org/T116199#1764166 (DStrine) [23:01:25] Fundraising Sprint Tom Waits, Fundraising Sprint UB40, Fundraising-Backlog, MediaWiki-extensions-CentralNotice, and 2 others: Banner history: encode all hide reasons - https://phabricator.wikimedia.org/T113813#1764179 (DStrine) [23:01:26] Fundraising-Backlog, fundraising-tech-ops: Spike: Do we have to make changes on orphan rectification box to support new GC SSL ciphers - https://phabricator.wikimedia.org/T113392#1764183 (DStrine) [23:02:03] eileen: What I did was, I forked the master branch for crm and crm/civicrm, and called that master-plus-4.6.9 [23:02:23] Fundraising Sprint Tom Waits, Fundraising Sprint UB40, Fundraising-Backlog, Patch-For-Review: default to credit card (so it doesn't need to be in the url) - worldpay 1 hour test - https://phabricator.wikimedia.org/T112946#1764201 (DStrine) [23:02:31] Fundraising Sprint Queen, Fundraising Sprint Rowlf the Dog, Fundraising Sprint Snoop (Dogg|Lion), Fundraising Sprint Tom Waits, and 4 others: Freaky banner arguments cause redirect to (nonexistent) Worldpay form. - https://phabricator.wikimedia.org/T108605#1764202 (DStrine) [23:02:36] eileen: Now, I'm thinking you can merge the civi-4.6.9 changes back into master-plus-4.6.9 [23:02:43] Fundraising-Backlog: Track whether the reader began a donation workflow, include in banner history log - https://phabricator.wikimedia.org/T113821#1764203 (DStrine) [23:02:51] from your perspective, just take your master patch and change .gitreview to point to the new branch. [23:02:54] Fundraising-Backlog: Parse and log "Invalid Credit Card Number" errors from Worldpay - https://phabricator.wikimedia.org/T114390#1764205 (DStrine) [23:03:04] Fundraising-Backlog: Test Amazon (USD) as a test in non-US country - https://phabricator.wikimedia.org/T115342#1764206 (DStrine) [23:03:23] eileen: Then, merge civi-4.6.9 into crm/civicrm#master-plus-4.6.9 and then Jenkins will pick up the right version of Civi [23:03:26] when testing crm [23:03:37] * awight sighs loudly at all the productive spam [23:03:56] awight, eileen: voting on the W name if you have a moment [23:04:09] :) the important part [23:04:11] ejegg|meeting: you are in a meeting, focus :) [23:05:28] r054l13: hi! hehe, you should see the "important" work we're doing: https://etherpad.wikimedia.org/p/fundraising_shrimp [23:06:51] runoff vote! [23:08:03] that is great. And the names, what are they for? [23:08:14] Names for the next sprint [23:08:29] plus, we adopt the identity of the performers for 2 weeks [23:09:35] wow, thats nice, but i have a problem [23:09:40] what is the meanin of Sprint? [23:09:55] and also the site has a live chat [23:10:07] who is kc, i am chatting with kc :) [23:12:14] r054l13: hi, i am kc [23:12:19] (casey) [23:12:48] cwd: :D [23:13:00] i can't believe this. Really? [23:13:29] eileen: Does that sound right to you? [23:13:41] Well, it was nice talking with kc, and now i am talking to cwd :) [23:14:02] AndyRussG: don't forget my patch to +2 it [23:15:02] Everything being equal, Krinkle has +1 it, so as ejegg and jenkins has verfied. So its all up to the fundraising team to merge it into their codebase :) [23:15:29] Yeah, Mr Jenkins liked it too. [23:16:32] Krinkle: yeah :D [23:16:40] is he a Mr? [23:16:43] or Mrs :) [23:16:58] wait, sorry [23:17:01] He is an It [23:17:13] yes sorry, it was a mistake ;) [23:17:22] So let me fix my question [23:17:27] Is it a Mr or Mrs ? [23:17:32] Lives in a dark box with label "integration.wikimedia.org" in a rack just like this one https://wikitech.wikimedia.org/wiki/Eqiad_cluster#/media/File:Eqiadwmf_9069.jpg [23:17:58] * awight checks HR policy regarding @ndroids [23:18:31] Photos of https://wikitech.wikimedia.org/wiki/Codfw_cluster are much nicer though [23:19:06] Krinkle: is Jenkins a prisoner to live in there? :) [23:22:14] more a slave for hire than a prisoner. [23:22:40] he was born at OpenStack infra [23:22:48] (PS2) Eileen: Use Civi method to cancel recurring via qc [wikimedia/fundraising/crm] (civi-4.6.9) - https://gerrit.wikimedia.org/r/249564 (https://phabricator.wikimedia.org/T110367) [23:22:50] (PS1) Eileen: Revert commits on wrong branch [wikimedia/fundraising/crm] (civi-4.6.9) - https://gerrit.wikimedia.org/r/249607 [23:22:52] (PS1) Eileen: Revert "4.6 upgrade preparation, replace contribution_type with financial_type" [wikimedia/fundraising/crm] (civi-4.6.9) - https://gerrit.wikimedia.org/r/249608 [23:22:54] (PS1) Eileen: Fix JPMorgan Importer [wikimedia/fundraising/crm] (civi-4.6.9) - https://gerrit.wikimedia.org/r/249609 (https://phabricator.wikimedia.org/T113381) [23:22:56] (PS1) Eileen: Add Direct Mail Appeal column to Trilogy Importer [wikimedia/fundraising/crm] (civi-4.6.9) - https://gerrit.wikimedia.org/r/249610 (https://phabricator.wikimedia.org/T114155) [23:22:58] (PS1) Eileen: Remove recurring clause from Bengali thank-you letter [wikimedia/fundraising/crm] (civi-4.6.9) - https://gerrit.wikimedia.org/r/249611 [23:23:00] (PS1) Eileen: Remove unused recurring info template partial [wikimedia/fundraising/crm] (civi-4.6.9) - https://gerrit.wikimedia.org/r/249612 [23:23:02] (PS1) Eileen: Refactor BaseAuditProcessor main loop [wikimedia/fundraising/crm] (civi-4.6.9) - https://gerrit.wikimedia.org/r/249613 (https://phabricator.wikimedia.org/T111425) [23:23:04] (PS1) Eileen: Fix audit error handling [wikimedia/fundraising/crm] (civi-4.6.9) - https://gerrit.wikimedia.org/r/249614 [23:23:06] (PS1) Eileen: Amazon audit processor [wikimedia/fundraising/crm] (civi-4.6.9) - https://gerrit.wikimedia.org/r/249615 (https://phabricator.wikimedia.org/T111425) [23:23:08] (PS1) Eileen: Set subscr_id on Amazon recurring if missing [wikimedia/fundraising/crm] (civi-4.6.9) - https://gerrit.wikimedia.org/r/249616 (https://phabricator.wikimedia.org/T111431) [23:23:10] (PS1) Eileen: Make smashpig settings file optional, fix comment [wikimedia/fundraising/crm] (civi-4.6.9) - https://gerrit.wikimedia.org/r/249617 [23:23:12] (PS1) Eileen: WPG RECON [wikimedia/fundraising/crm] (civi-4.6.9) - https://gerrit.wikimedia.org/r/249618 [23:23:14] (PS1) Eileen: Allow for multiple audit files per date [wikimedia/fundraising/crm] (civi-4.6.9) - https://gerrit.wikimedia.org/r/249619 (https://phabricator.wikimedia.org/T111425) [23:23:16] (PS1) Eileen: Respect individual gateway test_mode settings [wikimedia/fundraising/crm] (civi-4.6.9) - https://gerrit.wikimedia.org/r/249620 [23:23:18] (PS1) Eileen: Audit: stop prepending 'RFD ' to gateway refund IDs [wikimedia/fundraising/crm] (civi-4.6.9) - https://gerrit.wikimedia.org/r/249621 (https://phabricator.wikimedia.org/T115511) [23:23:20] (PS1) Eileen: Lean on the convenience fn even more [wikimedia/fundraising/crm] (civi-4.6.9) - https://gerrit.wikimedia.org/r/249622 [23:23:22] (PS1) Eileen: Update name pattern for Amazon audit to find logs [wikimedia/fundraising/crm] (civi-4.6.9) - https://gerrit.wikimedia.org/r/249623 (https://phabricator.wikimedia.org/T111425) [23:23:24] (PS1) Eileen: Make refund import logic reusable [wikimedia/fundraising/crm] (civi-4.6.9) - https://gerrit.wikimedia.org/r/249624 (https://phabricator.wikimedia.org/T110367) [23:23:26] (PS1) Eileen: Use random temp dirs in unit tests [wikimedia/fundraising/crm] (civi-4.6.9) - https://gerrit.wikimedia.org/r/249625 [23:23:28] (PS1) Eileen: Update French thank-you [wikimedia/fundraising/crm] (civi-4.6.9) - https://gerrit.wikimedia.org/r/249626 (https://phabricator.wikimedia.org/T115496) [23:23:30] (PS1) Eileen: Tests for Amazon audit processor [wikimedia/fundraising/crm] (civi-4.6.9) - https://gerrit.wikimedia.org/r/249627 (https://phabricator.wikimedia.org/T111425) [23:23:32] (PS1) Eileen: Don't move "empty" recon files in test mode [wikimedia/fundraising/crm] (civi-4.6.9) - https://gerrit.wikimedia.org/r/249628 [23:23:34] (PS1) Eileen: update SmashPig to ignore blank lines in worldpay audit [wikimedia/fundraising/crm] (civi-4.6.9) - https://gerrit.wikimedia.org/r/249629 [23:23:36] (PS1) Eileen: File-extension-proof WP audit filename parsing. [wikimedia/fundraising/crm] (civi-4.6.9) - https://gerrit.wikimedia.org/r/249630 [23:23:38] (PS1) Eileen: Tighten worldpay®ex_for_recon for WPG [wikimedia/fundraising/crm] (civi-4.6.9) - https://gerrit.wikimedia.org/r/249631 [23:23:40] (PS1) Eileen: Move Context/Logger init to wmf_audit_main [wikimedia/fundraising/crm] (civi-4.6.9) - https://gerrit.wikimedia.org/r/249632 [23:23:42] (PS1) Eileen: More updates to the French thank-you template [wikimedia/fundraising/crm] (civi-4.6.9) - https://gerrit.wikimedia.org/r/249633 (https://phabricator.wikimedia.org/T115496) [23:23:44] (PS1) Eileen: Update SmashPig lib [wikimedia/fundraising/crm] (civi-4.6.9) - https://gerrit.wikimedia.org/r/249634 [23:23:46] (PS1) Eileen: Update DonationInterface lib [wikimedia/fundraising/crm] (civi-4.6.9) - https://gerrit.wikimedia.org/r/249635 (https://phabricator.wikimedia.org/T116199) [23:23:48] (PS1) Eileen: Remove bad code [wikimedia/fundraising/crm] (civi-4.6.9) - https://gerrit.wikimedia.org/r/249636 (https://phabricator.wikimedia.org/T116817) [23:23:50] (PS1) Eileen: Fail gracefully if campaigns were added using the native Civi interface [wikimedia/fundraising/crm] (civi-4.6.9) - https://gerrit.wikimedia.org/r/249637 (https://phabricator.wikimedia.org/T116423) [23:23:52] (PS1) Eileen: Revert "Revert "4.6 upgrade preparation, replace contribution_type with financial_type"" [wikimedia/fundraising/crm] (civi-4.6.9) - https://gerrit.wikimedia.org/r/249638 [23:23:54] (PS1) Eileen: Revert "Revert commits on wrong branch" [wikimedia/fundraising/crm] (civi-4.6.9) - https://gerrit.wikimedia.org/r/249639 [23:23:56] (PS1) Eileen: Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into HEAD [wikimedia/fundraising/crm] (civi-4.6.9) - https://gerrit.wikimedia.org/r/249640 [23:24:00] woo gerrit party [23:24:02] Don't get RSI eileen ! [23:24:07] (CR) jenkins-bot: [V: -1] Use Civi method to cancel recurring via qc [wikimedia/fundraising/crm] (civi-4.6.9) - https://gerrit.wikimedia.org/r/249564 (https://phabricator.wikimedia.org/T110367) (owner: Eileen) [23:24:56] (CR) jenkins-bot: [V: -1] Revert commits on wrong branch [wikimedia/fundraising/crm] (civi-4.6.9) - https://gerrit.wikimedia.org/r/249607 (owner: Eileen) [23:25:24] (CR) jenkins-bot: [V: -1] Revert "4.6 upgrade preparation, replace contribution_type with financial_type" [wikimedia/fundraising/crm] (civi-4.6.9) - https://gerrit.wikimedia.org/r/249608 (owner: Eileen) [23:25:51] ejegg: done with the meeting? [23:25:53] (CR) jenkins-bot: [V: -1] Fix JPMorgan Importer [wikimedia/fundraising/crm] (civi-4.6.9) - https://gerrit.wikimedia.org/r/249609 (https://phabricator.wikimedia.org/T113381) (owner: Eileen) [23:26:10] i am seeing the code work that the fundraising community is doing :) [23:26:14] OK - yep that is definitely channel spam!! [23:26:17] (CR) jenkins-bot: [V: -1] Add Direct Mail Appeal column to Trilogy Importer [wikimedia/fundraising/crm] (civi-4.6.9) - https://gerrit.wikimedia.org/r/249610 (https://phabricator.wikimedia.org/T114155) (owner: Eileen) [23:26:33] r054l13: yep, just fixing some of my code now [23:27:11] (CR) jenkins-bot: [V: -1] Remove recurring clause from Bengali thank-you letter [wikimedia/fundraising/crm] (civi-4.6.9) - https://gerrit.wikimedia.org/r/249611 (owner: Eileen) [23:27:11] so, I kinda have merges tied up go both ways - so I could compare them & see if they looked sane… [23:27:14] ejegg: ok, that our patch about the close buttons has been +1 by Krinkle so it is good to do :) [23:27:55] (CR) jenkins-bot: [V: -1] Remove unused recurring info template partial [wikimedia/fundraising/crm] (civi-4.6.9) - https://gerrit.wikimedia.org/r/249612 (owner: Eileen) [23:28:21] eileen: okay, any way you want to make those patches is fine--the only part I'm suggesting you do differently is that if you want Jenkins to pass, you'll have to push to a new branch, which I called master-plus-4.6.9 [23:28:42] (CR) jenkins-bot: [V: -1] Refactor BaseAuditProcessor main loop [wikimedia/fundraising/crm] (civi-4.6.9) - https://gerrit.wikimedia.org/r/249613 (https://phabricator.wikimedia.org/T111425) (owner: Eileen) [23:29:03] (CR) jenkins-bot: [V: -1] Fix audit error handling [wikimedia/fundraising/crm] (civi-4.6.9) - https://gerrit.wikimedia.org/r/249614 (owner: Eileen) [23:29:07] awight: I think I did - somewhere in there.... [23:29:09] That's to workaround a limitation in zuul-cloner. If you push changes to crm@master, it's always gonna use crm/civicrm#master, it dumbly loads submodules by branch name rather than the submodule pointer. [23:29:15] ok, great [23:29:25] (CR) jenkins-bot: [V: -1] Amazon audit processor [wikimedia/fundraising/crm] (civi-4.6.9) - https://gerrit.wikimedia.org/r/249615 (https://phabricator.wikimedia.org/T111425) (owner: Eileen) [23:29:39] opps - no that one got rejected [23:29:52] (CR) jenkins-bot: [V: -1] Set subscr_id on Amazon recurring if missing [wikimedia/fundraising/crm] (civi-4.6.9) - https://gerrit.wikimedia.org/r/249616 (https://phabricator.wikimedia.org/T111431) (owner: Eileen) [23:29:57] the ones lined up are a merge-merge to civic-4.6.9 [23:30:02] eileen: This doesn't look good: https://gerrit.wikimedia.org/r/#/c/249607/1 -- I guess you revert it later, though [23:30:16] (CR) jenkins-bot: [V: -1] Make smashpig settings file optional, fix comment [wikimedia/fundraising/crm] (civi-4.6.9) - https://gerrit.wikimedia.org/r/249617 (owner: Eileen) [23:30:50] (CR) jenkins-bot: [V: -1] WPG RECON [wikimedia/fundraising/crm] (civi-4.6.9) - https://gerrit.wikimedia.org/r/249618 (owner: Eileen) [23:30:57] well. [23:31:02] yeah - that's based on merging from master & then revering againnnn. [23:31:04] All I care is that the final patch works [23:31:17] (CR) jenkins-bot: [V: -1] Allow for multiple audit files per date [wikimedia/fundraising/crm] (civi-4.6.9) - https://gerrit.wikimedia.org/r/249619 (https://phabricator.wikimedia.org/T111425) (owner: Eileen) [23:31:19] I'll try to get the master+1 up to see if that looks clearer [23:31:21] sorry again that gerrit is such a beast! [23:31:49] (CR) jenkins-bot: [V: -1] Respect individual gateway test_mode settings [wikimedia/fundraising/crm] (civi-4.6.9) - https://gerrit.wikimedia.org/r/249620 (owner: Eileen) [23:31:59] (CR) Eileen: [C: 2] More updates to the French thank-you template [wikimedia/fundraising/crm] (civi-4.6.9) - https://gerrit.wikimedia.org/r/249633 (https://phabricator.wikimedia.org/T115496) (owner: Eileen) [23:32:12] (CR) jenkins-bot: [V: -1] Audit: stop prepending 'RFD ' to gateway refund IDs [wikimedia/fundraising/crm] (civi-4.6.9) - https://gerrit.wikimedia.org/r/249621 (https://phabricator.wikimedia.org/T115511) (owner: Eileen) [23:32:27] awight: I kind of 'get it' now - but the mess from early on has not gone [23:32:37] (CR) jenkins-bot: [V: -1] Lean on the convenience fn even more [wikimedia/fundraising/crm] (civi-4.6.9) - https://gerrit.wikimedia.org/r/249622 (owner: Eileen) [23:32:57] I'm glad to help however I can [23:33:01] (CR) jenkins-bot: [V: -1] Update name pattern for Amazon audit to find logs [wikimedia/fundraising/crm] (civi-4.6.9) - https://gerrit.wikimedia.org/r/249623 (https://phabricator.wikimedia.org/T111425) (owner: Eileen) [23:33:26] (CR) jenkins-bot: [V: -1] Make refund import logic reusable [wikimedia/fundraising/crm] (civi-4.6.9) - https://gerrit.wikimedia.org/r/249624 (https://phabricator.wikimedia.org/T110367) (owner: Eileen) [23:33:57] (CR) jenkins-bot: [V: -1] Use random temp dirs in unit tests [wikimedia/fundraising/crm] (civi-4.6.9) - https://gerrit.wikimedia.org/r/249625 (owner: Eileen) [23:34:24] (CR) jenkins-bot: [V: -1] Update French thank-you [wikimedia/fundraising/crm] (civi-4.6.9) - https://gerrit.wikimedia.org/r/249626 (https://phabricator.wikimedia.org/T115496) (owner: Eileen) [23:34:53] (CR) jenkins-bot: [V: -1] Tests for Amazon audit processor [wikimedia/fundraising/crm] (civi-4.6.9) - https://gerrit.wikimedia.org/r/249627 (https://phabricator.wikimedia.org/T111425) (owner: Eileen) [23:35:09] Jeff_Green: fyi, we decided to start the schema migration using code we'd already tested, and now we're fiddling with the branches to MFT and then eventually update our master and deployment branches to the new stuff. [23:35:14] (CR) jenkins-bot: [V: -1] Don't move "empty" recon files in test mode [wikimedia/fundraising/crm] (civi-4.6.9) - https://gerrit.wikimedia.org/r/249628 (owner: Eileen) [23:35:40] (CR) jenkins-bot: [V: -1] update SmashPig to ignore blank lines in worldpay audit [wikimedia/fundraising/crm] (civi-4.6.9) - https://gerrit.wikimedia.org/r/249629 (owner: Eileen) [23:36:03] (CR) jenkins-bot: [V: -1] File-extension-proof WP audit filename parsing. [wikimedia/fundraising/crm] (civi-4.6.9) - https://gerrit.wikimedia.org/r/249630 (owner: Eileen) [23:36:10] (PS1) Eileen: Reintroduce minor change lost in merge [wikimedia/fundraising/crm] (master-plus-4.6.9) - https://gerrit.wikimedia.org/r/249643 [23:36:26] (CR) jenkins-bot: [V: -1] Tighten worldpay®ex_for_recon for WPG [wikimedia/fundraising/crm] (civi-4.6.9) - https://gerrit.wikimedia.org/r/249631 (owner: Eileen) [23:36:32] awight: ok [23:36:54] (CR) jenkins-bot: [V: -1] Move Context/Logger init to wmf_audit_main [wikimedia/fundraising/crm] (civi-4.6.9) - https://gerrit.wikimedia.org/r/249632 (owner: Eileen) [23:37:26] (CR) jenkins-bot: [V: -1] More updates to the French thank-you template [wikimedia/fundraising/crm] (civi-4.6.9) - https://gerrit.wikimedia.org/r/249633 (https://phabricator.wikimedia.org/T115496) (owner: Eileen) [23:37:54] (CR) jenkins-bot: [V: -1] Update SmashPig lib [wikimedia/fundraising/crm] (civi-4.6.9) - https://gerrit.wikimedia.org/r/249634 (owner: Eileen) [23:37:56] So in 12 hours we'll probably want to put the fr-code-update config back on "deployment", after we verify basic sanity [23:38:22] (CR) jenkins-bot: [V: -1] Update DonationInterface lib [wikimedia/fundraising/crm] (civi-4.6.9) - https://gerrit.wikimedia.org/r/249635 (https://phabricator.wikimedia.org/T116199) (owner: Eileen) [23:38:54] (CR) jenkins-bot: [V: -1] Remove bad code [wikimedia/fundraising/crm] (civi-4.6.9) - https://gerrit.wikimedia.org/r/249636 (https://phabricator.wikimedia.org/T116817) (owner: Eileen) [23:39:23] (CR) jenkins-bot: [V: -1] Fail gracefully if campaigns were added using the native Civi interface [wikimedia/fundraising/crm] (civi-4.6.9) - https://gerrit.wikimedia.org/r/249637 (https://phabricator.wikimedia.org/T116423) (owner: Eileen) [23:40:18] (CR) jenkins-bot: [V: -1] Revert "Revert "4.6 upgrade preparation, replace contribution_type with financial_type"" [wikimedia/fundraising/crm] (civi-4.6.9) - https://gerrit.wikimedia.org/r/249638 (owner: Eileen) [23:42:56] (PS1) Eileen: Merge branch 'civi-4.6.9' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/249645 [23:42:58] (PS1) Eileen: Revert "Revert "4.6 upgrade preparation, replace contribution_type with financial_type"" [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/249646 [23:43:00] (PS1) Eileen: Revert "Revert commits on wrong branch" [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/249647 [23:43:02] (PS1) Eileen: Remove trailing spaces [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/249648 [23:43:04] (PS1) Eileen: Reintroduce minor change lost in merge [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/249649 [23:43:15] (Abandoned) Eileen: Merge branch 'master' into civi-4.6.9 [wikimedia/fundraising/crm] (civi-4.6.9) - https://gerrit.wikimedia.org/r/249566 (owner: Eileen) [23:43:59] (CR) jenkins-bot: [V: -1] Reintroduce minor change lost in merge [wikimedia/fundraising/crm] (master-plus-4.6.9) - https://gerrit.wikimedia.org/r/249643 (owner: Eileen) [23:44:25] (CR) jenkins-bot: [V: -1] Merge branch 'civi-4.6.9' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/249645 (owner: Eileen) [23:44:50] (CR) jenkins-bot: [V: -1] Revert "Revert "4.6 upgrade preparation, replace contribution_type with financial_type"" [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/249646 (owner: Eileen) [23:44:59] (Abandoned) Eileen: Merge branch 'civi-4.6.9' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/249645 (owner: Eileen) [23:45:09] (Abandoned) Eileen: Revert "Revert "4.6 upgrade preparation, replace contribution_type with financial_type"" [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/249646 (owner: Eileen) [23:45:23] (CR) jenkins-bot: [V: -1] Revert "Revert commits on wrong branch" [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/249647 (owner: Eileen) [23:45:25] (Abandoned) Eileen: Revert "Revert commits on wrong branch" [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/249647 (owner: Eileen) [23:45:35] (Abandoned) Eileen: Remove trailing spaces [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/249648 (owner: Eileen) [23:45:44] Fundraising-Backlog, Wikimedia-Fundraising-CiviCRM: Coinbase import fails with database error - https://phabricator.wikimedia.org/T116445#1764340 (LeanneS) Coinbase was able to make the change to UTF-8 encoded CSVs. There still appears to be some odd looking characters in it, not just with Swedish donors... [23:45:46] (Abandoned) Eileen: Reintroduce minor change lost in merge [wikimedia/fundraising/crm] (master-plus-4.6.9) - https://gerrit.wikimedia.org/r/249643 (owner: Eileen) [23:45:56] (Abandoned) Eileen: Reintroduce minor change lost in merge [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/249649 (owner: Eileen) [23:48:35] (PS1) Eileen: Merge branch 'civi-4.6.9' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm [wikimedia/fundraising/crm] (master-plus-4.6.9) - https://gerrit.wikimedia.org/r/249650 [23:48:37] (PS1) Eileen: Revert "Revert "4.6 upgrade preparation, replace contribution_type with financial_type"" [wikimedia/fundraising/crm] (master-plus-4.6.9) - https://gerrit.wikimedia.org/r/249651 [23:48:39] (PS1) Eileen: Revert "Revert commits on wrong branch" [wikimedia/fundraising/crm] (master-plus-4.6.9) - https://gerrit.wikimedia.org/r/249652 [23:48:41] (PS1) Eileen: Remove trailing spaces [wikimedia/fundraising/crm] (master-plus-4.6.9) - https://gerrit.wikimedia.org/r/249653 [23:48:43] (PS1) Eileen: Reintroduce minor change lost in merge [wikimedia/fundraising/crm] (master-plus-4.6.9) - https://gerrit.wikimedia.org/r/249654 [23:49:07] (CR) jenkins-bot: [V: -1] Merge branch 'civi-4.6.9' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm [wikimedia/fundraising/crm] (master-plus-4.6.9) - https://gerrit.wikimedia.org/r/249650 (owner: Eileen) [23:49:38] (CR) jenkins-bot: [V: -1] Revert "Revert "4.6 upgrade preparation, replace contribution_type with financial_type"" [wikimedia/fundraising/crm] (master-plus-4.6.9) - https://gerrit.wikimedia.org/r/249651 (owner: Eileen) [23:50:02] (CR) jenkins-bot: [V: -1] Revert "Revert commits on wrong branch" [wikimedia/fundraising/crm] (master-plus-4.6.9) - https://gerrit.wikimedia.org/r/249652 (owner: Eileen) [23:50:27] (PS8) Ejegg: Large banner limit mixin [extensions/CentralNotice] - https://gerrit.wikimedia.org/r/247460 (https://phabricator.wikimedia.org/T90919) [23:50:29] (CR) jenkins-bot: [V: -1] Remove trailing spaces [wikimedia/fundraising/crm] (master-plus-4.6.9) - https://gerrit.wikimedia.org/r/249653 (owner: Eileen) [23:50:53] awight: is the upgrade progress still in line with your test timings? [23:50:54] (CR) jenkins-bot: [V: -1] Reintroduce minor change lost in merge [wikimedia/fundraising/crm] (master-plus-4.6.9) - https://gerrit.wikimedia.org/r/249654 (owner: Eileen) [23:51:08] (CR) Ejegg: Large banner limit mixin (4 comments) [extensions/CentralNotice] - https://gerrit.wikimedia.org/r/247460 (https://phabricator.wikimedia.org/T90919) (owner: Ejegg) [23:53:26] (PS1) Eileen: Merge branch 'civi-4.6.9' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm/civicrm into master-plus-4.6.9 [wikimedia/fundraising/crm/civicrm] (master-plus-4.6.9) - https://gerrit.wikimedia.org/r/249656 [23:53:53] (CR) jenkins-bot: [V: -1] Merge branch 'civi-4.6.9' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm/civicrm into master-plus-4.6.9 [wikimedia/fundraising/crm/civicrm] (master-plus-4.6.9) - https://gerrit.wikimedia.org/r/249656 (owner: Eileen) [23:54:06] (CR) Eileen: [C: 2] Merge branch 'civi-4.6.9' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm/civicrm into master-plus-4.6.9 [wikimedia/fundraising/crm/civicrm] (master-plus-4.6.9) - https://gerrit.wikimedia.org/r/249656 (owner: Eileen) [23:54:33] (CR) jenkins-bot: [V: -1] Merge branch 'civi-4.6.9' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm/civicrm into master-plus-4.6.9 [wikimedia/fundraising/crm/civicrm] (master-plus-4.6.9) - https://gerrit.wikimedia.org/r/249656 (owner: Eileen) [23:56:02] (CR) Eileen: [V: 2] "this needs to go in so we can combine with crm tests" [wikimedia/fundraising/crm/civicrm] (master-plus-4.6.9) - https://gerrit.wikimedia.org/r/249656 (owner: Eileen) [23:57:37] eileen: Yes, but this first step is roughly 2 hours so hard to say for certain at this point. The next step should start in 8 minutes, I'll ping you when I see that come through. [23:57:40] awight: how do I force the civi merge into plus one so that I can get the crm tests to run with it - https://gerrit.wikimedia.org/r/#/c/249656/ [23:58:20] eileen: Remove jenkins as a reviewer [23:58:29] dirty, huh [23:59:38] (CR) Eileen: "recheck" [wikimedia/fundraising/crm] (master-plus-4.6.9) - https://gerrit.wikimedia.org/r/249654 (owner: Eileen) [23:59:48] done!