[00:47:04] (03PS1) 10Eileen: Merge branch 'master' of ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm into deployment [wikimedia/fundraising/crm] (deployment) - 10https://gerrit.wikimedia.org/r/1051490 [00:47:17] (03CR) 10Eileen: [C:03+2] Merge branch 'master' of ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm into deployment [wikimedia/fundraising/crm] (deployment) - 10https://gerrit.wikimedia.org/r/1051490 (owner: 10Eileen) [00:48:01] (03Merged) 10jenkins-bot: Merge branch 'master' of ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm into deployment [wikimedia/fundraising/crm] (deployment) - 10https://gerrit.wikimedia.org/r/1051490 (owner: 10Eileen) [00:48:48] !log civicrm upgraded from 6e03cff2 to 84d6f5d1 [00:48:49] Logged the message at https://wikitech.wikimedia.org/wiki/Server_Admin_Log [01:04:15] (03CR) 10Eileen: "recheck" [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1051474 (https://phabricator.wikimedia.org/T365415) (owner: 10Ejegg) [01:04:37] (03CR) 10Eileen: "recheck" [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1051476 (https://phabricator.wikimedia.org/T365415) (owner: 10Ejegg) [01:05:28] (03CR) 10Eileen: [C:03+2] Add log line for cancel autorescue request [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1051355 (owner: 10Damilare Adedoyin) [01:12:55] (03PS2) 10Eileen: Remove some good ideas [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1051482 (https://phabricator.wikimedia.org/T365415) [01:12:56] (03PS2) 10Eileen: Load the message object in the parent function & pass around [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1051483 (https://phabricator.wikimedia.org/T365415) [01:12:56] (03PS2) 10Eileen: Move retrieval of PaymentToken data to the message class [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1051484 (https://phabricator.wikimedia.org/T365415) [01:18:06] (03PS1) 10Eileen: Decommission wmf_civicrm_get_default_location_type_id [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1051492 (https://phabricator.wikimedia.org/T365415) [01:19:55] (03PS1) 10Eileen: Simplify country look up in test [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1051493 (https://phabricator.wikimedia.org/T365415) [01:25:59] (03Merged) 10jenkins-bot: Delete unused function [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1051474 (https://phabricator.wikimedia.org/T365415) (owner: 10Ejegg) [01:26:20] (03Merged) 10jenkins-bot: Delete reference to deleted file [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1051476 (https://phabricator.wikimedia.org/T365415) (owner: 10Ejegg) [01:28:02] (03Merged) 10jenkins-bot: Add log line for cancel autorescue request [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1051355 (owner: 10Damilare Adedoyin) [01:35:03] (03PS1) 10Eileen: Remove obsolete call to legacy function from test set up [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1051495 (https://phabricator.wikimedia.org/T365415) [01:35:05] (03PS1) 10Eileen: Move wmf_civicrm_get_direct_mail_field_option_id to only caller [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1051496 (https://phabricator.wikimedia.org/T365415) [01:35:06] (03PS1) 10Eileen: Fold function into only caller [wikimedia/fundraising/crm] - 10https://gerrit.wikimedia.org/r/1051497 (https://phabricator.wikimedia.org/T365415) [11:30:33] 03Fundraising Sprint: meow(), 06Fundraising-Backlog, 07Epic, 07payments-orchestration: Gravy - Ensure donations are consumed into CiviCRM with the right parameters - https://phabricator.wikimedia.org/T368039#9949026 (10Damilare) a:03Damilare [11:59:37] 03Fundraising Sprint: meow(), 06Fundraising-Backlog, 07Epic, 07payments-orchestration: Gravy - Ensure donations are consumed into CiviCRM with the right parameters - https://phabricator.wikimedia.org/T368039#9949122 (10Damilare) a:05Damilare→03None [12:04:31] (03PS13) 10Damilare Adedoyin: Gravy approve payment request, mapping, and response [wikimedia/fundraising/SmashPig] - 10https://gerrit.wikimedia.org/r/1043745 (https://phabricator.wikimedia.org/T367112) [12:04:53] 03Fundraising Sprint: meow(), 06Fundraising-Backlog, 07Epic, 07payments-orchestration: Gravy - Import donations to CIviCRM - https://phabricator.wikimedia.org/T368039#9949160 (10jgleeson) a:03jgleeson [12:05:09] 03Fundraising Sprint: meow(), 06Fundraising-Backlog, 07Epic, 07payments-orchestration: Gravy - Import donations to CIviCRM - https://phabricator.wikimedia.org/T368039#9949158 (10jgleeson) [12:06:16] (03PS20) 10Damilare Adedoyin: Create gravy special page and load components [extensions/DonationInterface] - 10https://gerrit.wikimedia.org/r/1040198 (https://phabricator.wikimedia.org/T364508) [12:08:04] (03CR) 10CI reject: [V:04-1] Create gravy special page and load components [extensions/DonationInterface] - 10https://gerrit.wikimedia.org/r/1040198 (https://phabricator.wikimedia.org/T364508) (owner: 10Damilare Adedoyin) [12:14:46] 14Fundraising Sprint: justWork(), 03Fundraising Sprint: kevinToldMeToCallThis(), 06Fundraising-Backlog: Add dLocal support to Gr4vy POC - https://phabricator.wikimedia.org/T361892#9949184 (10jgleeson) 05Declined→03Resolved [12:16:29] 06Fundraising-Backlog, 07Epic, 07payments-orchestration: Map Gr4vy AVS and CVV risk scores on Smashpig - https://phabricator.wikimedia.org/T369161 (10Damilare) 03NEW [15:34:01] 06Fundraising-Backlog: refund process question - India - https://phabricator.wikimedia.org/T369094#9950104 (10MBeat33) dLocal's current explanation is that the funds were debited from the donor's bank but did not reach the payment processor. We've asked them to look into how any such transactions reach our CRM a... [15:37:09] damilare: I think we might have to rethink how we're pulling in the gr4vy-php package to get it to work [15:37:42] ohh, how do you mean? [15:39:05] so currently it's included one the smashpig side using composers custom 'repositories' config block as advised in the gravy docs [15:39:15] on* not one [15:40:02] but for that to work with payments, and install the smashpig package dependecy, I think it also has to be defined on the payments composer.json as documented here Vhttps://getcomposer.org/doc/articles/troubleshooting.md#i-have-a-dependency-which-contains-a-repositories-definition-in-its-composer-json-but-it-seems-to-be-ignored- [15:40:28] ejegg|away: does something similar for his amzn fork [15:41:19] the only way I could the gr4vy lib loading was to add the package to payments [15:41:42] trying composer update/install --with-all-dependencies also didn't work due to the custom repo [15:42:02] but it looks like we might not even need that custom repo as gr4vy have now added the package to packageist [15:42:14] https://packagist.org/packages/gr4vy/gr4vy-php [15:45:36] did you add it to the payments composer file locally when testing damilare ? [15:50:59] jgleeson: no I didn't [15:51:44] how were you adding the smashpig lib to your payments src? [15:51:48] but I linked DI to the smashpig dir using the composer json [15:52:33] It helped fix the mount weirdness and also downloading the required packages for dependencies [15:52:51] did you push that up? [15:52:54] I'd push it up in a patch for you to view [15:53:00] no I didn't [15:53:06] try it woithout that [15:53:11] it doesn't work at current [15:54:01] composer install just ignores the gravy require [15:54:05] yeah I imagine it wouldn't since we don't normally install dependencies on smashpig [15:54:12] so when you eventually get the page loading it crashes [15:54:53] but I think this scenario is only because of the way we link the projects [15:55:02] locally I mean [15:55:03] composer merge will pull in smashpig dependencies [15:55:25] if we create a tag and do a composer install, it should pull the smashpig deps [15:56:47] (03PS1) 10Damilare Adedoyin: DO NOT MERGE: linking DI with the smashpig repo to install deps and prevent losing the directory on composer install of a tag [extensions/DonationInterface] - 10https://gerrit.wikimedia.org/r/1051796 [15:56:47] I don't think it will at current due to the respositories config limitation [15:57:11] currently we have to locally run composer install and add the packages to the vendor repo [15:57:27] that's what gets deployed live. i don't think we run composer in live [15:57:53] (03CR) 10CI reject: [V:04-1] DO NOT MERGE: linking DI with the smashpig repo to install deps and prevent losing the directory on composer install of a tag [extensions/DonationInterface] - 10https://gerrit.wikimedia.org/r/1051796 (owner: 10Damilare Adedoyin) [15:58:24] this patch shows how I linked smashpig to di to get the deps into payments. [15:59:09] if you pull this patch down and run composer install, you'd find the gr4vy dep directory in payments vendor [15:59:12] ok I guess it might be worth adding notes to the phab task then how to review if we wanna use thast approach as it's untestable in its current state [15:59:42] I think you might be able to achieve the same thing as that patch using this tool https://gerrit.wikimedia.org/r/c/wikimedia/fundraising/dev/+/1046738 which also points to a gerrit patch version of SP [16:00:31] but that still won't install the gr4vy package in the payments vendor dir, according to the composer docs [16:00:44] as the respositories block isn't in the root in that setup [16:00:55] root meaning the payments composer.json [16:02:09] ahh this actually adds the gr4vy dir to the vendor directory without having to modify the root [16:10:38] that might work for testing but I think to be able to install payments locally and pull in the gr4vy repo, we'll need to either use the repo config in the root or get rid of the repo block all together as it looks like we don't need it anymore (not following the docs) [16:34:08] Cool, I'd test that locally [16:48:51] (03PS2) 10Damilare Adedoyin: DO NOT MERGE: linking DI with the smashpig repo to install deps and prevent losing the directory on composer install of a tag [extensions/DonationInterface] - 10https://gerrit.wikimedia.org/r/1051796 [16:49:11] I added test instructions on the patch ^^ [16:49:54] (03CR) 10CI reject: [V:04-1] DO NOT MERGE: linking DI with the smashpig repo to install deps and prevent losing the directory on composer install of a tag [extensions/DonationInterface] - 10https://gerrit.wikimedia.org/r/1051796 (owner: 10Damilare Adedoyin) [16:50:21] jgleeson: I got this error when running the smashpig script: *** Fetching patchset/revision 1043745/ [16:50:22] fatal: invalid refspec 'refs/changes/45/1043745/' [16:50:24] Failed to apply the patch set. [17:02:00] huh lemme try it [17:14:57] hmm [17:14:59] Cloning into '/var/www/html/vendor/wikimedia/smash-pig'... [17:15:01] fatal: unable to access 'https://gerrit.wikimedia.org/r/wikimedia/fundraising/SmashPig/': Could not resolve host: gerrit.wikimedia.org [17:15:03] *** Fetching patchset/revision 1047179/1 [17:15:07] temp blip maybe [17:15:13] I used it earlier with your patch and it worked fine [17:15:46] are you also getting cannot resolve host? [17:19:17] no it's actually just cloning to the dir [17:19:40] *** Patch Set latest revision: [17:19:41] *** Backing up existing SmashPig library... [17:19:43] *** Cloning the SmashPig repository to vendor/wikimedia/smash-pig [17:19:45] Cloning into '/var/www/html/vendor/wikimedia/smash-pig'... [17:19:47] remote: Counting objects: 22, done [17:23:21] ohh I see it wasn't able to pull the latest revision on line 13 [17:23:32] I wonder why though [17:23:48] are you passing /13? [17:23:56] nope [17:24:07] weird [17:24:08] ahh I guess grep is different [17:24:11] grep: invalid option -- P [17:24:13] usage: grep [-abcdDEFGHhIiJLlMmnOopqRSsUVvwXxZz] [-A num] [-B num] [-C[num]] [17:24:15] [-e pattern] [-f file] [--binary-files=value] [--color=when] [17:24:17] [--context[=num]] [--directories=action] [--label] [--line-buffered] [17:24:19] [--null] [pattern] [file ...] [17:24:50] you used it to fetch the id on line 13 [17:25:11] let see which would be applicable in place of P here [17:26:55] looks like gerrit was down#. [17:27:06] working for me now [17:27:32] ohh so this works, LATEST_REVISION=$(curl -s "https://gerrit.wikimedia.org/r/changes/$PATCH_ID/detail" | grep -o '"_revision_number":[^}]*' | sed 's/"_revision_number"://g' | sort -n | tail -n 1) [17:27:41] I took out the P from -oP [17:27:55] I wonder if that's a mac thing [17:28:04] P just enabled Perl regexes [17:28:09] yep looks like it is [17:28:10] maybe -E [17:28:36] without the P it got the latest ID [17:28:38] https://phabricator.wikimedia.org/P65757 [17:28:43] let me try the E [17:29:12] yh that's what I got after removing the P [17:29:52] ok E works too [17:31:25] I'll change to extended. I guess I just use Perl out of habit but good to know it's not supported for mac [17:31:38] thanks for testing! [17:31:53] no p, let me now test the payments bit [17:34:12] (03PS14) 10Damilare Adedoyin: Gravy approve payment request, mapping, and response [wikimedia/fundraising/SmashPig] - 10https://gerrit.wikimedia.org/r/1043745 (https://phabricator.wikimedia.org/T367112) [17:34:28] (03CR) 10CI reject: [V:04-1] Gravy approve payment request, mapping, and response [wikimedia/fundraising/SmashPig] - 10https://gerrit.wikimedia.org/r/1043745 (https://phabricator.wikimedia.org/T367112) (owner: 10Damilare Adedoyin) [17:36:44] (03PS15) 10Damilare Adedoyin: Gravy approve payment request, mapping, and response [wikimedia/fundraising/SmashPig] - 10https://gerrit.wikimedia.org/r/1043745 (https://phabricator.wikimedia.org/T367112) [17:36:44] (03PS5) 10Jgleeson: Add script to safely checkout smashpig patch to payments [wikimedia/fundraising/dev] - 10https://gerrit.wikimedia.org/r/1046738 (https://phabricator.wikimedia.org/T367798) [17:37:46] jgleeson: looks checking out the smashpig in the vendor directory didn't work as it didn't add the gravy deps to the payments vendor dir. [17:38:02] were you able to try out the composer json in that patch I put up? [17:39:28] (03PS21) 10Damilare Adedoyin: Create gravy special page and load components [extensions/DonationInterface] - 10https://gerrit.wikimedia.org/r/1040198 (https://phabricator.wikimedia.org/T364508) [17:39:40] (03PS22) 10Damilare Adedoyin: Create gravy special page and load components [extensions/DonationInterface] - 10https://gerrit.wikimedia.org/r/1040198 (https://phabricator.wikimedia.org/T364508) [17:40:41] I updated the commit message to add the test instructions ^^ [17:41:54] no I haven't tried that yet I got it working the other way [17:41:56] (03CR) 10CI reject: [V:04-1] Create gravy special page and load components [extensions/DonationInterface] - 10https://gerrit.wikimedia.org/r/1040198 (https://phabricator.wikimedia.org/T364508) (owner: 10Damilare Adedoyin) [17:42:18] I'm just reinstalling payments [17:42:32] forgot how long it takes to pull core down [17:49:44] yep it does take a while [18:08:21] (03CR) 10Jforrester: "Generally we shouldn't cherry-pick individual patches to this branch, but create a merge commit." [extensions/CentralNotice] (wmf_deploy) - 10https://gerrit.wikimedia.org/r/1048056 (https://phabricator.wikimedia.org/T343994) (owner: 10Umherirrender) [18:21:53] (03CR) 10Jgleeson: [V:03+2 C:03+2] Enable gravy special pages in config [wikimedia/fundraising/dev] - 10https://gerrit.wikimedia.org/r/1046709 (owner: 10Damilare Adedoyin) [19:09:53] meet seems to be down for me [22:04:34] (03Abandoned) 10Umherirrender: Use OutputPage::setPageTitleMsg() instead of ::setPageTitle() [extensions/CentralNotice] (wmf_deploy) - 10https://gerrit.wikimedia.org/r/1048056 (https://phabricator.wikimedia.org/T343994) (owner: 10Umherirrender)