[00:01:33] (PS1) Awight: (FR #1995) Fix bad renormalization of recurring [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/162173 [00:04:06] Team: if you have time, please review ^^ [00:04:34] I think we've been storing bad recurring data since early May though, so no *huge* rush. [00:05:53] atgomez: oof! thanks for filling in all the details, I swear I was going to do that some day after I'd deployed the fix :) [00:37:49] (CR) Awight: "I moved it! Now it's in thank_you_render..." [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/161615 (owner: Awight) [00:42:00] (PS1) Awight: WIP (FR #1497) More import columns for communication prefs [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/162187 [02:00:15] hrmm, no k4 [02:00:37] marktraceur: nice xkcd [02:09:21] Like all of them. [02:44:42] (PS4) Katie Horn: WIP: DO NOT MERGE - Generic audit logic and worldpay audit job [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/159761 [03:33:35] (CR) Awight: WIP: DO NOT MERGE - Generic audit logic and worldpay audit job (1 comment) [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/159761 (owner: Katie Horn) [16:12:36] cc [16:12:40] gah [17:23:49] AndyRussG: I guess that's a really bad time for some US east coast people. jewish holiday FYI [17:24:06] and you got the date wrong [17:24:36] jeremyb: oooops thanks!!! [17:24:43] Yeah I didn't decide anything about the date [17:24:49] it's already 23rd right now [17:25:00] Yes sending a correction :) [17:25:12] ok :) [17:26:54] * K4-713 looks pleased, wanders off again [17:27:46] ohai k4 [17:28:03] I got a kick out of translaction [17:28:24] * AndyRussG waves [17:29:04] Hey guys. :) [17:29:25] hello K4! [17:29:41] How's it going? [17:30:10] pretty well! [17:30:26] Trying out a couple different auth plugins for drupal / dash [17:30:35] YAY. [17:30:45] whole lotta config for any of them... [17:30:53] It'll be worth it. [17:31:52] openid might be least annoying for users [17:31:52] ...really, you don't want to know what I have been doing the past couple of years, to get general graphs of payments cluster activity. [17:32:05] We get the auth working and I may write a widget myself. [17:33:21] jeremyb: regarding the holiday, I don't think there's much to be done at this point, I'm afraid. :( It was announced on Wikitech-L last week. I'm travelling that day and will be rushing to get to an internet connection after my flight. If there's a need for another meeting beyond what can be said via mailing lists and the tallk page, we can always ask for one. I guess the other option would be to write on [17:33:21] Wikitech-l asking for it to be changed. [17:33:22] oh hey, i should find a good time to deploy DI updates. Any preference? Since awight's out today + tmw, it would be great to do that when you're free for backup. [17:33:54] K4-713^^ [17:33:57] ejegg: Yay, I'm all for doing a payments deploy today. [17:34:23] OK, any prferred time? [17:34:41] not the end of the world. but I would have considered attending [17:34:50] I'm cool with whatever, so long as you can pull the trigger on the actual deploy no later than... 2pm pacific? [17:35:10] That sound doable? I don't think there's anything complicated in there. [17:35:28] yeah, definitely. 1 pm pacific good then? [17:35:31] now maybe I could but I probably would have to cut unto spending time with some family I don't see often enough [17:35:53] ejegg: Really, any time between then and now. [17:36:03] Well, as long as I'm not off at lunch. [17:36:23] I'm usually of the opinion that earlier is better. [17:37:11] ejegg: Can you start rolling up the deploy branch now, and ping me when it looks good? [17:37:20] OK, will do! [17:37:33] Sweet. :) [17:37:39] Let me know if you run into anything weird. [17:37:48] word, will do [17:59:12] (PS1) Ejegg: Localisation updates from https://translatewiki.net. [extensions/DonationInterface] (deploy-payments_1.22) - https://gerrit.wikimedia.org/r/162298 [17:59:39] K4-713: I squashed them all into one this time. I should change the 1st line of that commit msg though [18:00:03] ejegg: The l10n? [18:00:54] That commit actually has them all. The commit msg is all of the msgs of the child commits, and the l10n one was first. [18:01:12] Oh yeah, totally change the message. [18:01:18] Did you kill the unit tests? [18:01:29] yep! [18:02:14] (PS2) Ejegg: Merge updates from Aug 27-Sep 23, 2014 in from master [extensions/DonationInterface] (deploy-payments_1.22) - https://gerrit.wikimedia.org/r/162298 [18:02:43] We didn't upgrade mw core on payments yet, did we? [18:02:56] nope I think awight is still testing that [18:03:13] maybe merge commit is better than squash? [18:03:16] hopefully we can start the new deploy branch from master! [18:03:16] awight has that on deck somewhere... so if you wanted to be really nice, you could update the new deploy branch, too. [18:03:28] Ha, or that. [18:03:29] is there precedent? [18:03:41] jeremyb: For what? [18:03:56] merge commit vs squash [18:04:00] shoot, last time I tried a merge commit I had to re-review all the child commits. [18:04:12] Maybe because we've been cherrypicking for so long? [18:04:23] ejegg: Nah, that's... normal. [18:04:48] ...and I got comments saying to squash next time :P [18:05:19] well I should do some testing later [18:05:21] ejegg: Hrm. Who from? [18:05:29] let me check [18:05:52] I used to just git push straight to deploy, but mwalker and I got into a semi-religious argument over the commits being different because we remove unit tests for the deploy branch, and he won. [18:06:30] Siebrand was the one saying squash [18:06:42] https://gerrit.wikimedia.org/r/#/c/156848/ [18:06:47] It is probably better for PCI, to do it the most annoying way possible. [18:06:54] ...usually. [18:07:07] heh, ok. So I'll abandoned that squashed commit and redo [18:08:01] ejegg: What about squashing the l10n only? [18:08:12] word, that sounds good [18:08:25] I bet he was just reacting to an alarm going off on their end about 30 times. [18:08:31] ...which is reasonable. [18:08:35] ahh [18:09:10] (Abandoned) Ejegg: Merge updates from Aug 27-Sep 23, 2014 in from master [extensions/DonationInterface] (deploy-payments_1.22) - https://gerrit.wikimedia.org/r/162298 (owner: Ejegg) [18:10:44] wait, a sec [18:11:05] ? [18:13:29] ok, at a real computer now [18:13:43] What were you on before? :) [18:13:48] K4-713: i'm going to do some tests. i think maybe we can make everyone happy? :) [18:13:50] android [18:13:58] jeremyb: I like that idea. [18:14:04] I mean, in theory. [18:14:12] ejegg: ^^ [18:14:35] OK, I'll have the only-l10n-squashed commits ready for review in a minute [18:14:57] ejegg: Hang on to that for a second... [18:15:01] these are all already reviewed though, right? [18:15:06] Yep, in master. [18:15:14] great [18:15:56] * jeremyb digs up the old test repo name [18:19:12] (CR) Katie Horn: "See inline. Thanks for the reminder!" (1 comment) [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/159761 (owner: Katie Horn) [18:19:34] OK, got it down to 12 commits ready to push for review [18:25:49] * K4-713 twiddles [18:25:58] This is probably going to be worth the wait. [18:27:07] you mean wait for jeremyb's testing to review? [18:27:24] Yeah, sorry. I should use more words. [18:27:32] heh [18:28:05] if you want to follow along apparently i'm spamming #-dev [18:48:59] ejegg: so it seems fine to me... [18:49:12] maybe you have something more complicated because of the past cherry picks? [18:49:20] yeah, i think that's it [18:49:38] I'm going to check the actual difference between deploy and master [18:50:00] then for the next deploy branch (we're upgrading mw soon) we can hopefully start from master [18:50:19] i pushed a merge commit and it referenced the dependencies that were already pushed on master but didn't make new changes for each of them [18:50:43] (well it was only 1 :P) [18:51:22] hmm... sadly there are hundreds of commits that git thinks are different between master and deploy [18:51:35] they maybe are different :) [18:52:09] well, here goes a dozen commits to review [18:52:20] ok, so I guess bad way this time and better way after the new start from master [18:52:26] yeah [18:52:27] btw, for the record the procedure is: [18:52:47] git checkout deploybranch #(or whatever you want to merge into) [18:53:04] git merge --no-ff master #(or whatever you're pulling from) [18:53:41] ok, cool [18:54:20] jeremyb: This is fantastic. Thank you for poking the repo for us. :) [18:54:54] Saving small amounts of regular pain is a big deal. [18:55:45] but maybe this means you can't cherry pick [18:56:12] Or, if we do, we have to restore sanity in a more obvious way... which I'm okay with. [18:56:25] Again: In theory. :) [18:56:43] bah, 'change closed' annoyances... guess I have to regenerate the change ids [18:56:53] Change... closed? [18:57:14] huh. would be nice to have them consistent [18:57:19] maybe you're pushing to wrong branch [18:57:49] nope .gitreview has deploy-payments_1.22 [19:01:48] K4-713 is that coconut thing a joke or really happening? [19:02:03] TOTALLY HAPPENING. [19:02:10] haha of course [19:02:16] lolz [19:03:31] (PS1) Ejegg: Localisation updates from https://translatewiki.net. [extensions/DonationInterface] (deploy-payments_1.22) - https://gerrit.wikimedia.org/r/162346 [19:03:33] (PS1) Ejegg: Add country hidden field back to non-US WorldPay form [extensions/DonationInterface] (deploy-payments_1.22) - https://gerrit.wikimedia.org/r/162347 [19:03:35] (PS1) Ejegg: Localisation updates from https://translatewiki.net. [extensions/DonationInterface] (deploy-payments_1.22) - https://gerrit.wikimedia.org/r/162348 [19:03:37] (PS1) Ejegg: Update cc icons for WP forms card #1822 [extensions/DonationInterface] (deploy-payments_1.22) - https://gerrit.wikimedia.org/r/162349 [19:03:39] (PS1) Ejegg: Re-add Australian states, card #1799 [extensions/DonationInterface] (deploy-payments_1.22) - https://gerrit.wikimedia.org/r/162350 [19:03:41] (PS1) Ejegg: Add tests for Gateway_Form [extensions/DonationInterface] (deploy-payments_1.22) - https://gerrit.wikimedia.org/r/162351 [19:03:44] (PS1) Ejegg: Localisation updates from https://translatewiki.net. [extensions/DonationInterface] (deploy-payments_1.22) - https://gerrit.wikimedia.org/r/162352 [19:03:45] (PS1) Ejegg: Remove JCB logo and add new Carte Bleue logo [extensions/DonationInterface] (deploy-payments_1.22) - https://gerrit.wikimedia.org/r/162353 [19:03:47] (PS1) Ejegg: class-ify CurrencyRates [extensions/DonationInterface] (deploy-payments_1.22) - https://gerrit.wikimedia.org/r/162354 [19:03:50] (PS1) Ejegg: function signature glitch [extensions/DonationInterface] (deploy-payments_1.22) - https://gerrit.wikimedia.org/r/162355 [19:03:51] (PS1) Ejegg: Localisation updates from https://translatewiki.net. [extensions/DonationInterface] (deploy-payments_1.22) - https://gerrit.wikimedia.org/r/162356 [19:03:54] (PS1) Ejegg: Delete tests [extensions/DonationInterface] (deploy-payments_1.22) - https://gerrit.wikimedia.org/r/162357 [19:04:09] whoa, what's a coconut thing? [19:05:22] K4-713: I'll merge those in. Do you want to deploy after you've had lunch? [19:06:35] (CR) Ejegg: [C: 2] Localisation updates from https://translatewiki.net. [extensions/DonationInterface] (deploy-payments_1.22) - https://gerrit.wikimedia.org/r/162346 (owner: Ejegg) [19:07:06] (CR) Ejegg: [C: 2] Add country hidden field back to non-US WorldPay form [extensions/DonationInterface] (deploy-payments_1.22) - https://gerrit.wikimedia.org/r/162347 (owner: Ejegg) [19:07:21] (CR) Ejegg: [C: 2] Localisation updates from https://translatewiki.net. [extensions/DonationInterface] (deploy-payments_1.22) - https://gerrit.wikimedia.org/r/162348 (owner: Ejegg) [19:08:29] (CR) Ejegg: [C: 2] Update cc icons for WP forms card #1822 [extensions/DonationInterface] (deploy-payments_1.22) - https://gerrit.wikimedia.org/r/162349 (owner: Ejegg) [19:09:14] (CR) Ejegg: [C: 2] Re-add Australian states, card #1799 [extensions/DonationInterface] (deploy-payments_1.22) - https://gerrit.wikimedia.org/r/162350 (owner: Ejegg) [19:09:29] (CR) Ejegg: [C: 2] Add tests for Gateway_Form [extensions/DonationInterface] (deploy-payments_1.22) - https://gerrit.wikimedia.org/r/162351 (owner: Ejegg) [19:09:43] (CR) Ejegg: [C: 2] Localisation updates from https://translatewiki.net. [extensions/DonationInterface] (deploy-payments_1.22) - https://gerrit.wikimedia.org/r/162352 (owner: Ejegg) [19:10:10] (CR) Ejegg: [C: 2] Remove JCB logo and add new Carte Bleue logo [extensions/DonationInterface] (deploy-payments_1.22) - https://gerrit.wikimedia.org/r/162353 (owner: Ejegg) [19:10:25] (CR) Ejegg: [C: 2] class-ify CurrencyRates [extensions/DonationInterface] (deploy-payments_1.22) - https://gerrit.wikimedia.org/r/162354 (owner: Ejegg) [19:10:38] (CR) Ejegg: [C: 2] function signature glitch [extensions/DonationInterface] (deploy-payments_1.22) - https://gerrit.wikimedia.org/r/162355 (owner: Ejegg) [19:11:05] (CR) Ejegg: [C: 2] Localisation updates from https://translatewiki.net. [extensions/DonationInterface] (deploy-payments_1.22) - https://gerrit.wikimedia.org/r/162356 (owner: Ejegg) [19:11:16] (Merged) jenkins-bot: Localisation updates from https://translatewiki.net. [extensions/DonationInterface] (deploy-payments_1.22) - https://gerrit.wikimedia.org/r/162346 (owner: Ejegg) [19:11:20] (CR) Ejegg: [C: 2] Delete tests [extensions/DonationInterface] (deploy-payments_1.22) - https://gerrit.wikimedia.org/r/162357 (owner: Ejegg) [19:12:24] (CR) Ejegg: [V: 2] Add tests for Gateway_Form [extensions/DonationInterface] (deploy-payments_1.22) - https://gerrit.wikimedia.org/r/162351 (owner: Ejegg) [19:13:04] (CR) Ejegg: [V: 2] function signature glitch [extensions/DonationInterface] (deploy-payments_1.22) - https://gerrit.wikimedia.org/r/162355 (owner: Ejegg) [19:55:42] hey ejegg! [19:55:51] Aw, I was just about to do that. [19:55:52] Hi ccogdill [19:56:09] K4 - ready to deploy DI updates? [19:56:43] ejegg: I'm ready to hover while you do it. :p [19:56:58] right on [19:57:28] You've got the last commit treeish? [19:57:35] Or, rather, the last deployed stable thing? [19:59:41] Guh. I hate this amazon error. [19:59:50] Stupid log noise. [20:01:48] ejegg: Did you check to see if there were any settings changes that need to go out? [20:02:29] Oh, didn't do that. Where would that be? [20:02:47] Ah, usually just in mingle cards. [20:03:15] ok, let me doublecheck the pending deploy ones [20:03:19] k [20:03:48] 99% of the time, it's fine anyway... we're supposed to -1 commits that *require* weird deploys. [20:04:04] yeah, nothing I can see [20:04:20] Groovy. Usually a good idea to check anyway. [20:05:00] Oops, I need to do the submodule bump [20:05:24] heh [20:05:54] The one time I genuinely thought I was going to go crazy at work, it was that. :D [20:06:11] WHY IS THE CODE THE SAME, I TOTALL... oh. [20:06:35] heh [20:06:58] Even worse, I'd done payments deploys probably 100 times at that point. [20:08:59] just waiting on zuul to submit [20:10:24] ejegg: Was there anything in there that wasn't also in mingle? [20:11:41] 'function signature glitch' - awight fixed amazon's xml override to match the change i made for encoding mangling [20:12:14] cool [20:12:50] ok, submodule updated. continuing... [20:14:45] got currently deployed rev id copied down... [20:16:14] ejegg: www-staging? [20:16:26] oh shoot, that's on 1.23 [20:16:34] ...aw. [20:16:41] Well... forget it, then. [20:16:50] These are low-risk. [20:18:58] did the GatewayForm->GatewayPage change not get deployed last time? I thought that was in the previous deploy [20:19:08] but the code update shows that file being created [20:19:18] checking log [20:20:32] ejegg: No idea. [20:21:28] huh. It all looks fine [20:21:41] What code did you update? [20:21:52] payments-wiki [20:21:59] Hurmf. [20:22:01] was it supposed to be the other one? [20:22:07] No, that is the right now. [20:22:09] *one [20:22:13] weird typo. [20:22:15] ok [20:22:37] Uh, I thought maybe it was the DonationInterface checkout that goes to the civi box, and doesn't get updated much. [20:23:10] err, I may have run the update-code on that by mistake first. [20:23:13] will reset that [20:23:21] Ha, that's probably a good idea. [20:23:42] fortunately i took down the prev revision for that too [20:24:30] ok, that's back to what it was [20:24:43] and about to rsync the payments-wiki [20:24:54] Do it. :) [20:25:07] done! [20:25:24] let's see if it's still happy [20:26:11] Payments are still going through... [20:26:24] And there isn't anything especially odd in the payments error log that it wasn't doing before. [20:26:33] hidden country field now exists in non-us worldpay form [20:26:46] I was about to ask how the WP form looks now. [20:26:59] Logos are right [20:28:00] How about the spinning forever issue? [20:28:33] aww, phooey, bunch of 404s getting scripts on that page [20:28:51] eee [20:29:30] Hum. Seeing something almost certainly unrelated, though. [20:31:35] ohhh, that was with debug=true [20:31:45] * K4-713 raises eyebrow [20:31:56] without it, a cc failure is correctly rejected with 'Your transaction could not be accepted' [20:32:07] Woo! [20:32:15] So, no longer spinning off into the void forever. [20:32:20] yay! [20:33:55] Okay, so... if you just keep tailing the error log for about... 45 minutes, we can call it good. :) [20:34:00] OK, cool! [20:34:06] AU states now appear too [20:34:11] Awesome. [20:34:21] meganhernandez: You there? [20:35:45] hi K4-713 yes [20:35:50] Hello! [20:35:56] but just broke a glass of water everywhere [20:36:01] Oh no! [20:37:07] what’s up K4-713 ? [20:38:10] When you're done dealing with that, ejegg just deployed some things to payments that I think you were interested in. [20:39:10] france? [20:41:09] Yeah, it doesn't spin forever and the logos should be right now. [20:41:24] Also, states in Australia, and... ejegg: Anything else meganhernandez would want to know about? [20:41:43] hmm, think that was it! [20:41:49] meganhernandez: Still can't actually run WP until I conquer this audit script, though. [20:42:38] ejegg: You should move the mingle cards. :) [20:42:49] oh yes, will do! [20:47:08] awesome, thank you guys! [20:47:35] sorry for the delay, little bits of glass everywhere [20:47:44] megan in slippers. [20:50:25] can you email the links so i can check them tomorrow? [21:30:43] ejegg: AndyRussG: Any objection if we all do updates over email today? [21:31:21] email is fine by me [21:31:33] Cool. It's getting weird over here. [21:31:36] :) [21:34:18] K4-713: ejegg: fine by me too [21:34:30] Cool. Thanks, everybody. [21:34:31] It's always weird here [21:34:34] np :) [21:34:44] AndyRussG: True, but this is standing out for some reason. [21:35:05] Flying ninja unicorns? [21:35:34] That doesn't sound that unusual [21:36:05] Yeah, I might not even notice that. [21:36:39] Whoa, things really are weird then [21:37:25] marktraceur: you're in Las Vegas so it doesn't count ;D [21:37:52] Apparently [21:38:12] AndyRussG: But I have some experience with FR-tech SF-based weirdness, so... [21:54:37] marktraceur: what happens if you mix SF-FR-tech weirdness with Vegas everyday life weirdness? [21:55:53] Hangovers. [21:59:21] more hangovers* [21:59:29] :p