[00:46:32] (PS2) Eileen: Add extension to change contact types [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/398176 (https://phabricator.wikimedia.org/T156193) [00:51:09] (CR) jerkins-bot: [V: -1] Add extension to change contact types [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/398176 (https://phabricator.wikimedia.org/T156193) (owner: Eileen) [01:05:46] (PS1) Eileen: Greetings fixes to support contact type change. [wikimedia/fundraising/crm/civicrm] - https://gerrit.wikimedia.org/r/398188 [01:08:21] (PS1) Eileen: Greetings fixes (already upstreamed) [wikimedia/fundraising/crm/civicrm] - https://gerrit.wikimedia.org/r/398190 (https://phabricator.wikimedia.org/T156193) [02:07:48] (PS3) Eileen: Add extension to change contact types [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/398176 (https://phabricator.wikimedia.org/T156193) [02:10:49] (CR) jerkins-bot: [V: -1] Add extension to change contact types [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/398176 (https://phabricator.wikimedia.org/T156193) (owner: Eileen) [05:50:31] (PS1) Eileen: Fix for CRM-21180: Inline changes to custom fields aren't reflected in custom greetings. [wikimedia/fundraising/crm/civicrm] - https://gerrit.wikimedia.org/r/398210 [12:32:43] Fundraising Sprint Kickstopper, Wikimedia-Fundraising-CiviCRM, FR-Paypal, FR-WMF-Audit: Follow up with Paypal on audit regeneration, enable parser - https://phabricator.wikimedia.org/T167828#3837144 (Aklapper) declined>Open p:Lowest>Unbreak! a:Ejegg [12:32:58] Fundraising Sprint Kickstopper, Wikimedia-Fundraising-CiviCRM, FR-Paypal, FR-WMF-Audit: Follow up with Paypal on audit regeneration, enable parser - https://phabricator.wikimedia.org/T167828#3346054 (Aklapper) [15:09:58] morning AndyRussG ;) [15:18:22] (Abandoned) Mepps: Remove extra connection.end() [wikimedia/fundraising/dash] - https://gerrit.wikimedia.org/r/397901 (owner: Mepps) [15:47:38] hi jgleeson [15:47:42] hi fr-tech! [15:47:52] hi ejegg and jgleeson! [15:48:00] hi mepps! [15:57:31] jgleeson: so, feel like deploying some code today? [15:59:04] hi mepps ejegg :) [16:00:27] ejegg, yep. I'm just adding some test donations to my local queues to test a patch which pulls in the tagged v1.0 stats-collector package [16:01:17] ok, cool [16:03:09] actually ejegg, I can park this for now and we can release the already approved stuff first? [16:03:34] sure [16:04:34] so, first step is to merge master into deployment [16:05:12] we've been doing a bunch of cherry-pick deploys to leave your changes for you to deploy [16:05:27] so the list of unmerged patches is going to be misleading [16:05:52] usually we run 'git log --oneline --reverse deployment..master' [16:06:28] or even 'git log --no-merges --oneline --reverse deployment..master' [16:06:41] and just use that output as the commit message for the merge [16:07:02] we also delete all the tests from the deployment branch [16:07:20] so if there have been any test changes in master, you'll see a conflict [16:07:26] just run git mergetool [16:07:40] and choose 'd' for each test file it asks about [16:08:32] ah, if you want to see all the things that have actually already been deployed, and falsely show up in the list generated by the deployment..master log [16:08:54] you can try this: git log --reverse --oneline a16e56694..deployment [16:10:16] got it [16:21:47] The display is slightly different in my visual mergetool, phpstorm. I can accept incoming changes or keep mine(deployments) local changes so I will do that for the tests. There is a change which is not test related and it is to the wmf_civicrm.module [16:22:20] I'm assuming master should overwrite this as it will always be the latest? [16:22:28] ejegg [16:31:56] fundraising-tech-ops, Mail, Operations: Forward katherine@wikipedia.org and jimmy@wikipedia.org emails to katherine@wikimedia.org and jimmy@wikimedia.org, respectively - https://phabricator.wikimedia.org/T182456#3837912 (faidon) Open>Resolved a:faidon Done! [16:32:57] jgleeson: yep, master should overwrite [16:33:09] what's the change? [16:34:42] ah, it's the removal of the major-gifts specific dedupe code? [16:37:49] I think it might be something to do with the civicrm submodule [16:38:51] more specifically my submodule checkout isn't pointing at right hash [16:39:07] fundraising-tech-ops, Mail, Operations: Forward katherine@wikipedia.org and jimmy@wikipedia.org emails to katherine@wikimedia.org and jimmy@wikimedia.org, respectively - https://phabricator.wikimedia.org/T182456#3837926 (CCogdill_WMF) Thank you! [16:39:17] the changes relate to civi contact addresses [16:39:47] within wmf_civicrm.module [16:40:11] jgleeson: oh, using the API to create those? [16:40:30] yes [16:40:39] shoot, did you make sure your deployment branch was up to date with origin/deployment? [16:40:52] yep I pulled on that [16:40:56] That change is already merged to deployment and on production [16:43:37] I remember having to checkout a specific hash in the civicrm submodule to prevent an update to the civicrm module [16:44:27] huh, the merge should take care of that, i think [16:44:41] unless phpstorm's merging is broken [16:44:49] maybe try command line? [16:44:54] sorry, the merge initially was in cli [16:45:03] but for conflict resolution, I tend to use phpstorm [16:45:11] ah, got it [16:45:15] I've just run submodule update [16:45:25] which pulled in a new version of civicrm [16:45:48] s/civicrm/civicrm submodule/ [16:46:12] yah, makes sense, I did update it in the past couple weeks [16:47:17] so that has updated the local version of the file which git is complaining it has a conflict with [16:47:51] something inside the submodule? [16:48:06] should be able to just blow away the old version [16:48:18] i.e. go into civicrm dir and do a git reset --hard [16:53:58] ok I think I've worked it out [16:54:22] ironically it was the confusing wording of phpstorm which was the problem [16:55:10] so, it looks like I don't want to accept any incoming changes from master to deployment as it will reinstate the test files [16:56:02] sorry that is not entirely true. I do want to accept the change which refers to the civi api updates [16:56:15] as I don't have that in my deployment branch [16:56:54] ok, let's make sure we DO pick up all the non-test stuff! [16:57:08] might be worth screen sharing with you ejegg after stand up just to talk you through what i am seeing and what I think the display means [16:57:27] but that address creation change should already be on the deployment branch [16:57:36] sure thing [17:45:50] Fundraising-Backlog, fundraising-tech-ops, Epic: Overhaul /srv/br - https://phabricator.wikimedia.org/T178953#3838109 (cwdent) [18:19:51] jgleeson: want to screenshare? [18:21:02] sure [18:21:09] will jump in the room now [18:25:56] (PS1) Mepps: Use pool in data.js, don't close pool [wikimedia/fundraising/dash] - https://gerrit.wikimedia.org/r/398305 [18:26:54] (CR) jerkins-bot: [V: -1] Use pool in data.js, don't close pool [wikimedia/fundraising/dash] - https://gerrit.wikimedia.org/r/398305 (owner: Mepps) [18:28:21] (PS2) Mepps: Use pool in data.js, don't close pool [wikimedia/fundraising/dash] - https://gerrit.wikimedia.org/r/398305 [18:28:41] Fundraising-Backlog, Wikimedia-Fundraising-CiviCRM, MediaWiki-extensions-DonationInterface: Check that vendor matches composer.lock during fundraising_code_update - https://phabricator.wikimedia.org/T131313#3838235 (Jgreen) Open>declined I agree this is a good idea, but it should happen durin... [18:29:14] (CR) jerkins-bot: [V: -1] Use pool in data.js, don't close pool [wikimedia/fundraising/dash] - https://gerrit.wikimedia.org/r/398305 (owner: Mepps) [18:29:19] (PS3) Mepps: Use pool in data.js, don't close pool [wikimedia/fundraising/dash] - https://gerrit.wikimedia.org/r/398305 [18:29:25] Fundraising-Backlog, Wikimedia-Fundraising-Banners, MediaWiki-extensions-CentralNotice, Wikimedia-CentralNotice-Administration, and 3 others: 2017 USA banners may freeze your browser for 1-2 seconds - https://phabricator.wikimedia.org/T174267#3838237 (Jgreen) [18:30:13] (CR) jerkins-bot: [V: -1] Use pool in data.js, don't close pool [wikimedia/fundraising/dash] - https://gerrit.wikimedia.org/r/398305 (owner: Mepps) [18:31:01] (PS4) Mepps: Use pool in data.js, don't close pool [wikimedia/fundraising/dash] - https://gerrit.wikimedia.org/r/398305 [18:40:16] (PS1) Jgleeson: a1022cf Updated thank you letter 2ff7aa1 Update civicrm submodule 6de6f26 Apply drupal formatting to file prior to editing a0912fd Comment block tidy ups 0f95f3e Fix checks for existing contributions on Benevity imports to check donor AND matching contrib [wikimedia/fundraising/crm] (deployment) - https://gerrit.wikimedia.org/r/398308 [18:40:59] Fundraising-Backlog: create and/or automate tools for auditing composer-installed php packages - https://phabricator.wikimedia.org/T154509#3838285 (Jgreen) Removing fr-tech-ops because this relates to dev/integration that should happen before the final ship-worthy product in deployment branches on gerrit. [18:47:04] (PS2) Jgleeson: Merging master into deployment [wikimedia/fundraising/crm] (deployment) - https://gerrit.wikimedia.org/r/398308 [18:53:00] (PS1) Jgleeson: Merging master into deployment [wikimedia/fundraising/crm] (deployment) - https://gerrit.wikimedia.org/r/398310 [18:57:53] (PS3) Jgleeson: Merging master into deployment [wikimedia/fundraising/crm] (deployment) - https://gerrit.wikimedia.org/r/398308 [19:04:27] (PS4) Jgleeson: Merging master into deployment [wikimedia/fundraising/crm] (deployment) - https://gerrit.wikimedia.org/r/398308 [19:10:06] (CR) Ejegg: [C: 2] Merging master into deployment [wikimedia/fundraising/crm] (deployment) - https://gerrit.wikimedia.org/r/398308 (owner: Jgleeson) [19:11:01] (Merged) jenkins-bot: Merging master into deployment [wikimedia/fundraising/crm] (deployment) - https://gerrit.wikimedia.org/r/398308 (owner: Jgleeson) [19:26:31] (PS1) Jgleeson: Add stats-collector library [wikimedia/fundraising/crm/vendor] - https://gerrit.wikimedia.org/r/398317 [19:27:28] (CR) Jgleeson: [V: 2 C: 2] "Looks good" [wikimedia/fundraising/crm/vendor] - https://gerrit.wikimedia.org/r/398317 (owner: Jgleeson) [19:29:14] (PS1) Jgleeson: Updated vendor submodule [wikimedia/fundraising/crm] (deployment) - https://gerrit.wikimedia.org/r/398318 [19:30:14] (CR) Jgleeson: [C: 2] Updated vendor submodule [wikimedia/fundraising/crm] (deployment) - https://gerrit.wikimedia.org/r/398318 (owner: Jgleeson) [19:31:43] Fundraising Sprint Winter Wanderland, Fundraising-Backlog, fundraising-tech-ops: Civi credential for new Engage user - https://phabricator.wikimedia.org/T181537#3838402 (cwdent) Open>Resolved I see she has logged in so closing, reopen if problems [19:32:22] (Merged) jenkins-bot: Add stats-collector library [wikimedia/fundraising/crm/vendor] - https://gerrit.wikimedia.org/r/398317 (owner: Jgleeson) [19:32:24] (Merged) jenkins-bot: Updated vendor submodule [wikimedia/fundraising/crm] (deployment) - https://gerrit.wikimedia.org/r/398318 (owner: Jgleeson) [19:58:22] !log Temporarily disabled donations queue consume service and thank you mailer service [19:58:32] Logged the message at https://wikitech.wikimedia.org/wiki/Server_Admin_Log [20:02:14] !log updated civicrm from 798e24671b to 1086291bb3 [20:02:31] Logged the message at https://wikitech.wikimedia.org/wiki/Server_Admin_Log [20:28:03] !log turned back on donations queue consume service and thank you mailer service [20:28:13] Logged the message at https://wikitech.wikimedia.org/wiki/Server_Admin_Log [20:31:49] fundraising-tech-ops: fix frack puppet's motd adjuster for jessie hosts - https://phabricator.wikimedia.org/T170343#3838519 (Jgreen) Open>declined actually this this seems to work fine now, maybe it wasn't ever an issue... [20:43:13] fundraising-tech-ops: Excessive sysloggin' on civi1001 - https://phabricator.wikimedia.org/T182442#3838553 (cwdent) Open>Resolved a:cwdent Jeff got rid of /var/log/messages, so there is no longer the duplication. The debug file can get big on busy days, but filtering in PHP would probably be mor... [20:45:27] Fundraising-Backlog, fundraising-tech-ops: Remove build scaffolding from process-control - https://phabricator.wikimedia.org/T163759#3838564 (cwdent) Open>Resolved a:cwdent I don't remember what happened but last time I built p-c I didn't have to do this. [21:33:59] fr-tech can anyone check this one-liner? https://gerrit.wikimedia.org/r/398107 [21:34:10] i'll take a look ejegg! [21:34:14] oh, one-liner plus pulling in tests [21:34:18] beat me to it. [21:34:19] thanks mepps! [21:34:46] (CR) Ejegg: "still looks like a stray end()" (1 comment) [wikimedia/fundraising/dash] - https://gerrit.wikimedia.org/r/398305 (owner: Mepps) [21:35:09] Suppose I should eat sometime this afternood as well though. [21:35:28] ejegg did you add all of the tests too? just asking because the commit message doesn't mention it [21:35:40] it looks fine though [21:36:06] (CR) Mepps: [C: 2] CRM-21521: fix nested multipart handling [wikimedia/fundraising/crm/civicrm] - https://gerrit.wikimedia.org/r/398107 (owner: Ejegg) [21:37:57] thanks mepps [21:38:55] mepps ooh, shoot, we don't include the tests in our civicrm submodule at all, huh [21:39:06] (Merged) jenkins-bot: CRM-21521: fix nested multipart handling [wikimedia/fundraising/crm/civicrm] - https://gerrit.wikimedia.org/r/398107 (owner: Ejegg) [21:39:09] ahh i was wondering why the files were added [21:39:33] oops, I'll take 'em back out [21:40:37] (PS1) Ejegg: Remove email processor tests [wikimedia/fundraising/crm/civicrm] - https://gerrit.wikimedia.org/r/398334 [21:40:41] (CR) Ejegg: [C: 2] Remove email processor tests [wikimedia/fundraising/crm/civicrm] - https://gerrit.wikimedia.org/r/398334 (owner: Ejegg) [21:40:53] ok, going to deploy that bit [21:41:25] (PS5) Mepps: Use pool in data.js, don't close pool [wikimedia/fundraising/dash] - https://gerrit.wikimedia.org/r/398305 [21:42:36] (PS1) Ejegg: Update civicrm submodule [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/398335 [21:42:42] (CR) jerkins-bot: [V: -1] Use pool in data.js, don't close pool [wikimedia/fundraising/dash] - https://gerrit.wikimedia.org/r/398305 (owner: Mepps) [21:43:31] (PS6) Mepps: Use pool in data.js, don't close pool [wikimedia/fundraising/dash] - https://gerrit.wikimedia.org/r/398305 [21:43:47] (PS1) Ejegg: Merge branch 'master' into deployment [wikimedia/fundraising/crm] (deployment) - https://gerrit.wikimedia.org/r/398336 [21:44:11] (CR) Ejegg: [C: 2] Update civicrm submodule [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/398335 (owner: Ejegg) [21:45:56] (Merged) jenkins-bot: Remove email processor tests [wikimedia/fundraising/crm/civicrm] - https://gerrit.wikimedia.org/r/398334 (owner: Ejegg) [21:45:59] (CR) Ejegg: [C: 2] Merge branch 'master' into deployment [wikimedia/fundraising/crm] (deployment) - https://gerrit.wikimedia.org/r/398336 (owner: Ejegg) [21:46:58] (Merged) jenkins-bot: Update civicrm submodule [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/398335 (owner: Ejegg) [21:47:00] (Merged) jenkins-bot: Merge branch 'master' into deployment [wikimedia/fundraising/crm] (deployment) - https://gerrit.wikimedia.org/r/398336 (owner: Ejegg) [21:48:33] Jeff_Green: is there a new idiom for f_c_u -p project=HEAD ? [21:48:55] i'm getting this: [21:48:59] -p civicrm=HEAD bad revision argument [21:51:05] ah, lowercase? [21:51:28] yep, lowercase worked [21:51:46] yeah, isn't that the way it's always been? I actually debated making it accept both but figured since nobody ever complained meh [21:51:59] did I change it by accident? [21:52:22] huh, I might be mistaken [21:52:30] caps would make more sense [21:52:32] been a while since i had to lock & unlock a repo [21:53:32] !log updated CiviCRM from 1086291bb3 to 41a23f9fc3 [21:53:44] Logged the message at https://wikitech.wikimedia.org/wiki/Server_Admin_Log [21:57:45] mepps that code looks fine to me, but somehow it's not working.. I get Query errors back for all the data results [21:58:43] weiiird ejegg i'm not seeing any of those errors [21:58:45] mepps oooh, I think it's the 'error' param to the callback [21:59:02] the regular mysql lib callback takes (error, results) [21:59:24] but the promise lib calls the callback with results [21:59:28] but that makes sense [22:00:16] hmm, what does it do with errors [22:00:17] ? [22:01:00] ah, rejects the promise [22:01:31] it's bugging me that the errors aren't showing for me but i have to run ejegg [22:01:39] can look at this more tomorrow [22:02:26] ok [22:05:23] (CR) Ejegg: [C: -1] "need to split up the error and result handling fns, either passing them in separately to persistence.query or having persistence.query jus" [wikimedia/fundraising/dash] - https://gerrit.wikimedia.org/r/398305 (owner: Mepps) [23:05:22] fundraising-tech-ops, Mail, Operations: Forward katherine@wikipedia.org and jimmy@wikipedia.org emails to katherine@wikimedia.org and jimmy@wikimedia.org, respectively - https://phabricator.wikimedia.org/T182456#3838852 (bcampbell) Thank you, Faidon! [23:15:13] see you later, folks!