[06:37:38] (CR) jerkins-bot: [V: -1] Localisation updates from https://translatewiki.net. [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/523044 (owner: L10n-bot) [06:41:06] Fundraising Sprint Men In Slack, Fundraising Sprint Never Ending Query, Fundraising-Backlog, MediaWiki-extensions-CentralNotice: CentralNotice: Review incoming patches 2019-06 and 2019-07 - https://phabricator.wikimedia.org/T226655 (AndyRussG) [06:56:33] (CR) jenkins-bot: Localisation updates from https://translatewiki.net. [extensions/CentralNotice] - https://gerrit.wikimedia.org/r/523033 (owner: L10n-bot) [07:01:34] Fundraising-Backlog, MediaWiki-extensions-CentralNotice: Some of Qunit tests are ignored - https://phabricator.wikimedia.org/T227879 (AndyRussG) [07:01:57] Fundraising-Backlog, MediaWiki-extensions-CentralNotice: Some of Qunit tests are ignored - https://phabricator.wikimedia.org/T227879 (AndyRussG) Confirmed! (See https://integration.wikimedia.org/ci/job/quibble-vendor-mysql-hhvm-docker/58622/consoleFull) Thanks for findning this!! [07:35:58] (PS1) AndyRussG: Refactor check for choiceData staleness and add corresponding status [extensions/CentralNotice] - https://gerrit.wikimedia.org/r/523095 (https://phabricator.wikimedia.org/T226344) [07:39:41] (CR) jerkins-bot: [V: -1] Refactor check for choiceData staleness and add corresponding status [extensions/CentralNotice] - https://gerrit.wikimedia.org/r/523095 (https://phabricator.wikimedia.org/T226344) (owner: AndyRussG) [07:41:24] (PS2) AndyRussG: Refactor check for choiceData staleness and add corresponding status [extensions/CentralNotice] - https://gerrit.wikimedia.org/r/523095 (https://phabricator.wikimedia.org/T226344) [09:03:59] (CR) AndyRussG: "First of all, thanks much for finding the QUnit issue! Nice catch!!!" (3 comments) [extensions/CentralNotice] - https://gerrit.wikimedia.org/r/517931 (https://phabricator.wikimedia.org/T124969) (owner: Vedmaka Wakalaka) [09:05:25] (CR) AndyRussG: "> End the fallback loop after before we actually try to choose a banner" [extensions/CentralNotice] - https://gerrit.wikimedia.org/r/517931 (https://phabricator.wikimedia.org/T124969) (owner: Vedmaka Wakalaka) [09:08:25] Fundraising Sprint Men In Slack, Fundraising Sprint Never Ending Query, Fundraising-Backlog, MediaWiki-extensions-CentralNotice, Patch-For-Review: Review Campaign Fallback - https://phabricator.wikimedia.org/T226344 (AndyRussG) Here's what I just commented on Gerrit: > First of all, thanks m... [09:49:38] (CR) AndyRussG: "> In index.js, you might change the main while( true ) { } fallback loop to a do { } while( condition ) loop, and have the condition be a " [extensions/CentralNotice] - https://gerrit.wikimedia.org/r/517931 (https://phabricator.wikimedia.org/T124969) (owner: Vedmaka Wakalaka) [09:50:15] Fundraising Sprint Men In Slack, Fundraising Sprint Never Ending Query, Fundraising-Backlog, MediaWiki-extensions-CentralNotice, Patch-For-Review: Review Campaign Fallback - https://phabricator.wikimedia.org/T226344 (AndyRussG) Just added another comment: >> In index.js, you might change t... [14:27:07] (CR) Raimond Spekking: [C: +2] "false positive" [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/523044 (owner: L10n-bot) [14:55:22] fr-tech can anyone review this one-line DonationInterface fix? https://gerrit.wikimedia.org/r/522564 [14:55:51] fixes a kind of embarrassing goof I made a couple patches back [14:56:42] we were already using POST for amazon [15:00:08] (PS1) Ejegg: WIP wire up 'yes' buttons for recurring conversion [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/523192 (https://phabricator.wikimedia.org/T216560) [15:02:26] (CR) jerkins-bot: [V: -1] WIP wire up 'yes' buttons for recurring conversion [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/523192 (https://phabricator.wikimedia.org/T216560) (owner: Ejegg) [15:07:09] (CR) Cstone: [C: +2] Use POST for donation api [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/522564 (owner: Ejegg) [15:07:29] thanks cstone! [15:07:45] no problem! [15:08:07] (Merged) jenkins-bot: Use POST for donation api [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/522564 (owner: Ejegg) [15:29:48] (PS7) Ejegg: RecurringConversion API [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/519729 (https://phabricator.wikimedia.org/T216560) [15:29:50] (PS6) Ejegg: WIP Ingenico implements RecurringConversion [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/520150 (https://phabricator.wikimedia.org/T216560) [15:29:52] (PS2) Ejegg: WIP wire up 'yes' buttons for recurring conversion [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/523192 (https://phabricator.wikimedia.org/T216560) [15:59:16] (CR) Vedmaka Wakalaka: [C: +1] Refactor check for choiceData staleness and add corresponding status (1 comment) [extensions/CentralNotice] - https://gerrit.wikimedia.org/r/523095 (https://phabricator.wikimedia.org/T226344) (owner: AndyRussG) [17:12:37] Fundraising Sprint Never Ending Query, Fundraising-Backlog, FR-Ingenico, Recurring-Donations: Update SmashPig recurring processor to handle first payments - https://phabricator.wikimedia.org/T227051 (DStrine) [17:13:05] Fundraising Sprint Never Ending Query, Fundraising-Backlog, Recurring-Donations: Update recurring QC for tokenized subscriptions - https://phabricator.wikimedia.org/T227048 (DStrine) [17:18:20] Fundraising Sprint Never Ending Query, Fundraising-Backlog, MediaWiki-extensions-CentralNotice: bannerHistoryLogger not present when banner history mixin enabled - https://phabricator.wikimedia.org/T227711 (DStrine) [17:29:06] (PS3) Mepps: Add form_variants dir to DonationInterface [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/522507 (owner: Ejegg) [17:29:14] (CR) Mepps: [C: +2] "Okay, makes sense." [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/522507 (owner: Ejegg) [17:38:46] thanks mepps! [17:43:20] (Merged) jenkins-bot: Add form_variants dir to DonationInterface [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/522507 (owner: Ejegg) [18:08:19] (PS1) XenoRyet: Merge branch 'master' into deployment ceb5f906 Localisation updates from https://translatewiki.net. d00038fa Add India specific fields for dlocal. 65266c47 Localisation updates from https://translatewiki.net. 78689b88 (origin/wmf/1.34.0-wmf.13) Localisation updates from https://translatewiki.net. 2b40ffc7 Recurring conversion: wire up close and 'no' buttons 0e37d7b8 Log line for showing recurring conversion ask [18:08:19] Base class for Donation APIs: step one 63514a0b Donation API base: make $adapter a class property 7264bcc1 Localisation updates from https://translatewiki.net. c730c30e Donation API Base: Bring Amazon in 78f975da Add RecurringConversion interface d6be4075 Turn on Ingenico Connect ResultSwitcherTest 45bb88f9 Use POST for donation api b30cea7e Localisation updates from https://translatewiki.net. 3c4189cc (origin/master, origin/HEA [18:08:20] [extensions/DonationInterface] (deployment) - https://gerrit.wikimedia.org/r/523247 [18:10:03] (PS2) XenoRyet: Merge branch 'master' into deployment [extensions/DonationInterface] (deployment) - https://gerrit.wikimedia.org/r/523247 [18:11:53] (CR) XenoRyet: [C: +2] Merge branch 'master' into deployment [extensions/DonationInterface] (deployment) - https://gerrit.wikimedia.org/r/523247 (owner: XenoRyet) [18:12:33] (Merged) jenkins-bot: Merge branch 'master' into deployment [extensions/DonationInterface] (deployment) - https://gerrit.wikimedia.org/r/523247 (owner: XenoRyet) [18:14:01] Fundraising Sprint Men In Slack, Fundraising Sprint Never Ending Query, Fundraising-Backlog, Wikimedia-Fundraising-CiviCRM, and 3 others: New total fields needed for MG prospecting - https://phabricator.wikimedia.org/T222958 (NNichols) Hi @Eileenmcnaughton Thanks for this. 1. Perfect. Please... [18:14:11] (PS1) XenoRyet: Update DonationInterface submodule [core] (fundraising/REL1_31) - https://gerrit.wikimedia.org/r/523249 [18:14:42] (CR) jerkins-bot: [V: -1] Update DonationInterface submodule [core] (fundraising/REL1_31) - https://gerrit.wikimedia.org/r/523249 (owner: XenoRyet) [18:15:18] hmm [18:15:21] (CR) jerkins-bot: [V: -1] Update DonationInterface submodule [core] (fundraising/REL1_31) - https://gerrit.wikimedia.org/r/523249 (owner: XenoRyet) [18:15:48] ah, looks like it just needs a rebase? [18:16:11] I guess. Does the rebase button in gerrit do the right thing? [18:16:57] might as well try [18:17:22] apparently not... [18:17:33] Gives errors about a merge conflict. [18:18:07] let me just try that whole thing again. [18:18:19] yeah, best that way [18:18:20] (Abandoned) XenoRyet: Update DonationInterface submodule [core] (fundraising/REL1_31) - https://gerrit.wikimedia.org/r/523249 (owner: XenoRyet) [18:19:51] I think I forgot to pull rel1_31 before I added and comitted. [18:20:43] (PS1) XenoRyet: Update DonationInterface submodule [core] (fundraising/REL1_31) - https://gerrit.wikimedia.org/r/523250 [18:23:58] (CR) jerkins-bot: [V: -1] Update DonationInterface submodule [core] (fundraising/REL1_31) - https://gerrit.wikimedia.org/r/523250 (owner: XenoRyet) [18:24:34] Ok, what is it this time? [18:28:41] (CR) jerkins-bot: [V: -1] Update DonationInterface submodule [core] (fundraising/REL1_31) - https://gerrit.wikimedia.org/r/523250 (owner: XenoRyet) [18:40:29] (Restored) Ejegg: Guard against duplicate WmfFramework alias [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/484757 (owner: Ejegg) [18:40:34] (PS5) Ejegg: Guard against duplicate WmfFramework alias [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/484757 [18:41:57] XenoRyet: oops, did I not merge a vendor commit? [18:45:15] ejegg: got distracted for a minute there. Is that what would cause that error? [18:47:08] it's saying there's a missing sha [18:47:22] not sure which repo [18:47:47] ah, it's the DonationInterface repo, not vendor [18:47:49] Fetched in submodule path 'extensions/DonationInterface', but it did not contain 805b9ad330b32d40c9a3993febfba343fec32d2b [18:48:11] is the merge to deployment branch merged? [18:48:47] XenoRyet: ^^ [18:48:48] Yea, merged back at 11:12 by jenkins' clock. [18:49:10] https://gerrit.wikimedia.org/r/#/c/mediawiki/extensions/DonationInterface/+/523247/ [18:49:32] hmm, that sha is be7d4fb92b0ddb26f82948a77e46b7df314cae40 [18:49:56] Yea, I don't know where this 805b9ad330b32d40c9a3993febfba343fec32d2b is coming from [18:50:09] and your submodule update is pointing to 805b9ad330b32d40c9a3993febfba343fec32d2b - maybe that one only exists on your machine? [18:51:07] try going into your di dir and doing a git fetch && git reset --hard origin/deployment [18:53:15] Ok, yea, that's got it. Somehow DI was on 805 locally, but now it's back to what got merged. [18:53:27] Wonder how I managed to sneak an extra commit in there. [18:53:48] (Abandoned) XenoRyet: Update DonationInterface submodule [core] (fundraising/REL1_31) - https://gerrit.wikimedia.org/r/523250 (owner: XenoRyet) [18:56:41] (PS1) XenoRyet: Update DonationInterface submodule [core] (fundraising/REL1_31) - https://gerrit.wikimedia.org/r/523265 [18:57:00] That looks better. [19:03:19] (CR) XenoRyet: [C: +2] Update DonationInterface submodule [core] (fundraising/REL1_31) - https://gerrit.wikimedia.org/r/523265 (owner: XenoRyet) [19:04:35] Fundraising-Backlog, FR-Ingenico, MediaWiki-extensions-DonationInterface: Sending over-long first name field to Ingenico Connect - https://phabricator.wikimedia.org/T228094 (Ejegg) [19:08:22] (Merged) jenkins-bot: Update DonationInterface submodule [core] (fundraising/REL1_31) - https://gerrit.wikimedia.org/r/523265 (owner: XenoRyet) [19:09:03] (CR) jenkins-bot: Update DonationInterface submodule [core] (fundraising/REL1_31) - https://gerrit.wikimedia.org/r/523265 (owner: XenoRyet) [19:17:11] XenoRyet: matching puppet patch: https://gerrit.wikimedia.org/r/#/c/mediawiki/vagrant/+/523288 [19:17:21] err, vagrant patch [19:18:13] ejegg: cool. I just pushed the settings change. Want to take a quick peek and make sure I didn't typo anything? [19:18:20] sure, one sec [19:19:00] Oh, and the vagrant one looks good, but I don't have +2 there. [19:19:20] fr-tech: If anyone else has +2 powers in the vagrant repo^ [19:19:31] XenoRyet: you still don't? [19:19:36] Apparently not [19:19:40] you definitely should [19:19:46] want to ask over in -releng? [19:20:10] Yea, seems like I should. Yea, I'll ask over there after I finish the deploy. [19:21:58] XenoRyet: settings change looks good [19:22:47] 10-4 [19:25:35] !log update payments-wiki from 59ace50d66 to 224c6b2d7b [19:25:41] Logged the message at https://wikitech.wikimedia.org/wiki/Server_Admin_Log [19:28:28] fundraising-tech-ops, DC-Ops, Operations, decommission, ops-eqiad: decommission frav1001.frack.eqiad.wmnet - https://phabricator.wikimedia.org/T222109 (wiki_willy) a:RobH [19:29:58] fundraising-tech-ops, DC-Ops, Operations, decommission, ops-eqiad: decommission frav1001.frack.eqiad.wmnet - https://phabricator.wikimedia.org/T222109 (RobH) a:RobH→Cmjohnson [19:31:31] (CR) Mepps: [C: +2] Guard against duplicate WmfFramework alias [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/484757 (owner: Ejegg) [19:31:35] (CR) jenkins-bot: Update DonationInterface submodule [core] (fundraising/REL1_31) - https://gerrit.wikimedia.org/r/523265 (owner: XenoRyet) [19:31:41] (CR) Mepps: [C: +2] "This fixed my local setup." [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/484757 (owner: Ejegg) [19:32:29] (Merged) jenkins-bot: Guard against duplicate WmfFramework alias [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/484757 (owner: Ejegg) [19:36:15] Fundraising-Backlog, MediaWiki-extensions-CentralNotice: Some of Qunit tests are ignored - https://phabricator.wikimedia.org/T227879 (DStrine) [19:38:42] Fundraising Sprint Never Ending Query, Fundraising-Backlog: Make the fraud queue consumer consume more frequently. - https://phabricator.wikimedia.org/T227803 (DStrine) [19:53:45] (CR) Mepps: "As per irc, I tested locally to see if any of the integrations were broken. So far, none. The code looks good but I'm finding it a little " [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/519729 (https://phabricator.wikimedia.org/T216560) (owner: Ejegg) [20:00:36] Fundraising-Backlog, Wikimedia-Fundraising-CiviCRM: Create new custom fields on Prospect Tab - https://phabricator.wikimedia.org/T227687 (DStrine) [20:01:05] Fundraising-Backlog, Wikimedia-Fundraising-CiviCRM: Create new custom fields on Prospect Tab - https://phabricator.wikimedia.org/T227687 (DStrine) @NNichols please go ahead and make the fields and we will setup the triggers. [20:01:17] Fundraising Sprint Never Ending Query, Fundraising-Backlog, Wikimedia-Fundraising-CiviCRM: Create new custom fields on Prospect Tab - https://phabricator.wikimedia.org/T227687 (DStrine) [20:05:55] Fundraising-Backlog: Merge Screen FY total order - https://phabricator.wikimedia.org/T227799 (DStrine) @NNichols this seems to be fixed. Can you recheck? [20:17:29] Fundraising-Backlog: Merge Screen FY total order - https://phabricator.wikimedia.org/T227799 (NNichols) @DStrine Looks good! Thanks [20:21:35] Fundraising-Backlog: Merge Screen FY total order - https://phabricator.wikimedia.org/T227799 (DStrine) Open→Resolved [20:25:14] Fundraising Sprint Never Ending Query, Fundraising-Backlog, Wikimedia-Fundraising-CiviCRM: Create new custom fields on Prospect Tab - https://phabricator.wikimedia.org/T227687 (NNichols) Thanks! All done on my end. [21:14:16] (PS1) XenoRyet: Update vendor submodule [wikimedia/fundraising/crm/vendor] - https://gerrit.wikimedia.org/r/523313 [21:16:22] Fundraising Sprint Never Ending Query, Fundraising-Backlog, Wikimedia-Fundraising-CiviCRM: Add index on civicrm_activity.location - https://phabricator.wikimedia.org/T228106 (Eileenmcnaughton) [21:18:23] (CR) XenoRyet: [C: +2] Update vendor submodule [wikimedia/fundraising/crm/vendor] - https://gerrit.wikimedia.org/r/523313 (owner: XenoRyet) [21:21:07] Did XenoRyet comms field get added in the end? [21:21:54] for the opt-in tracking stuff? Yea, there's three new comms fields for that. [21:22:03] I was just prepping a deploy [21:23:13] It's been a while since I've deployed civi though, it's taking me a while to shake off the rust. [21:24:03] (Merged) jenkins-bot: Update vendor submodule [wikimedia/fundraising/crm/vendor] - https://gerrit.wikimedia.org/r/523313 (owner: XenoRyet) [21:26:52] :-) [21:27:29] cool - I'd like to get the other new field adds merged - but I think yours should be deployed first [21:27:44] Sounds good. [21:28:37] ejegg: when I'm doing this smashpig as a composer dep process, am I meant to squash the merge master and submodule update commits before I push it up? [21:28:48] Feels like yes, but I wanted to check. [21:30:58] Or I guess they could stay seperate [21:31:21] As long as they both merge to deployment, it should be all good. [21:31:34] XenoRyet: i usually squash, but it's a matter of preference [21:33:12] (PS1) XenoRyet: Merge branch 'master' into deployment [wikimedia/fundraising/crm] (deployment) - https://gerrit.wikimedia.org/r/523321 [21:33:14] (PS1) XenoRyet: Update vendor submodule [wikimedia/fundraising/crm] (deployment) - https://gerrit.wikimedia.org/r/523322 [21:33:50] (CR) jerkins-bot: [V: -1] Merge branch 'master' into deployment [wikimedia/fundraising/crm] (deployment) - https://gerrit.wikimedia.org/r/523321 (owner: XenoRyet) [21:33:54] eileen: This all look ok to go out? https://gerrit.wikimedia.org/r/523321 [21:34:29] yes looks good [21:34:36] Cool. [21:34:43] Ok, what's that V-1 about? [21:35:34] " The .git directory is missing from /src/vendor/wikimedia/smash-pig, see https://getcomposer.org/commit-deps for more information " [21:35:39] odd [21:35:45] Yea, that seems weird. [21:36:00] (CR) Eileen: "recheck" [wikimedia/fundraising/crm] (deployment) - https://gerrit.wikimedia.org/r/523321 (owner: XenoRyet) [21:36:26] XenoRyet: I see composer updates but not vendor submodule -maybe that [21:36:28] (CR) jerkins-bot: [V: -1] Merge branch 'master' into deployment [wikimedia/fundraising/crm] (deployment) - https://gerrit.wikimedia.org/r/523321 (owner: XenoRyet) [21:38:16] Oh, right. The vendor submodule one probably needs to merge first. [21:38:27] (CR) XenoRyet: [C: +2] Update vendor submodule [wikimedia/fundraising/crm] (deployment) - https://gerrit.wikimedia.org/r/523322 (owner: XenoRyet) [21:42:19] why is gate-and-submit not going on that one? [21:48:03] (CR) XenoRyet: "recheck" [wikimedia/fundraising/crm] (deployment) - https://gerrit.wikimedia.org/r/523321 (owner: XenoRyet) [21:48:34] (CR) jerkins-bot: [V: -1] Merge branch 'master' into deployment [wikimedia/fundraising/crm] (deployment) - https://gerrit.wikimedia.org/r/523321 (owner: XenoRyet) [21:49:17] ejegg: You know what that one is about ^ [21:54:03] looking XenoRyet [21:54:50] it's running composer update and complaining [21:55:25] hmm, though the vendor submodule should already have the latest smash-pig, right? [21:55:42] Yea, I thought so anyway. [21:56:20] want to squash the submodule update in with the merge? [21:56:52] the submodule update is already merged to deployment [21:56:52] oh, and we'll need to switch that php56 job to use php7 [21:57:44] no, the submodule update is after the failing one [21:58:14] oh, I confused myself. [21:58:15] it's +2ed but the failing one is its logical parent [21:58:31] For some reason I thought I saw the merge comment for that one, but must've been looking at something else. [21:58:42] Yea, I guess I'll try squashing [21:58:57] (Abandoned) XenoRyet: Update vendor submodule [wikimedia/fundraising/crm] (deployment) - https://gerrit.wikimedia.org/r/523322 (owner: XenoRyet) [21:59:04] (Abandoned) XenoRyet: Merge branch 'master' into deployment [wikimedia/fundraising/crm] (deployment) - https://gerrit.wikimedia.org/r/523321 (owner: XenoRyet) [22:15:48] Am I being silly here somehow? The squash should just be git rebase -i HEAD~2, right? [22:16:11] XenoRyet: I just do the merge, then git add vendor, then git commit --amend [22:16:28] Ok, that's probably easier at this point. [22:19:41] (PS1) XenoRyet: Merge branch 'master' into deployment [wikimedia/fundraising/crm] (deployment) - https://gerrit.wikimedia.org/r/523331 [22:29:52] (CR) XenoRyet: [C: +2] Merge branch 'master' into deployment [wikimedia/fundraising/crm] (deployment) - https://gerrit.wikimedia.org/r/523331 (owner: XenoRyet) [22:30:42] (Merged) jenkins-bot: Merge branch 'master' into deployment [wikimedia/fundraising/crm] (deployment) - https://gerrit.wikimedia.org/r/523331 (owner: XenoRyet) [22:31:31] Ok, that worked. [22:31:37] Commencing the deploy [22:33:12] !log updated civicrm from 8a4451f390 to 3be1a8c77c [22:33:18] Logged the message at https://wikitech.wikimedia.org/wiki/Server_Admin_Log [22:54:12] fr-tech: Anybody know off the top of their head how often the unsubscribe consumer consumes? [22:54:30] Not hugely important, just curious. [23:06:52] Fundraising Sprint Men In Slack, Fundraising Sprint Never Ending Query, Fundraising-Backlog: add tracking to opt in page - https://phabricator.wikimedia.org/T226572 (XenoRyet) @CCogdill_WMF Ok, this is deployed and working now. If utm_source, utm_medium, and/or utm_campaign are in the url, they'll s...