[00:08:07] awight: do I use the same git-review action to push a new branch? [00:08:31] eileen: There's a trick... [00:09:01] If you edit the .gitreview file to say defaultbranch=yerbranch, then you can use simple "git review" [00:09:27] Otherwise, if you want to push directly to a review branch, use "git push gerrit HEAD:refs/for/yerbranch" [00:09:33] Hi! [00:09:43] awight: Hi :-) [00:10:00] Exciting to hear that you're uploading the tarball... [00:10:02] I think it makes sense just to push to a branch since this is the first cut of the 4.6.9 tarball [00:10:10] totally [00:10:28] In the long run, you were saying we should start a new repo, right? [00:10:44] well - I’ve rebased the branch off upstream [00:10:45] Works for me. The parent repo can probably stay the same, but we'll update the submodule reference [00:10:57] so, it doesn’t actually share the same history as your 4.2 [00:11:06] perfect [00:11:18] We don't need that history, the broken-out broken-ass patches are good enuf I'd say [00:11:43] I'm interested in the new repo being fully based on upstream [00:12:04] I’m really torn about how to manage the repo in terms of deployment branch vs keeping the branch matching & then compiling a deployment tarball using civicrm tools [00:12:20] but ATM there is a deployment branch I’m pushing [00:12:30] & the other is on the fuzion github [00:13:35] I'd think there should be a best practice for that? Let me know if you want to bounce any ideas about the repo and branches. I don't have many religious hangups about that, could go either way. [00:14:33] yeah - I’ve had long conversations with CivDesk & Emphanos & Tim in the past [00:14:44] We should include Jeff_Green in that conversation too, but I think your hours are mutually exclusive [00:15:02] but, we went one way with 4.2, another for 4.4 & yet another for 4.6 for Fuzion :-) [00:15:10] yeah - I can catch him in the mornings [00:15:30] I have noticed that we're already stretching the usefulness of the deployment branch strategy, when it comes to Composer and submodules. [00:16:12] yeah - so one thing is that I have tended to actually LIKE a strategy that allows me to rebase point release branches against master [00:16:21] Maybe it's time to bite the bullet and write Makefiles [00:16:22] but, I suspect Jeff won’t ... [00:16:38] well - the way Fuzion is going for 4.6 is [00:16:46] 1) set up buildkit dist site [00:16:59] I'd love if all developmenty checkouts, such as a maintenacne release, is as close to upstream master as possible. [00:17:02] 2) run cividist to generate a nightly tarball [00:17:14] s/acne/ance [00:17:27] 3) for each point release I create a new branch & rebase it over the upstream [00:17:40] and the build server tars those as well? love it. [00:17:51] yeah - so we use the tarballs [00:18:08] I'm getting sketched out by the remote build server, though. [00:18:24] Anything we do should be easy to run from the commandline, too: "make" [00:18:54] yeah - so the dist site is basically to get the CiviCRM tools to generate the tarballs [00:18:56] One of my first jobs was just *Makefile for a year... someone should talk me down from the ledge [00:19:20] But how do the tarballs relate to WMF deployment? [00:19:59] they are basically just a tarred up version of the civicrm codebase after cividist has run [00:20:08] Side question--do you think .deb packaging would be overkill? I might be into that... [00:20:21] :-) [00:20:52] What I would LIKE is the civicrm-core repo format to be the same as deployed [00:21:00] ok. Agreed [00:21:08] How do we get there? [00:21:19] probably with a bit of work [00:21:27] I don't see a way around the codegen, where would that step happen? On-demand? [00:21:47] yeah - so on our fuzion site we run a nightly cron [00:22:06] I guess it could plug into clear-cache [00:22:08] but, at this stage I’m just leaning towards 2 branchs [00:22:17] ok. Sorry for the segue [00:22:20] 1 is the branch where we do all patches etc [00:22:38] & 2 is where we check the packaged version of the first 1 [00:22:40] That's totally solid as something we can use now, and refine over time. [00:22:53] However, IMO it's bad source control practice [00:22:58] I don’t particularly like it - but I also don’t want to over-complicate things for now [00:23:34] It's workable--it's what we do now, and the only big downside is that it takes some extra storage. [00:23:43] ideally we would then go to a Civi sprint & tackle the whole packaging issue in that environment [00:23:49] awesome! [00:24:36] I do especially like the .deb idea, as it would encourage admins to install Varnish, queueing and other stuff to make us look better out of the box. [00:24:54] ... when the right Civi sprint happens [00:25:20] Even shared hosting could install us using that format [00:25:21] yeah - well last sprint in Denver they started on improving install process [00:25:38] & I think Tim has been chipping away at it [00:26:10] I could get behind that banner--it bites me or WMF coworker a few times per week [00:26:38] ? [00:26:51] Any time we install Civi, something goes wrong [00:27:04] We need to get back on the mainstream toolchain [00:27:05] oh right hmmm [00:27:26] totten got us a lot of the way there for CI purposes, but it's not quite right for a development environment. [00:28:43] I tend to use buildkit a bit for that - but perhaps not the way Tim et al do [00:28:58] but - does it even work with 4.2? [00:29:00] yep, that's the tool that almost works [00:29:04] yes! it's great [00:29:33] but it isn't easy to punch in your dev database... [00:29:59] right - it’s all around 202 contacts .... [00:30:08] wrt. the deployment branch containing compiled "binaries", that's a fine idea, but could you explain the exact workflow? [00:30:41] It seems problematic cos normally we checkout old/deployment and merge new/master into that--so how would you run buildkit with an already slimmed-down checkout? [00:30:43] I’ve just about got the new branch up. I haven’t committed it tarred up [00:31:45] argh [00:31:51] d'oh? [00:32:01] It spend ages doing what I *thought* was pushing it but [00:32:19] oh no! [00:32:19] To ssh://eileen@gerrit.wikimedia.org:29418/wikimedia/fundraising/crm/civicrm.git [00:32:20] ! [remote rejected] HEAD -> refs/for/4.6.9-deploy (branch 4.6.9-deploy not found) [00:32:21] error: failed to push some refs to 'ssh://eileen@gerrit.wikimedia.org:29418/wikimedia/fundraising/crm/civicrm.git [00:32:34] * awight seethes a bit about Gerrit [00:32:43] I used this command [00:32:44] You have to create the branch in their UI :( [00:32:46] git push gerrit HEAD:refs/for/4.6.9-deploy [00:33:12] eileen: https://gerrit.wikimedia.org/r/#/admin/projects/wikimedia/fundraising/crm/civicrm,branches [00:33:53] There is one loophole, which I use for temporary in-progress branches, you can push directly to a branch named sandbox/eileen/* [00:34:28] hmh - I can create - but I wonder if it will allow me to push since I don’t have a shared root [00:35:06] ie it asks for initial revision [00:35:12] d'oh [00:35:26] This is evil, but [00:35:39] try pushing directly to a sanbox branch, then using that as the base revision? [00:35:51] oic, yeah it might not let you push at all. [00:36:21] Well, we can create a new repo no problem [00:37:01] Or, since this is provisional anyway, you could lose the upstream history for now... [00:37:54] yeah - I guess I can just check out a new branch & then untar & commit [00:38:02] I have the commits elsewhere [00:38:21] could even rsync --delete --exclude .git into the directory [00:39:00] btw I am think I am going to manage to sneak the addition of the owner_id field into 4.6.9 core for the my-reports stuff [00:39:00] For reference, I would want to create the new repo before deploying the upgrade [00:39:08] cool! [00:39:17] So innocuous... [00:39:36] awight: ok - so here is the branch [00:39:49] https://github.com/eileenmcnaughton/civicrm-core/commits/4.6.9-deploy [00:39:54] on git hub [00:40:39] Cloning... [00:40:49] note it’s 4.6 latest + fuzion patch backports + wmf patches + some conversion of GR patches [00:41:03] My family's coming home some time soon, is there anything I can help with? [00:41:45] well I guess I want to have that code somewhere that will allow Jeff to take it the next step tomorrow [00:42:06] I got the impression getting it checked in was the pre-requisite [00:42:24] But, I’ll try re-doing over current HEAD [00:42:36] OK, yeah the only remaining glue is to check out the wikimedia/fundraising/crm repo and adjust the submodule pointer [00:42:53] then push that as a sandbox branch, so we can explicitly deploy to the staging server [00:43:10] Not much to do there, though. Checking it into our repo is the bulk of the work [00:45:24] (PS1) Eileen: 4.6.9 deployment first cut [wikimedia/fundraising/crm/civicrm] (4.6.9-deploy) - https://gerrit.wikimedia.org/r/240023 [00:45:45] awight: ok - I’d like to discuss some things with atgo on the reports & am aware she will be away next week - so I’d like to get to where it’s visible to her [00:45:59] that pushed! [00:47:14] rad. [00:47:16] (CR) jenkins-bot: [V: -1] 4.6.9 deployment first cut [wikimedia/fundraising/crm/civicrm] (4.6.9-deploy) - https://gerrit.wikimedia.org/r/240023 (owner: Eileen) [00:47:24] Well lemme just check that out on staging so you can work [00:48:11] awight: ok - Jeff said he would get the rest of my access sorted tomorrow - so I prob can’t see it yet [00:48:32] eileen: So, I would just check out origin/4.6.9-deploy and then run the upgrade script? Should I use drush or the GUI? [00:49:00] I tend to use drush these days [00:49:28] k, here goes... [00:49:34] I'll tee the output to a file [00:49:51] hmm test build failed [00:49:58] meh [00:50:00] lemme see... [00:51:02] aww 00:47:15 PHP Parse error: syntax error, unexpected T_STRING in vendor/psr/log/Psr/Log/LoggerAwareTrait.php on line 8 [00:51:06] PHP 5.3 issues [00:51:20] Can you just remove the two files in vendor/psr that use traits? [00:51:28] silly [00:51:34] It won't affect runtime [00:52:04] This failure, on the other hand, looks more serious: https://integration.wikimedia.org/ci/job/wikimedia-fundraising-civicrm/726/console [00:52:53] yeah - implies something wrong in the packaging [00:53:15] I’ll have to look & see [00:54:43] Fundraising-Backlog, Wikimedia-Fundraising-CiviCRM, Continuous-Integration-Config: Test results are not pretty-printed by Jenkins - https://phabricator.wikimedia.org/T113321#1661790 (awight) NEW [00:55:02] I'll hold off on the civicrm-upgrade-db [00:55:20] Feel free to ping me any time in IRC or email... [00:56:03] awight: ok - I’ll email you when I’ve done [01:09:51] Fundraising-Backlog, fundraising-tech-ops: Paypal IPN log is not replicated to log server? - https://phabricator.wikimedia.org/T113323#1661815 (awight) NEW [01:10:02] awight: that error seems to be about the order of things - that function does exist but the userSystem mustn’t be populated & its happening when the modules are being enabled [01:11:32] ooh nasty. Well, shall I go ahead and try the upgrade? No foul if that machine melts down... [01:11:44] awight: ok give it a go & se [01:11:45] see [01:11:49] fun [01:12:23] lemme try that again. [01:12:23] drush civicrm-upgrade-db |& tee ~/civi-upgrade-db-2015-09-21 [01:12:26] Upgrade outputs: "" [01:12:53] hmm - I would have expected it to be a bit more chatty [01:13:03] That branch doesn't look right [01:13:05] although - I’m not convinced it accepted my update [01:13:14] git branch [01:13:14] * 4.6.9-deploy [01:13:23] git log -1 [01:13:23] commit dbeff641f99bfa73fd820e20ccd61ebb822a5d25 [01:13:23] Author: Adam Roses Wight [01:13:23] Date: Fri Jun 19 16:18:27 2015 -0700 [01:13:37] ooh, sorry--it's in review [01:13:48] Can you also push to a sandbox branch, or want me to? [01:13:58] I can do a sandbox [01:13:59] https://www.mediawiki.org/wiki/Gerrit/personal_sandbox [01:14:01] k [01:14:31] yeah, we don't have git review on the staging server, and it's a little tricky to update to a review branch [01:14:43] I guess... not that tricky, lemme try that [01:15:10] git fetch https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm/civicrm refs/changes/23/240023/1 && git checkout FETCH_HEAD [01:15:12] did the sandbox push work? [01:15:16] No problem. Donno why I haven't tried that before [01:15:32] I think we're okay, I'm on the review head now, "4.6.9 deployment first cut" [01:16:04] ok cool [01:16:14] Error: Call to a member function getLoggedInUfID() on a non-object in /srv/org.wikimedia.civicrm/civicrm/CRM/Utils/System.php, line [01:16:17] 1521 [01:16:19] awight@lutetium:/srv/org.wikimedia.civicrm/drupal$ [01:16:23] * awight kicks self [01:17:05] so the same error as the ci [01:17:09] I womder why [01:18:57] Do I need new civicrm.settings.php vars? [01:19:07] That must be it... [01:19:18] It’s not properly instantiating userSystem in the config object [01:19:25] but, that shouldn’t have changed [01:19:33] I feel like it’s memcache related [01:19:43] define( 'CIVICRM_UF' , 'Drupal' ); [01:19:54] that is still correct [01:20:22] I have no memcache settings [01:20:37] lemme mail you the file... [01:21:39] ok sure [01:22:41] Nothing interesting in the Drupal settings, AFAICT [01:24:15] hang on - I’m getting that error now (yay) [01:24:27] nothing worse than an error you can’t replicate [01:26:34] :D that makes me happy [01:27:36] I'll be around, but distracted [01:28:35] cool [01:47:27] Fundraising Sprint Tom Waits, Fundraising-Backlog, Unplanned-Sprint-Work: Backfill from Aug 25-Sept 17 PayPal audit outage - https://phabricator.wikimedia.org/T112920#1661866 (awight) a:awight [02:16:11] (PS1) Eileen: (wmf) CRM-17156 log user id against queries fix [wikimedia/fundraising/crm/civicrm] - https://gerrit.wikimedia.org/r/240026 [02:16:48] (CR) jenkins-bot: [V: -1] (wmf) CRM-17156 log user id against queries fix [wikimedia/fundraising/crm/civicrm] - https://gerrit.wikimedia.org/r/240026 (owner: Eileen) [02:17:46] awight|limbo: I got that issue fixed - if you get a change to try again on staging at any point [02:22:00] but don’t get too excited the test has found me the next issue :-) [02:29:16] lol k, enacting now [02:34:03] git fetch https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm/civicrm refs/changes/26/240026/1 && git checkout FETCH_HEAD [02:34:06] fyi [02:34:49] drush cc all fails [02:35:02] oh hrm need to do the update first [02:35:19] Looks like I need to start with drush -v -v updatedb [02:35:22] nope [02:35:37] Trying the civicrm-upgrade-db directly [02:35:49] Starting with v4.2.19 -> v4.6.9 upgrade .. [notice] [02:36:27] zzz [02:43:58] hrm, drush -v -v wasn't enough to get any debugging output? [02:45:12] so if died withouth saying why? [02:45:40] (how rude) [02:50:05] No, it's chugging along [02:50:13] for the record, I should always wrap this in "time" [02:50:58] http://ganglia.wikimedia.org/latest/graph_all_periods.php?h=db1025.frack.eqiad.wmnet&m=cpu_report&r=hour&s=by%20name&hc=4&mc=2&st=1442890232&g=load_report&z=large&c=Fundraising%20eqiad [02:51:12] http://ganglia.wikimedia.org/latest/?r=hour&cs=&ce=&c=Fundraising+eqiad&h=lutetium.frack.eqiad.wmnet&tab=m&vn=&hide-hf=false&m=cpu_report&sh=1&z=small&hc=4&host_regex=&max_graphs=0&s=by+name [03:31:27] I don't like it... total silence from the CLI and nothing in the civi debug log [03:36:24] awight|limbo: but perhaps there is a long-running query trying to restructure the activity table? [03:42:51] (CR) Awight: [C: 2] "Oops, good catch!" [wikimedia/fundraising/crm/civicrm] - https://gerrit.wikimedia.org/r/240026 (owner: Eileen) [03:43:32] (CR) Awight: "Hmm, looks like this was merged by direct push rather than in Gerrit. That's fine for a feature branch." [wikimedia/fundraising/crm/civicrm] (4.6.9-deploy) - https://gerrit.wikimedia.org/r/240023 (owner: Eileen) [03:44:08] (CR) jenkins-bot: [V: -1] (wmf) CRM-17156 log user id against queries fix [wikimedia/fundraising/crm/civicrm] - https://gerrit.wikimedia.org/r/240026 (owner: Eileen) [04:04:01] chasemp: If you're actually working, can I ask you a quick favor? I'd like a bit of strace output from process 26118 on lutetium... [04:08:17] eileen: IMO, we should log from CRM_Queue_Runner::runNext or... [04:08:57] CRM_Upgrade_Form::doIncrementalUpgradeStart [04:09:09] awight|limbo: can you tell at all what is going on? I normally take a look at that table to see where it’s at along with civicrm_domain & what query is running [04:10:10] ...maybe ::oIncrementalUpgradeStep... [04:10:13] which table? [04:10:22] I can look at civicrm_domain, lemme see. [04:11:03] (CR) Eileen: "yes - it's only with wmf at this stage - I haven't figured out an upstreaming plan for it" [wikimedia/fundraising/crm/civicrm] - https://gerrit.wikimedia.org/r/240026 (owner: Eileen) [04:11:06] version: 4.3.alpha1.upgrade [04:11:17] awight|limbo: & show processlist? [04:11:36] FYI annoyingly I think there is a 30 sec pause between tasks [04:12:03] I don't think I have processlist access, checking... [04:12:20] ooh, I can log in as the same db user [04:13:25] Looks like progress, actually! [04:13:25] Query | 235 | copy to tmp table | /* https://civicrm.wikimedia.org/user/0 */ ALTER TABLE `civicrm_line_item` ADD CONSTRAINT `FK_civi | 47.799 | [04:13:41] CREATE TEMPORARY TABLE civicrm_temp_a019dc5abc01854cd411 [04:13:59] awight|limbo: ah ok - yeah [04:14:08] We might want to ask Jeff_Green for the slow query log after this, to find the pain points. [04:14:23] awight|limbo: the problem is I think those queries are just slow [04:14:40] because there are a handful that add indexes & FKs etc [04:15:05] and I guess you can look at mysql settings temp table space for them [04:15:15] but, you can’t make it not slow [04:15:39] Well, we might find a few that are unnecessarily slow... at least, they certainly exist in the UI layer [04:15:42] some of them (e.g the mailing table ones) I have in the past run before the main iupgrade [04:16:03] awight|limbo: yeah - I think there will be peformance issues to fix [04:16:13] but most of the upgrade queries just have to happen [04:18:30] I believe it. As you can see, the corners we've cut are pretty sleazy [04:19:03] OK I gotta do a quick errand, will check back here. [04:35:19] (PS1) Eileen: 4.6 upgrade preparation, replace contribution_type with financial_type [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/240031 [04:36:15] (CR) jenkins-bot: [V: -1] 4.6 upgrade preparation, replace contribution_type with financial_type [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/240031 (owner: Eileen) [04:38:21] (CR) Eileen: "Looks like I haven't got into the flow yet. I didn't put the issue in the commit." [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/240031 (owner: Eileen) [04:42:36] (CR) Eileen: "This didn't pass muster on the tests - I need to figure out how to run the tests locally" [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/240031 (owner: Eileen) [05:18:27] eileen: Here's the script that CI runs: http://git.wikimedia.org/blob/integration%2Fconfig.git/HEAD/jjb%2Fwm-fundraising.yaml [05:18:49] awight|away: thanks [05:20:08] awight|away: where do these come from :$WORKSPACE/src/wikimedia/fundraising/crm/bin/ci-create-dbs.sh [05:20:30] Those are in the crm repo [05:20:36] u have that yet [05:20:36] ? [05:20:46] https://gerrit.wikimedia.org/r/p/wikimedia/fundraising/crm.git [05:21:45] yes - I must be blind I’ll look again [05:21:48] It's also useful to take a look at the mediawiki-vagrant config for this repo, cos there are some gotchas like you have to add a grotesque require...../.././././././/../vendor/autoload thing in settings.php [05:22:00] sorry, crm/bin/ci-create-dbs.sh [05:22:37] awight|away: ah - I am blind - that explains it [05:22:42] Here's the vagrant config, http://git.wikimedia.org/tree/mediawiki%2Fvagrant.git/HEAD/puppet%2Fmodules%2Fcrm [05:24:20] thanks [06:31:43] Awwww nuts, I didn't run under tmux [06:34:41] Trying to force the aborted upgrade to resume [06:48:36] Fundraising Sprint Snoop (Dogg|Lion), Fundraising Sprint Tom Waits, Fundraising Tech Backlog, Fundraising-Backlog, and 2 others: Configure new CiviCRM staging instance for testing 4.6 upgrade - https://phabricator.wikimedia.org/T112314#1662072 (awight) Bump--we need our first database reset. A fr... [06:48:52] eileen: ^ asking Jeff_Green to nuke from orbit [06:49:29] awight|away: sigh [06:50:06] It died due to ssh glitch before the 4.3.alpha1 completed, so it's guaranteed to be in a broken state [06:50:29] yep! [06:50:57] You have a place for notes, btw? [06:51:34] "time" and "tmux" are all I have at the moment [06:51:52] err, and I'm sad about the logging. Can we turn it up to 11? [06:57:23] (PS1) Eileen: T99836 CiviCRM 4.6 : add otion value for tag_used_for on install [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/240037 [06:57:25] (PS1) Eileen: T99836 add option value for tag_used for upgrading installs too. [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/240038 [06:57:27] (PS1) Eileen: T99836 remove code to add prevnext indexes [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/240039 [06:57:29] (PS1) Eileen: T99836 Civi46 remove call to pseudoconstant:locationType [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/240040 [06:58:19] (CR) jenkins-bot: [V: -1] T99836 CiviCRM 4.6 : add otion value for tag_used_for on install [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/240037 (owner: Eileen) [06:59:01] (CR) jenkins-bot: [V: -1] T99836 add option value for tag_used for upgrading installs too. [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/240038 (owner: Eileen) [06:59:32] (CR) Siebrand: [C: -1] "i18n/L10n reviewed." (2 comments) [extensions/CentralNotice] - https://gerrit.wikimedia.org/r/239302 (owner: Awight) [07:00:12] (CR) jenkins-bot: [V: -1] T99836 remove code to add prevnext indexes [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/240039 (owner: Eileen) [07:00:48] (CR) jenkins-bot: [V: -1] T99836 Civi46 remove call to pseudoconstant:locationType [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/240040 (owner: Eileen) [08:34:02] Fundraising-Backlog, Wikimedia-Fundraising-CiviCRM, Continuous-Integration-Config: Test results are not pretty-printed by Jenkins - https://phabricator.wikimedia.org/T113321#1662328 (hashar) In Jenkins, once the build is completed there are follow up actions known as publishers. That job has a publi... [08:34:31] Fundraising-Backlog, Wikimedia-Fundraising-CiviCRM, Continuous-Integration-Config, WorkType-Maintenance: Test results are not pretty-printed by Jenkins - https://phabricator.wikimedia.org/T113321#1661790 (hashar) [14:02:55] fundraising-tech-ops, Traffic, operations, IPv6, Patch-For-Review: Enable IPv6 on donate.wikimedia.org - https://phabricator.wikimedia.org/T73267#1662795 (BBlack) Open>Resolved [14:03:26] fundraising-tech-ops, Traffic, operations, IPv6, Patch-For-Review: Enable IPv6 on donate.wikimedia.org - https://phabricator.wikimedia.org/T73267#766158 (BBlack) p:High>Triage [14:29:02] morning ejegg [14:29:08] hi cwdent [14:29:42] was gonna deploy DI, sound ok to you? [14:29:49] sure [14:30:20] uuuh https://gerrit.wikimedia.org/r/ [14:30:22] nm [14:30:31] the name thing? [14:30:50] oh gerrit was 503 for a minute there [14:31:13] oh, odd [14:32:14] ejegg: i think we're gonna talk about the name thing some more before we do anything [14:32:23] this is what i need to push up: https://gerrit.wikimedia.org/r/#/c/240007/ [14:32:23] cool [14:32:39] dude says things will work if i remove that tag [14:32:51] ok, guess we'll see! [14:40:17] take forever gerrit [14:44:17] Fundraising Tech Backlog, fundraising-tech-ops: Set up fr-tech permissions for Eileen - https://phabricator.wikimedia.org/T109765#1662855 (Jgreen) Open>Resolved shell user, ssh keys & yubikey set up mysql creds set up ssl client cert generated [14:53:23] TCB-Team-Fundraising-Sprint-2015-09-16, TCB-Team: [WMDE-Fundraising] Create entry point class/application for server requests coming from the sensitive banner - https://phabricator.wikimedia.org/T112061#1662870 (kai.nissen) a:kai.nissen [14:53:35] TCB-Team-Fundraising-Sprint-2015-09-16, TCB-Team: [WMDE-Fundraising] Implement basic tracking of the actual banner usage - https://phabricator.wikimedia.org/T112068#1662871 (kai.nissen) a:kai.nissen [15:02:05] krrrit-wm is mum this morning [15:02:20] * cwdent kicks krrrit-wm's chair [15:02:45] oh huh, on the channel but no talkee [15:03:13] the emails seem really sluggish too [15:04:18] ejegg: i never updated this pointer before, look ok? https://gerrit.wikimedia.org/r/#/c/240109/ [15:05:46] yep, pointing to the latest deployment branch commit! [15:06:27] good deal [15:06:31] gon roll it [15:06:54] nice [15:09:37] gotta head out for a bit, but I'll be back soon [15:19:05] Fundraising Sprint Snoop (Dogg|Lion), Fundraising Sprint Tom Waits, Fundraising Tech Backlog, Fundraising-Backlog, and 2 others: Configure new CiviCRM staging instance for testing 4.6 upgrade - https://phabricator.wikimedia.org/T112314#1662932 (DStrine) @awight who are you trying to ping? No one i... [15:23:02] Fundraising Tech Backlog, MediaWiki-extensions-CentralNotice: Write API for campaign creation and use it to create browser test fixtures - https://phabricator.wikimedia.org/T107376#1662941 (dduvall) [15:26:02] Fundraising Tech Backlog, MediaWiki-extensions-CentralNotice: Write API for campaign creation and use it to create browser test fixtures - https://phabricator.wikimedia.org/T107376#1662947 (dduvall) Removed the #browser-tests project since this isn't strictly about implementation of tests but an API depe... [15:31:58] !log updated payments from 153418195a45cab820bc2aacf9a4f7dbc9dde768 to 7b08867d9c5e87f5babb4b5b9cf1f5bec5e243b3 [15:32:03] Logged the message at https://wikitech.wikimedia.org/wiki/Server_Admin_Log, Master [15:34:33] (CR) Dduvall: [C: 2] Updated watir-webdriver Ruby gem to the latest version [extensions/CentralNotice] - https://gerrit.wikimedia.org/r/238851 (https://phabricator.wikimedia.org/T112748) (owner: Zfilipin) [15:35:44] (Merged) jenkins-bot: Updated watir-webdriver Ruby gem to the latest version [extensions/CentralNotice] - https://gerrit.wikimedia.org/r/238851 (https://phabricator.wikimedia.org/T112748) (owner: Zfilipin) [15:37:59] TCB-Team-Fundraising-Sprint-2015-09-16, TCB-Team: [WMDE-Fundraising] Implement general communication mechanism for the sensitive banner - https://phabricator.wikimedia.org/T112058#1662974 (WMDE-leszek) a:WMDE-leszek [15:54:09] Fundraising-Backlog: Sample XML for a GC USD credit card donation - https://phabricator.wikimedia.org/T113365#1663045 (Ppena) NEW [16:05:24] Fundraising Sprint Snoop (Dogg|Lion), Fundraising Sprint Tom Waits, Fundraising-Backlog, Patch-For-Review: Implement Amazon payment notification listener - https://phabricator.wikimedia.org/T109649#1555196 (Jgreen) [16:40:07] !log updated paymentswiki 153418195a45cab820bc2aacf9a4f7dbc9dde768 to 7b08867d9c5e87f5babb4b5b9cf1f5bec5e243b3 [16:40:13] Logged the message at https://wikitech.wikimedia.org/wiki/Server_Admin_Log, Master [16:41:46] Fundraising Sprint Snoop (Dogg|Lion), Fundraising Sprint Tom Waits, Fundraising-Backlog, Patch-For-Review: Implement Amazon payment notification listener - https://phabricator.wikimedia.org/T109649#1663247 (Jgreen) [16:52:17] cwdent: what does ESOP mean? [16:53:00] dstrine: "enhanced silent order post" [16:53:02] read: iframe [16:54:47] ah thanks [16:55:57] Fundraising-Backlog: Sample XML for a GC USD credit card donation - https://phabricator.wikimedia.org/T113365#1663339 (awight) ``` INSERT_ORDERWITHPAYMENT4321127.0.0.11.01.2.3.4 I keep hearing about new errors and/or systems :P [16:56:31] I'm overthinking some acronyms [16:57:25] dstrine: yeah fwiw, that abbreviation is recycled jargon and AFAICT does not relate whatsoever to do with the type of integration it actually describes. [16:57:34] Fundraising Sprint Tom Waits, Fundraising-Backlog, Unplanned-Sprint-Work: Sample XML for a GC USD credit card donation - https://phabricator.wikimedia.org/T113365#1663343 (atgo) [16:57:35] s/do// [16:57:56] atgo: thx! [16:58:02] mmhmmm [16:58:27] dstrine cwdent the conversation to get them to admit that esop was just iframe was like... 40 minutes. [16:58:29] :P [16:59:01] yeah "silent post" seems to be an industry standard, which they don't implement. [16:59:25] baha [16:59:26] they have all the hallmarks of a poorly run government service [16:59:33] time to hurry up and wait [17:00:17] http://secureweb.worldpay [17:00:50] One sec, hangouts is being stupid [17:02:50] AndyRussG: you free for a backlog chat? [17:15:03] Wikimedia-Fundraising-CiviCRM: JPMorgan Import Not Working - https://phabricator.wikimedia.org/T113381#1663419 (LeanneS) NEW [17:15:48] Fundraising-Backlog: Style fields more cleanly for when donor enters form without currency or amount - https://phabricator.wikimedia.org/T113306#1663426 (DStrine) [17:17:06] Fundraising-Backlog: Change "continue" button for credit card logos, suppress logos from within iframe - https://phabricator.wikimedia.org/T113304#1663430 (DStrine) [17:19:05] Fundraising Sprint Tom Waits, Fundraising-Backlog, fundraising-tech-ops: Paypal IPN log is not replicated to log server? - https://phabricator.wikimedia.org/T113323#1663441 (DStrine) a:Jgreen [17:19:22] Fundraising-Backlog: Recharge minFraud account - https://phabricator.wikimedia.org/T113105#1663444 (awight) a:awight>K4-713 [17:19:29] Fundraising Sprint Tom Waits, Fundraising-Backlog, Unplanned-Sprint-Work: Sample XML for a GC USD credit card donation - https://phabricator.wikimedia.org/T113365#1663446 (awight) [17:19:52] Fundraising Sprint Tom Waits, Fundraising-Backlog, Unplanned-Sprint-Work: Backfill from Aug 25-Sept 17 PayPal audit outage - https://phabricator.wikimedia.org/T112920#1663449 (awight) [17:20:40] Fundraising-Backlog, Wikimedia-Fundraising-CiviCRM: Missing Donation in Civi/Showing as Duplicate - https://phabricator.wikimedia.org/T113263#1663455 (awight) [17:22:16] Fundraising-Backlog, Wikimedia-Fundraising-CiviCRM: Missing Donation in Civi/Showing as Duplicate - https://phabricator.wikimedia.org/T113263#1660195 (awight) This is probably due to our synthesized transaction ID for check donations. Check which code path we're using to generate the ID, and determine w... [17:24:36] Fundraising-Backlog: Teach ccogdill to get failed payment data through grep - https://phabricator.wikimedia.org/T113268#1663470 (DStrine) [17:26:22] Fundraising-Backlog: donatewiki access for Trilogy - https://phabricator.wikimedia.org/T110038#1663481 (atgo) hey @pcoombe are you able to do this? @awight says you're an admin. Let us know if you can't [17:26:45] Fundraising-Backlog: Teach ccogdill to get failed payment data through grep - https://phabricator.wikimedia.org/T113268#1663485 (awight) There's some abandoned work here, my thought is that we build a tool to pull out log records matching a pattern. https://gerrit.wikimedia.org/r/#/c/234417/ [17:27:02] Fundraising-Backlog: Teach ccogdill to get failed payment data through grep - https://phabricator.wikimedia.org/T113268#1663491 (Ejegg) Hi @CCogdill_WMF! While learning grep would be fun, we may have to take a different approach here. Because those logs are on production, I guess we're trying to minimize t... [17:28:30] Fundraising-Backlog, Recurring-Donations: Create option for EOY receipt for recurring donors - https://phabricator.wikimedia.org/T103447#1663503 (awight) I wrote a module to do this, but deleted it due to disuse. Look in crm/modules/eoy_thankyou [17:30:33] dstrine, awight: I know you guys are in the backlog meeting, but did anybody talk about Gerrit Cleanup Day while I was out? [17:30:39] Fundraising-Backlog: Teach ccogdill to get failed payment data through grep - https://phabricator.wikimedia.org/T113268#1663519 (CCogdill_WMF) Cool, @Ejegg and @awight, that sounds great too! It also sounds like a huge project. Keep me posted if Sprint +1 actually feels realistic. [17:30:56] ...you're not going to see this, are you. [17:31:02] hi [17:31:06] :p [17:31:16] I haven't been contacted about it but I'd love to discuss [17:31:24] Ah, it's kind of tomorrow. [17:31:29] :/ [17:31:38] Fundraising-Backlog, Recurring-Donations: Make different monthly receipt for recurring donors - https://phabricator.wikimedia.org/T112966#1663523 (awight) We can use contribution tags for this. [17:31:51] I don't know why I bother setting up email responders if people don't read them and contact others. [17:32:08] * K4-713 ends generic grumbling [17:32:30] Fundraising-Backlog, Recurring-Donations: Create option for EOY receipt for recurring donors - https://phabricator.wikimedia.org/T103447#1663527 (DStrine) [17:32:36] Fundraising-Backlog, Recurring-Donations: Make different monthly receipt for recurring donors - https://phabricator.wikimedia.org/T112966#1663528 (DStrine) [17:37:36] Fundraising-Backlog, Wikimedia-Fundraising-CiviCRM, Continuous-Integration-Config, WorkType-Maintenance: Test results are not pretty-printed by Jenkins - https://phabricator.wikimedia.org/T113321#1663569 (awight) Open>Invalid a:awight @hashar: Thanks for investigating, and sorry for the t... [17:38:16] fundraising-tech-ops: payments-payflow* log files can be deprecated - https://phabricator.wikimedia.org/T113309#1663578 (awight) [17:40:06] fundraising-tech-ops: paypal gateway log messages should be bucketed - https://phabricator.wikimedia.org/T113308#1663595 (awight) [17:43:44] Fundraising-Backlog, fundraising-tech-ops: Finish config file centralization for Fundraising systems - https://phabricator.wikimedia.org/T113301#1663613 (atgo) @awight to flesh out [17:50:16] Fundraising-Backlog, fundraising-tech-ops: Outdated cert on GC iframe? - https://phabricator.wikimedia.org/T112990#1663640 (atgo) Not happening to me... @ccogdill_wmf is it still happening? we think this is on GCs side [17:57:36] Fundraising-Backlog, MediaWiki-extensions-CentralNotice: Special:HideBanners should output a valid PNG - https://phabricator.wikimedia.org/T112969#1663670 (awight) Sounds valid--but what does this actually do to Edge, does it break JS or show errors outside the console or anything? [18:05:42] Fundraising-Backlog, fundraising-tech-ops: Outdated cert on GC iframe? - https://phabricator.wikimedia.org/T112990#1663685 (CCogdill_WMF) My browser isn't showing an obvious warning, but if I right click > View Frame Info I still see the attached cert information. Only our most tech savvy donors would th... [18:06:58] Fundraising-Backlog, fundraising-tech-ops: Outdated cert on GC iframe? - https://phabricator.wikimedia.org/T112990#1663691 (CCogdill_WMF) Oh - and I'm fairly positive it *is* on GC's side, but I thought we might want to bring it up with them. [18:11:54] Fundraising-Backlog, Wikimedia-Fundraising-CiviCRM: JPMorgan Import Not Working - https://phabricator.wikimedia.org/T113381#1663704 (CaitVirtue) [18:15:48] Fundraising-Backlog, Wikimedia-Fundraising-CiviCRM: JPMorgan Import Not Working - https://phabricator.wikimedia.org/T113381#1663718 (CaitVirtue) We need this triaged today. Without this import we can get these gifts into Civi, thank the donors, or close out the monthly financials for August. [18:17:10] atgo: awight: What are your thoughts on this: https://phabricator.wikimedia.org/T113381 virtue seems pretty adamant about this [18:17:30] I would wait to discuss in standup but atgo: will not be there [18:17:42] Fundraising-Backlog, Wikimedia-Fundraising-CiviCRM: JPMorgan Import Not Working - https://phabricator.wikimedia.org/T113381#1663725 (atgo) @caitvirtue triaged or solved? [18:17:57] ah NM [18:18:01] I see comments [18:25:25] Fundraising-Backlog, Wikimedia-Fundraising-CiviCRM, Continuous-Integration-Config, WorkType-Maintenance: Test results are not pretty-printed by Jenkins - https://phabricator.wikimedia.org/T113321#1663749 (hashar) >>! In T113321#1663569, @awight wrote: > @hashar: Thanks for investigating, and sorry... [18:29:55] Fundraising-Backlog, Wikimedia-Fundraising-CiviCRM: JPMorgan Import Not Working - https://phabricator.wikimedia.org/T113381#1663769 (CaitVirtue) Triaged today so we can get a sense of how long the solution will take to implement. This is blocking other tasks for us. [18:31:40] XenoRyet: it occurs to me that our existing audit report downloaders are in python, and it looks like the python version of the payWithAmazon SDK already has the request/response parsing broken out from the bits that tie the PHP sdk directly to the order manipulation operations [18:32:19] We wouldn't reuse much from the existing downloaders, since they're using sftp, but we could at least do the configuration consistently [18:32:45] and we might not have to fork the sdk, just call the lower-level class [18:33:38] Interesting [18:34:21] This class is the one we'd use - can just feed it the reports endpoint in config: https://github.com/amzn/login-and-pay-with-amazon-sdk-python/blob/master/pay_with_amazon/payment_request.py [18:36:28] ejegg: I love the Python audit tools with a parent's pride, except maybe Amazon ;), but the long-term goal is def to write them in PHP [18:36:43] ah, cool [18:36:47] That said, it's fine with me to write the Python auditor if it's much faster, then port it later. [18:36:57] Eazy [18:37:32] yeah, i'd prefer not to do too much SDK forking, considering they've ignore my pull requests and issues so far [18:37:59] So where are the current tools living? I could have a look and see what the difference in difficulty would be. [18:38:10] they say they're planning to refactor the PHP version to make the same sort of thing possible, but I can't get a firm date [18:38:44] XenoRyet: repo is /wikimedia/fundraising/tools [18:38:54] cool [18:39:00] we'd be writing something pretty much standalone either way [18:40:00] the downloaders use code in the sftp folder, and have some processor-specific config in the audit folder [18:40:09] Yea. I'm still sort of working on getting the whole big picture in my head, helps to see what the existing stuff is doing whichever way I go. [18:41:32] Fundraising-Backlog, Wikimedia-Fundraising-CiviCRM: JPMorgan Import Not Working - https://phabricator.wikimedia.org/T113381#1663814 (atgo) p:Triage>High [18:41:38] The business logic is minimal, a future port from Py to PHP is really not a bad thing, /me mumbles into bib [18:42:50] XenoRyet: we'd be writing a few methods like the ones in https://github.com/amzn/login-and-pay-with-amazon-sdk-python/blob/master/pay_with_amazon/client.py [18:43:02] Fundraising Sprint Tom Waits, Fundraising-Backlog, fundraising-tech-ops: Paypal IPN log is not replicated to log server? - https://phabricator.wikimedia.org/T113323#1663817 (Jgreen) a:Jgreen>None That file is opened and appended to directly by the php process (see PaypalIPNListener.php). To cent... [18:43:21] basically just setting up an array of parameters and calling methods on the PaymentRequest [18:43:52] (PS1) XenoRyet: Set no_thank_you for Major Gifts importer [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/240146 (https://phabricator.wikimedia.org/T101191) [18:45:42] ^^ that's a one-liner if someone wants to review real fast. [18:45:49] looking [18:47:07] Fundraising Sprint Tom Waits, Fundraising-Backlog, fundraising-tech-ops: Paypal IPN log is not replicated to log server? - https://phabricator.wikimedia.org/T113323#1663829 (awight) Great, thank you for pointing that out! [18:48:27] Fundraising Sprint Tom Waits, Fundraising-Backlog, Unplanned-Sprint-Work: Legacy PayPal IPN listener should syslog - https://phabricator.wikimedia.org/T113386#1663831 (awight) NEW [18:55:13] (CR) Ejegg: [C: 2] ""Because trilogy". Looks good!" [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/240146 (https://phabricator.wikimedia.org/T101191) (owner: XenoRyet) [18:55:32] Thanks ejegg [19:02:01] Fundraising-Backlog, fundraising-tech-ops: Make changes on orphan rectification box to support new GC SSL ciphers - https://phabricator.wikimedia.org/T113392#1663895 (awight) NEW a:awight [19:03:52] K4-713 dstrine you guys joining? [19:03:55] woohoo, Amazon contrib made it into Civi and IPN didn't failmail! [19:04:12] hargh [19:04:32] You should retitle the meeting to "Katie doesn't eat anything." [19:10:39] (PS1) Eileen: T99836 Civi46 remove call to psuedoconstnat:ContributionType [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/240153 [19:10:41] (PS1) Eileen: T99836 Civi46 magic var for weight from api call [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/240154 [19:11:28] (CR) jenkins-bot: [V: -1] T99836 Civi46 remove call to psuedoconstnat:ContributionType [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/240153 (owner: Eileen) [19:12:01] (CR) jenkins-bot: [V: -1] T99836 Civi46 magic var for weight from api call [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/240154 (owner: Eileen) [19:15:50] (PS1) Eileen: T99836 Civi46 : change submodule version to 4.6.9 [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/240156 [19:16:19] (CR) jenkins-bot: [V: -1] T99836 Civi46 : change submodule version to 4.6.9 [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/240156 (owner: Eileen) [19:18:34] Fundraising-Backlog, fundraising-tech-ops: Use Redis 3 when it's available - https://phabricator.wikimedia.org/T113399#1664013 (awight) NEW [19:19:01] (PS1) Ejegg: Fix Amazon completion message ID [wikimedia/fundraising/SmashPig] - https://gerrit.wikimedia.org/r/240157 (https://phabricator.wikimedia.org/T109649) [19:20:31] awight: I still haven’t got the hang of co-operating with jenkins + gerrit [19:21:18] eileen: that's definitely the wmf thing that takes the longest to get used to [19:21:23] :-) [19:21:48] I seem to be causing confusion with feature branches too [19:22:02] and each repo can have totally different rules for who's allowed to do what, when jenkins counts, and what tests matter [19:22:09] :-) [19:22:34] well it just crashed hard [19:22:35] https://integration.wikimedia.org/ci/job/wikimedia-fundraising-civicrm/738/console [19:23:49] & I think the problem is that I need to make fixes in crm to get civi46 to work (branch = 4.6.9-deploy) but I think maybe the civi commit I’m using (same branch name) isn’t accepted into that branch yet [19:23:57] * awight looks at the NZ clock and blinks [19:24:32] hmm, looks to me like there are a just a few different things that need fixing before the unit tests all go green [19:24:41] yeah - early start - I have to go to a school prod in the afternoon for a bit [19:24:50] so maybe we should make those non-voting on the 4.6 thing for now [19:25:12] ejegg: which ones are you looking at? [19:25:36] for instance, your pseudoconstant fix is failing cause of CiviCRM_API3_Exception: API (LocationType,create) does not exist (join the API team and implement it!) [19:25:48] which doesn't look like a problem you introduced with that commit [19:26:03] ejegg: yeah - but if it were grabbing the 4.6.9-deploy branch of civi that WOULD exist [19:26:21] ohh, so our build is grabbing an old thing [19:26:33] ok, we might need to update our CI scripts first [19:26:50] well - I’m having trouble co-ordingating the branches [19:27:18] I thought that by adding a push to update the submodule it might pick it up [19:27:35] hmm, ok, let's see what that log looks like [19:27:42] but I think this 19:16:18 ++ echo 'Failed to locate valid civi root: /mnt/jenkins-workspace/workspace/wikimedia-fundraising-civicrm/src/wikimedia/fundraising/civicrm-buildkit/build/wmff/sites/all/modules/civicrm' [19:27:48] is a clue that didn’t work... [19:29:36] I can log into that box and see what shape it's in. [19:30:47] Hmm, that's something I haven't seen. [19:31:08] the crm/ directory looks like it was merged on-the-fly [19:31:26] ok … [19:31:28] but, parents are 6cfe9efc30739e622189dd153e2edcde83b95d3a and 70588cc03829ec7fbbdbc19ca96a1296c77335b8 [19:31:31] which seems ok [19:32:10] crm/civicrm is at dbeff641f99bfa73fd820e20ccd61ebb822a5d25 which is no good [19:32:39] no… [19:32:52] eileen: What is the gerrit URL for this change? [19:33:10] This is also bad: 19:15:55 DEBUG:zuul.Cloner:Project wikimedia/fundraising/crm/civicrm in Zuul does not have ref refs/zuul/master/Za36f4bef17a34f52a53b1380e1eca6f4 [19:33:21] awight: yeah that’s the other thing - I may have created too many by doing multiple small commits [19:33:24] Unless you're experimenting with a change to the crm/ repo [19:33:59] so - I put the crm repo changes to the branch 4.6.9-deploy & ditto the civicrm changes [19:34:16] eileen: I think something's wrong with your commit, https://gerrit.wikimedia.org/r/#/c/240156/1/sites/all/modules/civicrm,unified [19:34:29] vws https://gerrit.wikimedia.org/r/#/c/240156/1/sites/all/modules/civicrm,unified [19:34:34] * awight squints [19:34:42] What are those two files in the diff? [19:35:11] Did you swap out the civicrm repo entirely, and maybe that didn't work? [19:35:27] It does look like more than a submodule version change doesn’t it? [19:35:39] the SHA is the same... [19:35:49] but instead of a diff, it's a delete and add of the same file?? [19:36:07] ok.. I’l try to redo that change & see [19:36:19] I think there's a "git submodule sync" step that has to happen, if you're swapping out the repo for another [19:36:32] We could add that to the jenkins job [19:37:42] eileen: btw, https://integration.wikimedia.org/ci/login?from=%2Fci%2Fjob%2Fwikimedia-fundraising-civicrm%2F [19:37:50] your LDAP password should get you in there [19:38:11] Our jobs are code-generated by Jenkins Job Builder, but you can make temporary changes to the jobs directly, as needed [19:38:24] cool [19:38:30] ejegg: donated! [19:38:44] yay! [19:39:12] eileen: oh! we can't use submodule sync actually, Zuul cloner does its own evil magick [19:40:14] I'm thinking that CI will only checkout a review branch of the repo the change under test belongs to. So you need to run tests on the civicrm/ repo changes and not the crm/ ones [19:40:37] atgo: how bout those multiple emails though? We charge right after we initiate payment, so I'm not sure why Amazon bothers sending the separate 'You initiated a donation' mail [19:40:51] zuul-cloner doesn't respect the submodule structure, unfortunately. Again, we can change this temporarily if that's more convenient [19:40:54] awight: so, I made changes in the crm repo to not user gone functions [19:40:54] yeah tha tis weird ejegg [19:41:05] can we... have them not do that? [19:41:09] I'll ask our contact if we can change it [19:41:20] and will i get a 3rd email confirming from amazon? [19:41:23] eileen: Are they safe to merge to trunk? [19:41:40] atgo: I believe so. Lemme see how long it took on my last one [19:42:54] atgo: man, last time it was almost 2 hrs before Amazon sent out the 'Thank you for donating' 2nd email [19:43:11] awight: well - the changes should all be going into a new branch [19:43:22] 4.6.9-deploy [19:43:25] I mean, the crm/ changes [19:43:38] yeah _ did a new branch for that too [19:43:51] If they're backwards compatible with civi 4.2, we can just merge that and have fewer Jenkins headaches [19:44:28] atgo: grr. this page makes it sound like those 2 are always sent: https://payments.amazon.com/documentation/lpwa/201749840#201750390 [19:44:56] awight: they aren’t at the moment - I guess I could make them so they were - although they might be a bit messy if I do - lots of IF [19:46:41] ah ok [19:47:18] awight: I think we would need to amass quite a few changes to cope with the change to financial_type & that would start to be quite messy [19:47:26] Making the fix to CI in a general way is too much work. How about we kludge the build script to do a submodule checkout? [19:47:40] eileen: oh, I'm talking about the crm/ repo changes not the crm/civicrm ones [19:48:04] You said that you made Drupal changes or something? [19:48:15] Maybe I misunderstood that [19:48:27] awight: yeah the civicrm [19:48:31] wmf_civicrm module [19:48:37] Fundraising-Backlog: [EPIC] Amazon embedded 1-hour test version - https://phabricator.wikimedia.org/T108106#1664102 (Ejegg) [19:48:38] Fundraising Sprint Tom Waits, Fundraising-Backlog, Unplanned-Sprint-Work, Patch-For-Review: Amazon donation messages not setting gateway_transaction_id - https://phabricator.wikimedia.org/T113089#1664101 (Ejegg) Open>Resolved [19:48:42] creates financial_types & location_types on install [19:48:55] & those creates use gone functions [19:49:22] oohkay [19:49:34] what is 'use gone'? [19:49:42] e. CRM_Core_Pseudoconstant::ContributionTYpe [19:49:51] no longer exists [19:50:01] got it [19:50:29] I *could* either add it to 4.6 codebase but that feels like a later head-ache [19:50:43] or add the replacement to 4.2 [19:50:56] so we are making 4.2 support the 4.6 version of code [19:51:02] Yeah, this is nasty. Lemme see if I can rewrite the build script... [19:51:09] ok [19:53:04] awight: is adding upgrade hooks to wmf_civicrm a good way to add extra things to run when we do the upgrade - I’m thinking here about setting the new setting for no-preferred-language (which is in core 4.7 & Fuzion/WMF 4.6 now) [19:53:04] (CR) Awight: "recheck" [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/240156 (owner: Eileen) [19:53:16] eileen: Did you figure out what's going on with the submodule pointer? [19:53:36] eileen: Yeah, hooks in wmf_civicrm sounds perfect for now. [19:54:16] (PS1) Ejegg: Fix Amazon communication stats recording [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/240163 [19:54:19] awight: no - I will try checking out a new crm & redo the pointer [19:55:49] eileen: I updated the build script to do a git submodule sync and update, but more fail: https://integration.wikimedia.org/ci/job/wikimedia-fundraising-civicrm/739/console [19:57:01] that submodule commit is def no good [19:57:09] ok [19:57:25] Well, your next PS will trigger another tweak to the build script [19:57:32] I’m just looking & I don’t thik I created that 4.6.9-deploy feature branch on crm - only civicrm [19:58:06] am I better to switch to sandbox branches for both rather than feature branches? Will they both still trigger the right things? [19:58:21] sandbox branches don't have CI [20:00:20] hmm [20:00:37] eileen: you're invited to our standup in a few minutes, if you wish [20:00:47] cool [20:05:59] (PS1) AndyRussG: KVStore: batched, more resilient implementation of TTL for items [extensions/CentralNotice] - https://gerrit.wikimedia.org/r/240170 [20:07:53] Fundraising Sprint Tom Waits, Fundraising-Backlog, fundraising-tech-ops, Unplanned-Sprint-Work: Paypal IPN log is not replicated to log server? - https://phabricator.wikimedia.org/T113323#1664177 (DStrine) [20:08:04] (CR) jenkins-bot: [V: -1] KVStore: batched, more resilient implementation of TTL for items [extensions/CentralNotice] - https://gerrit.wikimedia.org/r/240170 (owner: AndyRussG) [20:16:26] (PS2) AndyRussG: KVStore: batched, more resilient implementation of TTL for items [extensions/CentralNotice] - https://gerrit.wikimedia.org/r/240170 [20:18:24] (CR) jenkins-bot: [V: -1] KVStore: batched, more resilient implementation of TTL for items [extensions/CentralNotice] - https://gerrit.wikimedia.org/r/240170 (owner: AndyRussG) [20:31:14] awight: if i read https://phabricator.wikimedia.org/T89899 correctly you should be able to make private tasks as outlined [20:33:32] nevermind I understand now [20:33:52] awight: you should be able to modify policy and create private tasks in teh same way atgo can now [20:34:05] standard warning is, please don't do this anywhere you aren't sure you should be doing it thanks [20:34:51] (PS1) Cdentinger: Pass CVN request [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/240256 [20:43:26] chasemp: oh! k, trying it now, thanks [20:44:21] awesome, that worked! [20:49:00] does anyone have time to CR https://gerrit.wikimedia.org/r/240256 ? i will hit you back! just need to get this next test sent off asap [20:49:13] (PS1) Eileen: T99836 Civi46 : change submodule version to 4.6.9 [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/240262 [20:49:57] (CR) Katie Horn: [C: 2] Pass CVN request [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/240256 (owner: Cdentinger) [20:50:03] Bam. [20:50:07] ty K4-713 ! [20:50:12] yep. :) [20:50:37] (Merged) jenkins-bot: Pass CVN request [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/240256 (owner: Cdentinger) [20:50:40] I like the ones that are totally straightforward. [20:50:41] (CR) jenkins-bot: [V: -1] T99836 Civi46 : change submodule version to 4.6.9 [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/240262 (owner: Eileen) [20:52:57] awight: my "brilliant" idea for the global BH thing is this: create a new campaign mixin hook "onTargetedButNotAllocated"! :D [20:54:02] Wasn't ewulczyn saying it is useful to get a count of how many pageviews w/o a banner come between each impression? [20:55:19] (PS1) Cdentinger: Merge branch 'master' into deployment [extensions/DonationInterface] (deployment) - https://gerrit.wikimedia.org/r/240264 [20:55:34] I'm not sure that would fit into that hook well [20:55:51] In this case, if you have two or mode campaigns that target the same user segment on all criteria, well, each gets allocated a percentage of pageviews and only one gets chosen. If the one of the ones that got chosen has a mixin that handles that hook, it gets run, so that can log "other" banners that appear between FR campaigns [20:55:54] rrrg hrrm [20:55:55] one sec [20:56:06] (CR) Cdentinger: [C: 2] Merge branch 'master' into deployment [extensions/DonationInterface] (deployment) - https://gerrit.wikimedia.org/r/240264 (owner: Cdentinger) [20:56:39] (Merged) jenkins-bot: Merge branch 'master' into deployment [extensions/DonationInterface] (deployment) - https://gerrit.wikimedia.org/r/240264 (owner: Cdentinger) [20:56:59] awight: yes you're right [20:57:12] ah well then no, I don't have any ideas about that :( [20:57:48] hey cwdent - i hear there's been some additional nonsense from our favorite vendor [20:59:01] atgo: yeah...sending a few new fields today [20:59:04] and removing a few old ones [20:59:21] about to deploy and have PPena test again [20:59:52] ok. be sure to let me and PPena know if we need to throw a fit. [20:59:53] (PS1) Cdentinger: Update DonationInterface submodule [core] (fundraising/REL1_25) - https://gerrit.wikimedia.org/r/240268 [21:00:49] atgo: if this doesn't work i think we're at that point. this back-and-forth pasting xml into emails is a huge waste of time [21:01:21] i should email that one engineer directly who was actually helpful [21:01:43] cwdent: yes. that's a great idea [21:03:05] (CR) Cdentinger: [C: 2] Update DonationInterface submodule [core] (fundraising/REL1_25) - https://gerrit.wikimedia.org/r/240268 (owner: Cdentinger) [21:03:21] atgo: I'm in the fit-throwing corner. They very specifically need to have their developers write some XML, put it in their own feed bag, and let us know when everything just works. [21:03:46] I'm only holding off in order to let kc work squeeze the last few useful drops of their blood before the big fight [21:04:04] yeah. grumble. let's test it again and then go from there [21:04:44] kk, about to deploy [21:06:29] atgo: This should be their second warning, though... it's totally unprofessional. Not that I haven't done it myself, but I wasn't pretending to be a real company at the time. [21:07:42] awight: the submodule thing worked this time - but it failed on something that I put in a separate patch - I’m a bit of a fan of small patches - but perhaps I need to squash them all into one commit? [21:07:54] eileen: ooh, this is great [21:08:22] Small problem, I realized we're breaking the build for crm/ patches now. I have to put this submodule code in a conditional on the repo name. [21:08:39] Um, squashing is not necessary, you can make them dependencies of each other, or do an octopus merge [21:08:52] (which I've been throwing out before final merge to trunk) [21:09:32] how do you make them dependencies? [21:09:45] like, cherry-pick one on top of the other [21:10:04] Or... lemme start reviewing to make this easier [21:10:23] we can just merge to the 4.6.9 branch [21:10:55] (CR) Awight: [C: 2 V: 2] T99836 Civi46 magic var for weight from api call [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/240154 (owner: Eileen) [21:11:09] have to get a little pushy to override the Jenkins V-2 [21:12:08] (CR) Awight: [C: 2 V: 2] "Wow, looks great! TODO: needs tests" [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/240153 (owner: Eileen) [21:12:35] (PS3) AndyRussG: KVStore: batched, more resilient implementation of TTL for items [extensions/CentralNotice] - https://gerrit.wikimedia.org/r/240170 (https://phabricator.wikimedia.org/T111385) [21:14:07] awight: ejegg: cwdent: ^ definitely reviewable, the failing tests appear not to be related to CentralNotice [21:17:36] (CR) Eileen: "Yes! time for me to get my first WMF test written!" [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/240153 (owner: Eileen) [21:19:25] (CR) jenkins-bot: [V: -1] KVStore: batched, more resilient implementation of TTL for items [extensions/CentralNotice] - https://gerrit.wikimedia.org/r/240170 (https://phabricator.wikimedia.org/T111385) (owner: AndyRussG) [21:20:36] awight: actually I'm wrong again. An "onTargetedButNotAllocated" could work to count page views between impressions for low-level campaigns where not all the allocation pie has been eaten [21:21:07] eileen: I don't think it matters if u write the tests in a later commit, all I care is that eventually all our customizations are covered. [21:22:05] awight: yeah - but I do need to work through doing a test in your env & this is as good a place as any to start :-) [21:22:57] don't amend tho, unless you want me to cancel the code review +2? [21:23:08] cos it's about to be merged by jenkins, when I get to the root of this branch [21:27:46] Fundraising Sprint Tom Waits, Fundraising-Backlog, Unplanned-Sprint-Work: Parse PayPal audit data from Aug 25-Aug 27 + Sep 16 gaps - https://phabricator.wikimedia.org/T112989#1664471 (awight) a:awight [21:27:50] MBeat: fyi, I'm going to reprocess the missing audit files, https://phabricator.wikimedia.org/T112989 [21:28:07] great, thank you [21:28:08] A few donors will get 3-week-old thank you letters... [21:28:19] worse could happen! [21:29:53] nothing could be worse! nothing is what they were getting [21:30:09] MBeat: btw, any input here would be wonderful: https://www.mediawiki.org/wiki/Fundraising_tech/Glossary [21:30:53] awight: I won’t amend! [21:31:56] * awight mutters about our broken amend workflow [21:33:53] (PS1) Cdentinger: Update DonationInterface submodule [core] (fundraising/REL1_25) - https://gerrit.wikimedia.org/r/240273 [21:34:04] Fundraising Sprint Tom Waits, Fundraising-Backlog, Research-and-Data, Unplanned-Sprint-Work: Review banner history log data and confirm that it satisfies use cases - https://phabricator.wikimedia.org/T112986#1664487 (AndyRussG) @ellery @awight If the additional log entries would be to count pagevie... [21:37:57] any specific items I could add, awight? I’m guessing the names of the filters too private for a Mediawiki page? [21:41:10] (CR) Awight: [C: 2 V: 2] T99836 Civi46 remove call to pseudoconstant:locationType (1 comment) [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/240040 (owner: Eileen) [21:42:09] MBeat: I think that's fine, our code shows everything we're doing, the only private information is how we assign weight to each rule [21:42:44] It would be really cool do have more fraud documentation, cos we've historically been too prudent to put it in the public record [21:42:47] so it's missing. [21:43:49] there’s also the Collab stub https://collab.wikimedia.org/wiki/Fundraising/Fraud_Filtering_Documentation [21:46:32] (CR) Cdentinger: [C: 2] Update DonationInterface submodule [core] (fundraising/REL1_25) - https://gerrit.wikimedia.org/r/240273 (owner: Cdentinger) [21:48:52] MBeat: yes, thank you! I hadn't seen that before [21:49:08] (PS1) Ejegg: Upgrade to Drupal 7.39 upstream [wikimedia/fundraising/crm/drupal] (contrib) - https://gerrit.wikimedia.org/r/240276 [21:49:42] That's perfect, don't worry about the glossary I guess, unless you want to link to collab from there, which seems fair? [21:51:33] (PS1) Ejegg: Merge branch 'contrib' - 7.39 update [wikimedia/fundraising/crm/drupal] - https://gerrit.wikimedia.org/r/240277 [21:55:14] Is there a wiki page that covers the setup around tests & dev env & running the tests? I haven’t spotted one but am not sure where it would be if there was one. I figure I can add what I figure out to it … if it exist [21:55:15] s [21:56:16] !log updated payments from 7b08867d9c5e87f5babb4b5b9cf1f5bec5e243b3 to 8428499feb8760d63faf681d53995697a2ba0fa7 [21:56:22] Logged the message at https://wikitech.wikimedia.org/wiki/Server_Admin_Log, Master [21:57:46] Fundraising-Backlog, MediaWiki-extensions-DonationInterface: GC payments stuck in status 600 forever if SET_PAYMENT fails - https://phabricator.wikimedia.org/T113420#1664547 (awight) NEW [21:58:25] eileen: Can I help with getting phpunit running? [21:58:39] & have you tried the mediawiki-vagrant install yet? [21:58:51] It's nice to have as a reference, even if you don't develop there. [21:58:58] awight: no - I didn’t install using vagrant [21:59:19] I guess I could back up & create a vagrant & do it that way [21:59:24] If you ever want, https://www.mediawiki.org/wiki/Mediawiki-vagrant [21:59:51] ok [22:00:04] so when you run locally what is the command you are using? [22:00:07] It's nice to have the examples of working services and config, e.g. ActiveMQ [22:00:21] yes [22:00:25] I run, vagrant enable-role fundraising; vagrant up [22:00:27] Fundraising Sprint Tom Waits, MediaWiki-extensions-CentralNotice: Banner history: always send a temporary log ID, and never send back two logs on the same pageview - https://phabricator.wikimedia.org/T113421#1664563 (AndyRussG) NEW a:AndyRussG [22:01:04] (CR) Awight: [C: 2 V: 2] T99836 remove code to add prevnext indexes [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/240039 (owner: Eileen) [22:01:17] Fundraising Sprint Tom Waits, MediaWiki-extensions-CentralNotice: Banner history: always send a temporary log ID, and never send back two logs on the same pageview - https://phabricator.wikimedia.org/T113421#1664563 (AndyRussG) [22:02:30] eileen: Nice granular commits! [22:02:53] awight: yeah - I just wasn’t sure if the gerrit process lends itself to that [22:03:20] Fundraising Tech Backlog, Fundraising-Backlog, Wikimedia-Fundraising-CiviCRM, Epic, Patch-For-Review: [epic] Upgrade Civi to 4.6 & integrate new reporting - https://phabricator.wikimedia.org/T77910#1664582 (awight) [22:03:21] Fundraising Sprint Snoop (Dogg|Lion), Fundraising Sprint Tom Waits, Fundraising Tech Backlog, Fundraising-Backlog, and 2 others: Configure new CiviCRM staging instance for testing 4.6 upgrade - https://phabricator.wikimedia.org/T112314#1664583 (awight) [22:04:44] Fundraising-Backlog, Wikimedia-Fundraising-CiviCRM: CI tests are failing for Civi 4.6 branch - https://phabricator.wikimedia.org/T113422#1664584 (awight) NEW [22:05:20] AndyRussG: I don't think I can make it to tomorrow's scrum of scrums. Feel like subbing for me again? [22:05:29] ejegg: sure! [22:05:47] thanks! I'll forward you the links again just in case they've changed [22:06:14] ejegg: cool thx! anything specific u wanted to mention? I can just try to summarize the board... [22:06:24] nothing specific from me [22:06:31] eileen: lmk what errors you get when trying to run the tests [22:06:47] Does you have the web UI working? [22:06:51] s/es/ [22:07:06] awight: web UI for the tests? or civi [22:07:11] AndyRussG: unless you're eager to get that logEvent promise patch merged [22:07:23] hmm, I guess I should add more reviewers [22:07:31] I think mostly I’m trying to make sense of how you actually run them at this stage [22:08:09] eileen: Just the web UI in general.. as a diagnostic for whether the settings.php are good [22:08:48] oh right looks like it broke when I sorted out the submodule issue [22:09:48] ejegg: K! awight: cwdent: ^ LMK any thoughts 4 scrum-of-scrums. (eileen: the scrum-of-scrums is an organization-wide check-in where representatives from each team give a quick update on recent and upcoming work. I guess probably not too interesting for you now, since you're not coding on Mediawiki at all? In any case, that's what it is, in case there are ever things you'd specifically think we should bring to [22:09:48] the table there :) ) [22:11:33] cwdent: +1 all over your succinct piss-off [22:20:58] awight I have another small commit to make (from the tests - yay) - do you want me to add that now - or wait until you have merged the other ones? (another type on contributionType to financialType change) [22:21:48] (PS1) Ejegg: Update drupal and ctools [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/240279 [22:21:55] (CR) jenkins-bot: [V: -1] Update drupal and ctools [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/240279 (owner: Ejegg) [22:25:15] eileen: add away! [22:25:31] awight: cool [22:25:47] (PS1) Eileen: T99836 Civi46: change contributionType to financialType [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/240280 [22:26:21] (CR) jenkins-bot: [V: -1] T99836 Civi46: change contributionType to financialType [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/240280 (owner: Eileen) [22:28:44] (CR) Awight: [C: 2 V: 2] T99836 add option value for tag_used for upgrading installs too. [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/240038 (owner: Eileen) [22:30:13] http://gwan.ch/ [22:30:17] this...website... [22:30:27] it reminds me of timecube [22:32:32] (CR) Awight: [C: 2 V: 2] T99836 CiviCRM 4.6 : add otion value for tag_used_for on install (1 comment) [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/240037 (owner: Eileen) [22:34:22] (PS2) Awight: 4.6 upgrade preparation, replace contribution_type with financial_type [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/240031 (owner: Eileen) [22:35:12] (CR) jenkins-bot: [V: -1] 4.6 upgrade preparation, replace contribution_type with financial_type [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/240031 (owner: Eileen) [22:35:22] (CR) Awight: [C: 2 V: 2] "Woohoo, thanks for figuring this out!" [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/240031 (owner: Eileen) [22:35:29] (PS2) Awight: T99836 CiviCRM 4.6 : add otion value for tag_used_for on install [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/240037 (owner: Eileen) [22:35:36] (CR) Awight: [V: 2] T99836 CiviCRM 4.6 : add otion value for tag_used_for on install [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/240037 (owner: Eileen) [22:36:02] (PS2) Awight: T99836 add option value for tag_used for upgrading installs too. [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/240038 (owner: Eileen) [22:36:11] (CR) Awight: [V: 2] T99836 add option value for tag_used for upgrading installs too. [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/240038 (owner: Eileen) [22:36:22] (PS2) Awight: T99836 remove code to add prevnext indexes [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/240039 (owner: Eileen) [22:36:30] (CR) Awight: [V: 2] T99836 remove code to add prevnext indexes [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/240039 (owner: Eileen) [22:36:38] (PS2) Awight: T99836 Civi46 remove call to pseudoconstant:locationType [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/240040 (owner: Eileen) [22:36:51] (CR) Awight: [V: 2] T99836 Civi46 remove call to pseudoconstant:locationType [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/240040 (owner: Eileen) [22:37:00] (PS2) Awight: T99836 Civi46 remove call to psuedoconstnat:ContributionType [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/240153 (owner: Eileen) [22:37:08] (CR) Awight: [V: 2] T99836 Civi46 remove call to psuedoconstnat:ContributionType [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/240153 (owner: Eileen) [22:37:16] (PS2) Awight: T99836 Civi46 magic var for weight from api call [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/240154 (owner: Eileen) [22:37:27] (CR) Awight: [V: 2] T99836 Civi46 magic var for weight from api call [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/240154 (owner: Eileen) [22:37:56] eileen: One of these should be abandoned: https://gerrit.wikimedia.org/r/#/c/240156/ https://gerrit.wikimedia.org/r/#/c/240262/ [22:39:39] awight: yeah - i seem to be breeding gerrits [22:40:06] this one includes the latest change https://gerrit.wikimedia.org/r/#/c/240262/ [22:40:23] (PS2) Awight: T99836 Civi46 : change submodule version to 4.6.9 [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/240262 (owner: Eileen) [22:40:23] (I think of gerrits as being a bit like gerbills) [22:40:34] (CR) Awight: [C: 2 V: 2] T99836 Civi46 : change submodule version to 4.6.9 [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/240262 (owner: Eileen) [22:40:50] (PS2) Awight: T99836 Civi46: change contributionType to financialType [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/240280 (owner: Eileen) [22:41:03] (CR) Awight: [C: 2 V: 2] T99836 Civi46: change contributionType to financialType [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/240280 (owner: Eileen) [22:44:56] hmmm seen this before with composer ? - wikimedia/smash-pig dev-master requires amzn/login-and-pay-with-amazon-sdk-php ^1.0 -> no matching package found. [22:49:07] eileen: oh shoot, I need to update that [22:49:51] maybe just on packagist.org [22:50:10] err, no, will need it in composer.lock too [22:53:46] arghhhh awight - those crm changes have gone to master not 4.6.9-deploy! [22:53:48] eileen, awight: do we need a feature branch for crm for the 4.6 updates? [22:53:58] heh, just what I was wondering [22:54:15] ejegg: yeah - I *thought* I was doing against one but ... [22:54:30] np, let's just put a revert patch up [22:54:36] yeah! [22:56:06] eileen: ono, my fault [22:56:32] * awight looks up from review console in bewilderment [22:56:48] awight: I don’t think I created a branch through that web page for crm now I think about it [22:57:17] it's a nasty business. I find that editing .gitreview is the safest way to stay on a feature branch [22:58:39] (PS1) Ejegg: Revert commits on wrong branch [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/240287 [22:58:58] awight where is the link againt to create a new branch? [22:59:17] https://gerrit.wikimedia.org/r/#/admin/projects/wikimedia/fundraising/crm,branches [22:59:30] (CR) jenkins-bot: [V: -1] Revert commits on wrong branch [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/240287 (owner: Ejegg) [23:00:06] (CR) Awight: [C: 2 V: 2] Revert commits on wrong branch [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/240287 (owner: Ejegg) [23:00:08] ejegg: Thanks! [23:00:29] np [23:00:31] eileen: the sad part is, now you have to create new change-ids [23:00:34] I think [23:00:43] oh right [23:00:46] ok [23:00:56] maybe just try the first few commits and see if gerrit accepts [23:01:00] (CR) jenkins-bot: [V: -1] Revert commits on wrong branch [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/240287 (owner: Ejegg) [23:01:15] aww, really Jenkins? [23:01:30] kicked. [23:01:53] nice [23:03:17] (PS4) Awight: KVStore: batched, more resilient implementation of TTL for items [extensions/CentralNotice] - https://gerrit.wikimedia.org/r/240170 (https://phabricator.wikimedia.org/T111385) (owner: AndyRussG) [23:04:32] (PS1) Eileen: T99836 Civi46: change contributionType to financialType [wikimedia/fundraising/crm] (civi-4.6.9-deploy) - https://gerrit.wikimedia.org/r/240288 [23:05:05] eileen: That worked. But note you need a rebase [23:05:06] (CR) jenkins-bot: [V: -1] T99836 Civi46: change contributionType to financialType [wikimedia/fundraising/crm] (civi-4.6.9-deploy) - https://gerrit.wikimedia.org/r/240288 (owner: Eileen) [23:08:38] (PS1) Eileen: Revert "Revert commits on wrong branch" [wikimedia/fundraising/crm] (civi-4.6.9-deploy) - https://gerrit.wikimedia.org/r/240289 [23:09:09] (CR) jenkins-bot: [V: -1] Revert "Revert commits on wrong branch" [wikimedia/fundraising/crm] (civi-4.6.9-deploy) - https://gerrit.wikimedia.org/r/240289 (owner: Eileen) [23:09:50] whoa [23:09:56] nice one [23:10:02] (PS2) Awight: Revert "Revert commits on wrong branch" [wikimedia/fundraising/crm] (civi-4.6.9-deploy) - https://gerrit.wikimedia.org/r/240289 (owner: Eileen) [23:10:21] awight - yeah I think that works… [23:10:33] (CR) jenkins-bot: [V: -1] Revert "Revert commits on wrong branch" [wikimedia/fundraising/crm] (civi-4.6.9-deploy) - https://gerrit.wikimedia.org/r/240289 (owner: Eileen) [23:10:36] (CR) Awight: [C: 2 V: 2] "I like it! I don't see a diff or merge parents, but let's give this a shot anyway" [wikimedia/fundraising/crm] (civi-4.6.9-deploy) - https://gerrit.wikimedia.org/r/240289 (owner: Eileen) [23:12:11] I see .gitreview is in git - which is kind of a pain [23:13:00] (CR) Krinkle: KVStore: batched, more resilient implementation of TTL for items (1 comment) [extensions/CentralNotice] - https://gerrit.wikimedia.org/r/240170 (https://phabricator.wikimedia.org/T111385) (owner: AndyRussG) [23:13:18] (CR) Krinkle: [C: -1] KVStore: batched, more resilient implementation of TTL for items [extensions/CentralNotice] - https://gerrit.wikimedia.org/r/240170 (https://phabricator.wikimedia.org/T111385) (owner: AndyRussG) [23:13:55] eileen: it is, but mostly okay if you merge carefully [23:14:06] yeah [23:14:31] It's nice when you check out a feature branch, and the .gitreview does the right thing [23:25:43] awight: I have to go out for a bit [23:26:07] so you can have a break from my questions :-) [23:26:34] (PS1) Alex Monk: Revert "Merge branch 'master' into deployment" [extensions/DonationInterface] (deployment) - https://gerrit.wikimedia.org/r/240293 [23:26:47] ??? [23:28:43] (CR) Awight: [C: 1] "Waiting to merge until Krinkle's comment is resolved." (5 comments) [extensions/CentralNotice] - https://gerrit.wikimedia.org/r/240170 (https://phabricator.wikimedia.org/T111385) (owner: AndyRussG) [23:28:57] (PS2) Alex Monk: Revert "Merge branch 'master' into deployment" [extensions/DonationInterface] (deployment) - https://gerrit.wikimedia.org/r/240293 [23:29:32] (CR) Alex Monk: [C: 2 V: 2] Revert "Merge branch 'master' into deployment" [extensions/DonationInterface] (deployment) - https://gerrit.wikimedia.org/r/240293 (owner: Alex Monk) [23:29:53] wtf [23:32:00] (CR) Awight: "@krenair: Hey, thank you for looking at our mess--please note that DonationInterface is deployed from master for the production cluster--t" [extensions/DonationInterface] (deployment) - https://gerrit.wikimedia.org/r/240293 (owner: Alex Monk) [23:32:16] At least that hasn't been happening all day! [23:32:43] cwdent|afk: ^ that [23:32:54] Krenair just reverted one of your deployments [23:33:07] awight: asking about it over in ops [23:33:53] ah, I started in on it in -dev [23:45:06] Fundraising-Backlog, Wikimedia-Fundraising-CiviCRM: JPMorgan Import Not Working - https://phabricator.wikimedia.org/T113381#1664772 (CaitVirtue) When does the next sprint start?