[00:38:35] (03Abandoned) 10Eileen: [WIP] - test SHOULD fail on this [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/711017 (owner: 10Eileen) [01:13:01] (03PS1) 10Eileen: Add api to fill wmf_donor table for 2021 donations [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/711024 (https://phabricator.wikimedia.org/T280595) [01:16:41] (03CR) 10jerkins-bot: [V: 04-1] Add api to fill wmf_donor table for 2021 donations [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/711024 (https://phabricator.wikimedia.org/T280595) (owner: 10Eileen) [02:08:46] (03PS1) 10Eileen: Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment [wikimedia/fundraising/crm] (deployment) - 10https://gerrit.wikimedia.org/r/711027 [02:08:58] (03CR) 10Eileen: [C: 03+2] Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment [wikimedia/fundraising/crm] (deployment) - 10https://gerrit.wikimedia.org/r/711027 (owner: 10Eileen) [02:13:30] 10Fundraising-Backlog, 10fundraising Sprint NULL calorie food cart, 10fundraising sprint onion pit, 10FR-AutoTY-Email, 10Patch-For-Review: Production of new Auto Recurring Failure Email (multilingual) - https://phabricator.wikimedia.org/T285375 (10Eileenmcnaughton) @CDenes_WMF the hebrew version is also... [02:19:48] 10Fundraising-Backlog, 10Wikimedia-Fundraising-CiviCRM, 10fundraising Sprint NULL calorie food cart, 10fundraising sprint onion pit, and 2 others: Recurring donors segmentation criteria Civi/Acoustic - https://phabricator.wikimedia.org/T283798 (10Eileenmcnaughton) a:03Eileenmcnaughton [02:45:13] 10Fundraising-Backlog, 10Wikimedia-Fundraising-CiviCRM, 10fundraising Sprint NULL calorie food cart, 10fundraising sprint onion pit, and 2 others: Recurring donors segmentation criteria Civi/Acoustic - https://phabricator.wikimedia.org/T283798 (10Eileenmcnaughton) @KHaggard - what does 'Annual Fund' mean?... [05:57:32] 10Fundraising-Backlog, 10Wikimedia-Fundraising-CiviCRM, 10fundraising Sprint NULL calorie food cart, 10fundraising sprint onion pit, and 2 others: Recurring donors segmentation criteria Civi/Acoustic - https://phabricator.wikimedia.org/T283798 (10MSuijkerbuijk_WMF) Thanks @KHaggard for the note about timel... [06:41:39] (03PS1) 10Eileen: Fields update for acoustic export [wikimedia/fundraising/tools] - 10https://gerrit.wikimedia.org/r/711093 (https://phabricator.wikimedia.org/T283798) [06:42:55] (03CR) 10jerkins-bot: [V: 04-1] Fields update for acoustic export [wikimedia/fundraising/tools] - 10https://gerrit.wikimedia.org/r/711093 (https://phabricator.wikimedia.org/T283798) (owner: 10Eileen) [06:45:44] 10Fundraising-Backlog, 10Wikimedia-Fundraising-CiviCRM, 10fundraising Sprint NULL calorie food cart, 10fundraising sprint onion pit, and 3 others: Recurring donors segmentation criteria Civi/Acoustic - https://phabricator.wikimedia.org/T283798 (10Eileenmcnaughton) @KHaggard also - I think we should add the... [06:46:47] (03PS2) 10Eileen: Fields update for acoustic export [wikimedia/fundraising/tools] - 10https://gerrit.wikimedia.org/r/711093 (https://phabricator.wikimedia.org/T283798) [06:48:55] (03CR) 10jerkins-bot: [V: 04-1] Fields update for acoustic export [wikimedia/fundraising/tools] - 10https://gerrit.wikimedia.org/r/711093 (https://phabricator.wikimedia.org/T283798) (owner: 10Eileen) [06:57:22] (03PS3) 10Eileen: Fields update for acoustic export [wikimedia/fundraising/tools] - 10https://gerrit.wikimedia.org/r/711093 (https://phabricator.wikimedia.org/T283798) [06:57:52] (03PS4) 10Eileen: Fields update for acoustic export [wikimedia/fundraising/tools] - 10https://gerrit.wikimedia.org/r/711093 (https://phabricator.wikimedia.org/T283798) [06:59:24] (03CR) 10jerkins-bot: [V: 04-1] Fields update for acoustic export [wikimedia/fundraising/tools] - 10https://gerrit.wikimedia.org/r/711093 (https://phabricator.wikimedia.org/T283798) (owner: 10Eileen) [13:02:01] 10Fundraising-Backlog, 10fundraising Sprint NULL calorie food cart, 10fundraising sprint onion pit, 10FR-AutoTY-Email, 10Patch-For-Review: Production of new Auto Recurring Failure Email (multilingual) - https://phabricator.wikimedia.org/T285375 (10MBeat33) Thank you, Eileen. I sent a copy of the HE trans... [13:36:22] 10Fundraising-Backlog, 10Wikimedia-Fundraising-CiviCRM, 10fundraising sprint onion pit, 10fundraising-tech-ops: Request for fr-tech-ops to Update civi staging databases back in sync with production - https://phabricator.wikimedia.org/T287632 (10Jgreen) 05Open→03Resolved Finally completed in about 55H... [14:04:36] so it looks like there's a forgetme job stuck [14:04:56] https://www.mediawiki.org/wiki/Fundraising_tech/Failmail_zoo#Check_forget_me_processing_failed_with_code_1 [14:16:42] 10Fundraising-Backlog, 10Wikimedia-Fundraising-CiviCRM, 10fundraising Sprint NULL calorie food cart, 10fundraising sprint onion pit, and 3 others: Recurring donors segmentation criteria Civi/Acoustic - https://phabricator.wikimedia.org/T283798 (10KHaggard) Thanks for sharing your list @Eileenmcnaughton - I... [14:30:45] oh hmmm [14:30:46] (03CR) 10Jgleeson: [C: 03+2] "This change looks good to me. I noticed that Dami had updated 51 files vs the 68 mentioned in the description but after looking into that " [extensions/DonationInterface] - 10https://gerrit.wikimedia.org/r/710535 (https://phabricator.wikimedia.org/T285499) (owner: 10Damilare Adedoyin) [14:30:54] hi fr-tech ejegg :) [14:33:16] hi ejegg AndyRussG fr-tech :) [14:33:23] (03Merged) 10jenkins-bot: All non english soft descriptors should be the DR email address [extensions/DonationInterface] - 10https://gerrit.wikimedia.org/r/710535 (https://phabricator.wikimedia.org/T285499) (owner: 10Damilare Adedoyin) [14:35:12] :) [14:35:32] 10Fundraising-Backlog, 10fundraising-tech-ops: SSL cert for my PC so I can access Superset - https://phabricator.wikimedia.org/T288246 (10Jgreen) 05Declined→03Resolved [14:50:21] hi AndyRussG jgleeson|brb & the rest of fr-tech! [14:54:40] :) [15:15:21] 10Fundraising-Backlog, 10fundraising Sprint NULL calorie food cart, 10fundraising sprint onion pit, 10FR-AutoTY-Email, 10MW-1.37-notes (1.37.0-wmf.19; 2021-08-16): All non english soft descriptors should be the DR email address: donate@wikimedia.org - https://phabricator.wikimedia.org/T285499 (10Raymond)... [17:54:52] (03PS1) 10Sahilgrewalhere: Merge branch 'master' of ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralNotice [extensions/CentralNotice] - 10https://gerrit.wikimedia.org/r/711178 [17:54:54] (03PS1) 10Sahilgrewalhere: selenium: Update README.md file [extensions/CentralNotice] - 10https://gerrit.wikimedia.org/r/711179 (https://phabricator.wikimedia.org/T282237) [17:55:41] (03Abandoned) 10Sahilgrewalhere: Merge branch 'master' of ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralNotice [extensions/CentralNotice] - 10https://gerrit.wikimedia.org/r/711178 (owner: 10Sahilgrewalhere) [17:58:02] fr-tech just on the subject of general cleanup, anyone feel like reviewing and maybe +2'ing this one? thanks in advance!! https://gerrit.wikimedia.org/r/c/mediawiki/extensions/DonationInterface/+/708645 [18:02:37] looking AndyRussG [18:09:16] thx! [18:12:43] AndyRussG: that test is failing for me [18:12:50] on fundraising-dev and fr-tech-docker [18:12:57] before and after the patch [18:13:12] does it pass for you locally? [18:13:28] docker-compose exec -w "/var/www/html/" payments php tests/phpunit/phpunit.php --filter testDoPaymentSuccess [18:13:41] I'm running that on fundraising-dev [18:13:57] sorry, when I say that test I mean one of the tests, the amazon one [18:14:21] 1) AmazonApiTest::testDoPaymentSuccess [18:14:24] TypeError: Argument 1 passed to SmashPig\PaymentProviders\Amazon\Tests\AmazonTestConfiguration::instance() must be an instance of SmashPig\Core\GlobalConfiguration, null given, called in /var/www/html/extensions/DonationInterface/tests/phpunit/Adapter/Amazon/AmazonTest.php on line 41 [18:14:26] let's see what's up with this [18:15:14] oh yeah, here's another cleanup one: https://gerrit.wikimedia.org/r/c/mediawiki/extensions/DonationInterface/+/710345 [18:16:59] ejegg: that looks unrelated? [18:17:27] yep, unrelated but also cleans up tests [18:20:08] ah ok [18:21:06] I feel like this test configuration instance thing has come up before [18:23:59] ejegg, AndyRussG does this test pass for you locally `docker-compose exec -w "/var/www/html/" payments php tests/phpunit/phpunit.php --filter AmazonApiTest::testDoPaymentSuccess` [18:25:51] checking [18:25:55] thanks [18:26:55] (03CR) 10Ejegg: [C: 03+1] "It's a clean move! Just one line of a comment that's no longer true with the way you're merging the result rather than passing by referenc" [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/709582 (https://phabricator.wikimedia.org/T280595) (owner: 10Eileen) [18:28:30] 10Fundraising-Backlog, 10Wikimedia-Fundraising-CiviCRM, 10fundraising Sprint NULL calorie food cart, 10fundraising sprint onion pit, and 3 others: Recurring donors segmentation criteria Civi/Acoustic - https://phabricator.wikimedia.org/T283798 (10KHaggard) To follow up on when to deploy this, the best wind... [18:29:09] (03CR) 10Ejegg: [C: 03+2] Move wmf_donor fields to calculated class [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/709583 (https://phabricator.wikimedia.org/T280595) (owner: 10Eileen) [18:32:24] (03CR) 10Ejegg: [C: 03+2] Move constants for roll up years over [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/709627 (https://phabricator.wikimedia.org/T280595) (owner: 10Eileen) [19:01:11] jgleeson: did you pull down the most recent config-private? [19:01:51] nope [19:01:59] is it needed for that patch? [19:02:05] It's needed to get all the tests to pass [19:02:12] ah ok [19:02:23] thx for reviewin'! :) [19:02:32] or at least the DI ones [19:03:06] ejegg: which is the comment line you're referring to in your comment on https://gerrit.wikimedia.org/r/709582 ? [19:03:36] oops, did i not make that inline commetn? [19:05:11] I guess, I don't see it? [19:05:22] I could push up a fix and then we could +2 to get the whole thing out [19:05:23] (03CR) 10Ejegg: [C: 03+1] "oops, forgot to save the comment pointing to which line is now obsolete." [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/709582 (https://phabricator.wikimedia.org/T280595) (owner: 10Eileen) [19:08:29] (03PS4) 10AndyRussG: Move trigger info to own class [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/709582 (https://phabricator.wikimedia.org/T280595) (owner: 10Eileen) [19:09:18] ejegg ^ https://gerrit.wikimedia.org/r/c/wikimedia/fundraising/crm/+/709582/3..4 [19:09:42] (03PS4) 10AndyRussG: Move wmf_donor fields to calculated class [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/709583 (https://phabricator.wikimedia.org/T280595) (owner: 10Eileen) [19:09:49] (03PS2) 10AndyRussG: Move constants for roll up years over [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/709627 (https://phabricator.wikimedia.org/T280595) (owner: 10Eileen) [19:09:57] (03PS3) 10AndyRussG: Add additional fields for totals [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/709628 (https://phabricator.wikimedia.org/T280595) (owner: 10Eileen) [19:09:57] AndyRussG: thanks! [19:10:05] (03PS2) 10AndyRussG: Extract code to get the sql to do an update [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/711020 (https://phabricator.wikimedia.org/T280595) (owner: 10Eileen) [19:10:13] (03PS2) 10AndyRussG: Add api to fill wmf_donor table for 2021 donations [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/711024 (https://phabricator.wikimedia.org/T280595) (owner: 10Eileen) [19:10:21] ejegg: thank you [19:10:24] many rebase click [19:11:19] (03CR) 10Ejegg: [C: 03+2] Move trigger info to own class (031 comment) [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/709582 (https://phabricator.wikimedia.org/T280595) (owner: 10Eileen) [19:12:14] AndyRussG: I pulled down the latest from the private config repo but the test is still failing [19:12:25] on fundrasing-dev [19:12:34] 10Fundraising-Backlog, 10fundraising sprint onion pit, 10FR-Adyen, 10MediaWiki-extensions-DonationInterface: Test Adyen Checkout via CODFW hosts - https://phabricator.wikimedia.org/T287987 (10Ejegg) a:03Ejegg [19:12:53] jgleeson: huh oki lemme try, thx! [19:13:01] AndyRussG: can you run the test directly here using this `docker-compose exec -w "/var/www/html/" payments php tests/phpunit/phpunit.php --filter AmazonApiTest::testDoPaymentSuccess` [19:13:45] this is what I see https://phabricator.wikimedia.org/P16995 [19:14:00] (03CR) 10jerkins-bot: [V: 04-1] Add additional fields for totals [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/709628 (https://phabricator.wikimedia.org/T280595) (owner: 10Eileen) [19:15:11] (03CR) 10jerkins-bot: [V: 04-1] Add api to fill wmf_donor table for 2021 donations [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/711024 (https://phabricator.wikimedia.org/T280595) (owner: 10Eileen) [19:15:39] I debugged it and it looks like the test config isn't getting set right for some reason [19:16:22] pretty sure I've seen this before [19:16:28] pre-docker [19:17:15] (03CR) 10Ejegg: [C: 03+2] Extract code to get the sql to do an update [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/711020 (https://phabricator.wikimedia.org/T280595) (owner: 10Eileen) [19:17:39] ejegg: did you manage to try it? [19:19:13] oh shoot, it says no tests executed in that window [19:19:18] ah, let me switch branches [19:20:19] ejegg: it should be on master [19:20:31] https://github.com/wikimedia/mediawiki-extensions-DonationInterface/blob/d221787b95fcddae045a273be57029bd3ffba79d/tests/phpunit/Adapter/Amazon/AmazonApiTest.php#L22 [19:20:57] right i still had my local on deploy from Thursday [19:22:04] gotcha [19:22:15] it looks like the line that needs to be called is here: https://github.com/wikimedia/mediawiki-extensions-DonationInterface/blob/2f36de3e4c5fa265c73155d82dd2957b1471dbaf/tests/phpunit/DonationInterfaceTestCase.php#L99 [19:22:38] inside DonationInterfaceTestCase [19:22:53] (03Merged) 10jenkins-bot: Move trigger info to own class [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/709582 (https://phabricator.wikimedia.org/T280595) (owner: 10Eileen) [19:23:06] but the AmazonApiTest is extending DonationInterfaceApiTestCase [19:23:40] (03Merged) 10jenkins-bot: Move wmf_donor fields to calculated class [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/709583 (https://phabricator.wikimedia.org/T280595) (owner: 10Eileen) [19:24:01] let's see what xdebug says [19:25:48] jgleeson: yah, i think i see why that might fail in isolation but work in a suite [19:26:18] the DonationInterfaceApiTestCase tearDown calls resetAllEnv [19:26:25] which ends up resetting that context [19:27:14] ahh, and also the onMediaWikiPHPUnitTeststartTest calls it [19:27:15] 0_0 [19:27:25] so that would keep the context set [19:27:47] We should just add that setup line to DonationInterfaceApiTestCase::setUp, right? [19:28:27] yeah that would fix it [19:29:02] (03Merged) 10jenkins-bot: Move constants for roll up years over [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/709627 (https://phabricator.wikimedia.org/T280595) (owner: 10Eileen) [19:29:04] (03Merged) 10jenkins-bot: Extract code to get the sql to do an update [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/711020 (https://phabricator.wikimedia.org/T280595) (owner: 10Eileen) [19:30:29] AndyRussG: looks like there's some work to do to make that test work alone [19:30:39] I'm just trying to run the full AmazonApiTest class [19:30:47] to see if it passes when filtering to that level [19:33:20] which is does not [19:33:23] :| [20:02:14] 10Fundraising Sprint Mandatory corn dogs, 10Fundraising-Backlog, 10fundraising Sprint NULL calorie food cart, 10fundraising sprint onion pit, and 2 others: Adyen Checkout: normalize API error codes - https://phabricator.wikimedia.org/T283307 (10XenoRyet) [20:35:34] (03PS3) 10Eileen: Add api to fill wmf_donor table for 2021 donations [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/711024 (https://phabricator.wikimedia.org/T280595) [20:36:56] hey just noting the acoustic export changes (which I'm still working on) have a time pressure on them since katie is going to be away & changes need to be co-ordinated with her - I'll try to get ready to discuss them in tech talk maybe so we can get them through [20:39:27] 10Fundraising-Backlog, 10MediaWiki-extensions-CentralNotice, 10translatewiki.net: Translation for Central Notice banners needs improvement: please simplify and lower the workload! - https://phabricator.wikimedia.org/T288577 (10DStrine) [20:54:23] (03PS1) 10Jgleeson: Test Fix: Add call to set up smashpig context during API tests. [extensions/DonationInterface] - 10https://gerrit.wikimedia.org/r/711201 [20:58:28] (03PS2) 10Jgleeson: PHPUnit tests: reset globals and use salt in API tests [extensions/DonationInterface] - 10https://gerrit.wikimedia.org/r/708645 (https://phabricator.wikimedia.org/T266088) (owner: 10AndyRussG) [21:00:01] AndyRussG: those tests work for me locally now so I'll push them through [21:00:02] h [21:02:20] just need someone to +2 the minor update to fix the api tests [21:04:45] (03PS4) 10Damilare Adedoyin: Add tax disambiguation clause to Payments Wiki in France [extensions/DonationInterface] - 10https://gerrit.wikimedia.org/r/710364 (https://phabricator.wikimedia.org/T286880) [21:06:52] jgleeson: ah cool fantastic thanks, yeah one sec [21:07:09] damilare: do you wanna do the deployment on our check-in tomorrow instead? It's pretty late for us and I'd rather not rush it so you have a useful recording to refer to for the future. I had hoped to jump on the call shortly after the last one but got distracted putting the kids to bed! [21:07:38] (03CR) 10jerkins-bot: [V: 04-1] Add tax disambiguation clause to Payments Wiki in France [extensions/DonationInterface] - 10https://gerrit.wikimedia.org/r/710364 (https://phabricator.wikimedia.org/T286880) (owner: 10Damilare Adedoyin) [21:07:40] Sure jgleeson, sounds good to me [21:07:45] awesome [21:08:42] (03PS5) 10Eileen: Fields update for acoustic export [wikimedia/fundraising/tools] - 10https://gerrit.wikimedia.org/r/711093 (https://phabricator.wikimedia.org/T283798) [21:09:42] (03CR) 10jerkins-bot: [V: 04-1] Fields update for acoustic export [wikimedia/fundraising/tools] - 10https://gerrit.wikimedia.org/r/711093 (https://phabricator.wikimedia.org/T283798) (owner: 10Eileen) [21:14:52] 10Fundraising-Backlog, 10Wikimedia-Fundraising-CiviCRM, 10fundraising Sprint NULL calorie food cart, 10fundraising sprint onion pit, and 3 others: Recurring donors segmentation criteria Civi/Acoustic - https://phabricator.wikimedia.org/T283798 (10Eileenmcnaughton) @KHaggard that seems OK - I'm just working... [21:17:07] jgleeson ejegg I'm getting this failure locally on the SP API setup test patch: https://paste.toolforge.org/view/07afd16b [21:17:38] (03PS5) 10Damilare Adedoyin: Add tax disambiguation clause to Payments Wiki in France [extensions/DonationInterface] - 10https://gerrit.wikimedia.org/r/710364 (https://phabricator.wikimedia.org/T286880) [21:20:17] (03CR) 10jerkins-bot: [V: 04-1] Add tax disambiguation clause to Payments Wiki in France [extensions/DonationInterface] - 10https://gerrit.wikimedia.org/r/710364 (https://phabricator.wikimedia.org/T286880) (owner: 10Damilare Adedoyin) [21:22:04] AndyRussG: I'm not sure what's up there. When I run your patch across both stacks that test passes for me [21:22:11] same when I run the full suite for DI [21:22:35] jgleeson: yeah I see it's passing CI [21:23:01] hmmm if you're running on the fundraising-dev stack, do you have any local config settings that are not in the repo? [21:23:05] I don't trust CI anymore [21:23:10] heheh good point [21:23:10] lol [21:23:23] I'll debug in [21:23:41] AndyRussG: so I pulled down the latest as of a few hours ago WTR the private-repo config [21:24:15] I looked through the changes for tests and I couldn't see anything that seemed related to this specific test class [21:24:17] I'm just running locally on your patch, not the follow-on one with the changes to reset local variables [21:24:23] *global variables [21:24:28] I can try that [21:26:11] just testing that patch is isolation to rule out me not testing it before [21:26:18] on funraising-dev [21:26:25] ah thanks! [21:26:30] good typo there [21:26:34] FUNraising [21:26:40] hahahah [21:26:54] oh hey I also see it failing AndyRussG [21:26:55] jgleeson: it passes with the follow-on patch [21:26:58] so that must be it [21:27:03] K I'll +2 :) [21:27:14] hmm I'm confused [21:27:24] did changing things make a NEW error? [21:27:35] no I don't think to [21:27:45] I mean I don't know [21:27:55] the original error was it couldn't get the config but after testing my patch is isolation the config is there but it's now showing another bug I think [21:28:28] that might be specific to our locals [21:29:35] jgleeson: I haven't debugged in yet but I'm guessing at least the most recent error on FUNraising dev was from this change not yet being included: https://gerrit.wikimedia.org/r/c/mediawiki/extensions/DonationInterface/+/708645/2/tests/phpunit/DonationInterfaceTestCase.php [21:29:50] the one about the 3ds rules [21:30:11] just guessing because the error said something about redirect [21:30:40] regarding the other error you fixed with AmazonApiTest::testDoPaymentSuccess, I'm not sure what caused that to start appearing [21:30:42] i don't think amazon touches 3DS [21:30:53] oh hmmm I dunno then [21:30:58] so I don't think that should affect them ones [21:31:16] it's possible this has been here all along and we've just not seen it due to the resetEnv thing hiding it [21:31:36] we could confirm this by calling that at the start of the setup [21:31:37] ah right [21:31:53] let's try that, dropping that in the setUp [21:31:54] (03PS6) 10Damilare Adedoyin: Add tax disambiguation clause to Payments Wiki in France [extensions/DonationInterface] - 10https://gerrit.wikimedia.org/r/710364 (https://phabricator.wikimedia.org/T286880) [21:32:23] I feel inclined to just +2 yours at least btw, I don't think there could be any harmful effects of doing so [21:32:25] does that sound ok? [21:33:19] yeah I guess we've still improved things, it's just failing differently now [21:33:32] sounds ok to me [21:33:38] jgleeson: okok cool thanks! [21:34:06] (03CR) 10AndyRussG: [C: 03+2] "Cool thanks!!!!" [extensions/DonationInterface] - 10https://gerrit.wikimedia.org/r/711201 (owner: 10Jgleeson) [21:34:10] (03CR) 10jerkins-bot: [V: 04-1] Add tax disambiguation clause to Payments Wiki in France [extensions/DonationInterface] - 10https://gerrit.wikimedia.org/r/710364 (https://phabricator.wikimedia.org/T286880) (owner: 10Damilare Adedoyin) [21:36:23] (03Merged) 10jenkins-bot: Test Fix: Add call to set up smashpig context during API tests. [extensions/DonationInterface] - 10https://gerrit.wikimedia.org/r/711201 (owner: 10Jgleeson) [21:36:49] (03CR) 10Ejegg: "Can delete some existing code that did almost the same thing (and the $smashPigGlobalConfig property on the DI Api base test)" [extensions/DonationInterface] - 10https://gerrit.wikimedia.org/r/711201 (owner: 10Jgleeson) [21:37:19] oh hah [21:37:22] review collision [21:37:58] ha! [21:38:25] I have an idea, we could create an etherpad... [21:38:51] deja vu! [21:38:56] we could each try to create an etherpad with the same name, simultaneously [21:39:15] ga [21:39:19] h* [21:39:32] also, I wish I'd seen ejegg's review sooner [21:41:09] (03PS7) 10Damilare Adedoyin: Add tax disambiguation clause to Payments Wiki in France [extensions/DonationInterface] - 10https://gerrit.wikimedia.org/r/710364 (https://phabricator.wikimedia.org/T286880) [21:41:18] (03PS1) 10Ejegg: Delete repeated code [extensions/DonationInterface] - 10https://gerrit.wikimedia.org/r/711209 [21:42:49] damilare: hey thanks for doing new versions of the tax deduction change! :) ahh just a quick note, your most recent patch sets from today are not rebased on the latest master branch of DonationInterface [21:43:05] (03CR) 10jerkins-bot: [V: 04-1] Add tax disambiguation clause to Payments Wiki in France [extensions/DonationInterface] - 10https://gerrit.wikimedia.org/r/710364 (https://phabricator.wikimedia.org/T286880) (owner: 10Damilare Adedoyin) [21:43:15] that's why you've been getting failures when you try to open the AdyenCheckout page when DI is on one of those patch sets [21:43:30] (03CR) 10jerkins-bot: [V: 04-1] Delete repeated code [extensions/DonationInterface] - 10https://gerrit.wikimedia.org/r/711209 (owner: 10Ejegg) [21:43:41] it's not a big issue because we can always test using Ingenico [21:44:45] if you want to rebase, there's a fun button for that in the Gerrit UI, but after pushing it you have to pull down locally the latest patch set that that button creates [21:44:58] or also it's fine to rebase locally [21:45:17] strongly recommend running it with '-i' [21:45:39] running what with -i ? [21:45:42] git rebase [21:45:48] ah right [21:46:27] ohh ok, would do that jgleeson and AndyRussG [21:46:30] yeah I've never fully understood all the details of that command, but I have a special way to run it that I figured out years ago and always works for me [21:46:52] damilare: sure! though you should also have permissions for it, if you'd like to try [21:47:25] Sure would love to, can you share it [21:47:41] okok :) [21:47:52] so first checkout master locally [21:47:56] then do git pull --all [21:48:10] then go to the branch where you have your changes [21:48:39] and say git rebase -i --onto master branch-where-you-have-your-changes~1 branch-where-you-have-your-changes [21:49:04] and then when the editor comes up, just save the interactive instructions file as is [21:49:31] (note the ~1 at the end of the second-to-last argument on the rebase command) [21:49:56] (03PS6) 10Eileen: Fields update for acoustic export [wikimedia/fundraising/tools] - 10https://gerrit.wikimedia.org/r/711093 (https://phabricator.wikimedia.org/T283798) [21:50:15] also, if you don't have your changes on a separate local branch, you can set that up locally pretty quickly [21:50:47] Thanks, I think I already do on the patch branch [21:50:59] (03CR) 10jerkins-bot: [V: 04-1] Fields update for acoustic export [wikimedia/fundraising/tools] - 10https://gerrit.wikimedia.org/r/711093 (https://phabricator.wikimedia.org/T283798) (owner: 10Eileen) [21:51:06] ah cool :) [21:52:23] I guess if you like, maybe try the instructions above ^ and if they don't work, if you're going to tech-talk in a bit, we could maybe figure it out there? [21:54:44] (03PS7) 10Eileen: Fields update for acoustic export [wikimedia/fundraising/tools] - 10https://gerrit.wikimedia.org/r/711093 (https://phabricator.wikimedia.org/T283798) [21:55:53] (03CR) 10jerkins-bot: [V: 04-1] Fields update for acoustic export [wikimedia/fundraising/tools] - 10https://gerrit.wikimedia.org/r/711093 (https://phabricator.wikimedia.org/T283798) (owner: 10Eileen) [21:56:33] (03PS8) 10Damilare Adedoyin: Add tax disambiguation clause to Payments Wiki in France [extensions/DonationInterface] - 10https://gerrit.wikimedia.org/r/710364 (https://phabricator.wikimedia.org/T286880) [21:57:48] cool AndyRussG [21:57:52] damilare: yay congrats, that worked! :) :) [21:58:28] (03CR) 10jerkins-bot: [V: 04-1] Add tax disambiguation clause to Payments Wiki in France [extensions/DonationInterface] - 10https://gerrit.wikimedia.org/r/710364 (https://phabricator.wikimedia.org/T286880) (owner: 10Damilare Adedoyin) [22:14:33] (03PS2) 10Ejegg: Delete repeated code [extensions/DonationInterface] - 10https://gerrit.wikimedia.org/r/711209 [22:15:55] (03PS1) 10Jgleeson: WIP: Add ApplePay payments-wiki override setup options [wikimedia/fundraising/dev] - 10https://gerrit.wikimedia.org/r/711216 (https://phabricator.wikimedia.org/T282596) [22:17:19] fr-tech been trying out ways to add the ApplePay payments-wiki override config to fundraising-dev without needing to update the payments docker image. Runnning into a perms problem when adding a new site to the apache sites-available dir but once that's fixed I think it'll be close [22:18:11] but bed for now [22:18:16] ah shoot eod [22:18:20] eod then bed [22:18:22] bye for now [22:20:20] (03CR) 10Jgleeson: [C: 03+2] Delete repeated code [extensions/DonationInterface] - 10https://gerrit.wikimedia.org/r/711209 (owner: 10Ejegg) [22:20:58] thanks jgleeson|away ! [22:26:42] (03Merged) 10jenkins-bot: Delete repeated code [extensions/DonationInterface] - 10https://gerrit.wikimedia.org/r/711209 (owner: 10Ejegg) [22:58:44] !log process-control config revision is 7bdc78073d [22:58:54] Logged the message at https://wikitech.wikimedia.org/wiki/Server_Admin_Log [23:13:15] (03Abandoned) 10Eileen: Switch our debug to 'notice' [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/701994 (owner: 10Eileen) [23:15:38] 10Fundraising-Backlog, 10Wikimedia-Fundraising-CiviCRM: Swap all our process logging to Civi::log('wmf') from watchdog() - https://phabricator.wikimedia.org/T288585 (10Eileenmcnaughton) [23:16:09] 10Fundraising-Backlog, 10Wikimedia-Fundraising-CiviCRM: Swap all our process logging to Civi::log('wmf') from watchdog() - https://phabricator.wikimedia.org/T288585 (10Eileenmcnaughton) [23:17:22] 10Fundraising-Backlog, 10Wikimedia-Fundraising-CiviCRM: Swap all our process logging to Civi::log('wmf') from watchdog() - https://phabricator.wikimedia.org/T288585 (10Eileenmcnaughton) [23:26:56] (03PS1) 10Eileen: Switch to stdout form php:stdout [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/711228 (https://phabricator.wikimedia.org/T288585) [23:34:45] (03PS1) 10Eileen: Comment fix [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/711229 [23:35:05] (03CR) 10Ejegg: [C: 03+2] Comment fix [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/711229 (owner: 10Eileen) [23:45:52] (03Merged) 10jenkins-bot: Comment fix [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/711229 (owner: 10Eileen)