[09:03:24] seems my instance is gone :( [09:05:11] found it but can't login [10:00:02] andrewbogott_afk some eta for bots instances down time? [17:27:56] aude: which instance? [17:28:09] ssh: Could not resolve hostname maps-osmmapnik.pmtpa.wmflabs: Name or service not known [17:28:27] i-0000039b [17:28:57] Ldap::Client::Instance-finish/Exec[check_autofs]) Skipping because of failed dependencies [17:29:01] i see that [17:29:28] is that a problem? [17:29:50] for now just ssh i-0000039b.pmtpa.wmflabs [17:30:02] Error 400 on SERVER: Duplicate definition: Sshkey[10.4.0.2] is already defined in file /etc/puppet/manifests/ssh.pp at line 36; cannot redefine at /etc/puppet/manifests/ssh.pp:36 on node i-0000039b.pmtpa.wmflabs [17:30:06] Aug 4 16:18:21 i-0000039b puppet-agent[25530]: Using cached catalog [17:30:16] doesn't sound good [17:30:48] !b 38846 | aude: may just be another instance of [17:30:48] aude: may just be another instance of: https://bugzilla.wikimedia.org/38846 [17:31:49] not sure [17:31:55] doesn't matter [17:32:01] anyway, you're hitting something different [17:32:13] right [17:32:20] duplicate ssh keys or something, perhaps [17:32:50] no [17:33:07] !g 17065 [17:33:07] https://gerrit.wikimedia.org/r/#q,17065,n,z [17:33:12] that's your current problem [17:33:23] the fix broke something else so it was reverted [17:33:31] so it's back to being broken again ;) [17:34:40] ugh [17:34:47] * aude doesn't understand [17:35:13] * aude can play on my other isntance but would be nice to get this sorted out [17:36:13] we need our own puppetmasters for labs. full stop, end of story [17:36:32] (that we can push to ourselves) [17:36:38] yeah [17:36:53] * aude waits until monday..... [17:37:14] and we need labsconsole to be able to be told that a node being created should be made with a certain host as puppetmaster [17:37:27] so even the intial run is against our custom puppetmaster [17:37:27] sure [17:37:43] sounds good to me :) [17:37:53] initial* [17:41:18] jeremyb: the ssh i-0000039b.pmtpa.wmflabs does work :) [17:41:28] aude: i know, i used it [17:41:34] ah, okay :) [19:58:12] jeremyb: I know why it failed [19:58:19] what failed? [19:58:22] but wasn't able to fix it [19:58:34] I wrote a patch but failed to push it to gerrit [19:58:48] oh, <+matanya> I wrote a patch, but failed to push it [19:58:56] yes [20:00:07] matanya: so, what happened? [20:00:10] sorted it out? [20:01:39] pasting it [20:02:11] http://etherpad.wikimedia.org/o1Ub87jizX [20:02:44] jeremyb: [20:03:11] I know what it mean, but failed to change my mail, from some reason [20:14:01] * jeremyb looks [20:15:10] matanya: so, if you make a new commit now what does it say? [20:15:31] the same [20:22:25] matanya: and `git config -l` ? [20:23:00] http://etherpad.wikimedia.org/o1Ub87jizX [20:23:57] huh, user.email is there twice [20:25:10] so? one global and one local? [20:25:17] i don't think so [20:25:40] and the same address anyway [20:25:46] git config -l | fgrep -c email [20:25:47] right [20:25:49] how do I remove it [20:25:51] gah [20:26:04] 2 [20:26:11] right [20:26:42] `git config --global -l` shows the same? [20:27:01] no [20:27:07] user.name=matanya [20:27:08] user.email=matanya.moses@gmail.com [20:27:25] ok [20:27:30] so: [20:27:33] git config --unset-all user.email [20:27:37] git config --global --unset-all user.email [20:27:48] git config --global user.email emailgoeshere [20:28:50] still the same error [20:29:09] do a brand new push [20:29:26] git checkout -b foo master [20:29:37] git reset --hard origin/master [20:29:42] change something [20:29:57] git commit -a -m testing123 [20:30:25] git push origin HEAD:refs/publish/master [20:33:08] matanya: i added you to the group for https://gerrit.wikimedia.org/r/gitweb?p=test/mediawiki.git;a=summary now [20:33:16] you should also be able to push there [20:33:44] thanks [20:34:01] Hey all, how easy is it to make http://translatesvg.wmflabs.org or somesuch an alias for http://208.80.153.9 ? [20:37:46] jeremyb: thanks! it worked [20:38:22] matanya: what about mediawiki now? [20:38:28] (not test) [20:38:37] was to mediawiki... [20:38:43] https://gerrit.wikimedia.org/r/#/c/17671/ [20:38:52] cool [20:39:27] klook ? [20:39:50] matanya: 1st line should be <= 65 chars. 2nd must always be blank [20:39:55] for commit msg [20:40:00] 3rd line can elaborate [20:40:11] 1st line should be a complete thought / summary [20:40:26] yes, typo. and a bug in my vim setting [20:40:47] heh [20:41:09] you should be able to amend in place and then just repush to the same place you did to begin with [20:41:51] how do I do that? [20:42:10] matanya: `git commit --amend` [20:43:59] I'm not so I got the point how to edit the body of the msg [20:45:16] not? [20:45:30] I changed the 1st line [20:45:31] matanya: did you change the patch at all or it's the same thing he attached? [20:45:34] k [20:45:53] the same patch, only changed the summary [20:46:03] ok [20:46:10] i mean the same thing from bugzilla [20:46:45] anyway, you should make him the author of the commit if he is the author ;) [20:48:22] well, sorry for so many question, but how? [20:57:41] nvm, worked it out myself for a change :) [20:58:21] Jarry1250: what did you need to do? [20:58:44] Oh, it's just on Special:NovaAddress [20:59:07] right [20:59:53] matanya: try this: GIT_AUTHOR_NAME="csteipp" GIT_AUTHOR_EMAIL="csteipp@wikimedia.org" GIT_AUTHOR_DATE="2012-05-22 23:30:07 UTC" EDITOR=vim git commit --amend --reset-author [21:01:23] done. thanks [21:01:56] I'm off to bed. will add more patches form bugzilla tomorrow. [21:02:06] matanya: layla tov ;) [21:02:13] Thank you for all your help!