Re: [Wikitech-l] New branch "testing" in operations/mediawiki-config

2012-06-30 Thread Petr Bena
There are several config change requests which are usually merged within few hours. The current process is that someone submit a patch which is directly merged to production, ignoring any staging platform at all. What we can do now, is to copy paste the diff and merge it by hand into wmf-config fi

Re: [Wikitech-l] New branch "testing" in operations/mediawiki-config

2012-06-29 Thread Krinkle
On Jun 29, 2012, at 6:36 PM, Petr Bena wrote: > On Fri, Jun 29, 2012 at 4:22 PM, Antoine Musso wrote: > >> >> Timo proposed a system where we would have a common configuration >> directory, and one for production and another one for labs. Much like how >> /etc/php5/ is organized on Debian syst

Re: [Wikitech-l] New branch "testing" in operations/mediawiki-config

2012-06-29 Thread Antoine Musso
Le 29/06/12 18:36, Petr Bena wrote: > But that's a lot of hand work, if we really do this, we won't use > gerrit at all, we just copy paste code from diffs by hand and insert > it to some extra files. I would rather volunteer to sync branches > rather than this creep work. What hand work are you r

Re: [Wikitech-l] New branch "testing" in operations/mediawiki-config

2012-06-29 Thread Rob Lanphier
On Fri, Jun 29, 2012 at 3:58 AM, Petr Bena wrote: > Can we create a new branch which would be speedily merged when changes > were done to it, so that we could check out on labs and apply the > change there in order to test if patches submitted by devs works ok? > Thanks to Antoine we use the same

Re: [Wikitech-l] New branch "testing" in operations/mediawiki-config

2012-06-29 Thread Petr Bena
But that's a lot of hand work, if we really do this, we won't use gerrit at all, we just copy paste code from diffs by hand and insert it to some extra files. I would rather volunteer to sync branches rather than this creep work. On Fri, Jun 29, 2012 at 4:22 PM, Antoine Musso wrote: > Petr Bena w

Re: [Wikitech-l] New branch "testing" in operations/mediawiki-config

2012-06-29 Thread Antoine Musso
Petr Bena wrote: > Can we create a new branch which would be speedily merged when changes > were done to it, so that we could check out on labs and apply the > change there in order to test if patches submitted by devs works ok? > Thanks to Antoine we use the same repository on beta project, but >

Re: [Wikitech-l] New branch "testing" in operations/mediawiki-config

2012-06-29 Thread Petr Bena
Imagine: Some guy wants to deploy extension to Jamaican wikiversity and test it on labs for 2 months before deploying to production. He create a patch of config files and submit to gerrit. We merge it to test and extension is immediately deployed on beta. Another guy wants to test configuration c

Re: [Wikitech-l] New branch "testing" in operations/mediawiki-config

2012-06-29 Thread Petr Bena
If we are testing multiple items in same moment, replacing one test with another is actually problem. That's what we need to somehow merge right now. I hoped that gerrit could do it for us. And we test multiple items there almost all time :) On Fri, Jun 29, 2012 at 2:22 PM, Krinkle wrote: > On J

Re: [Wikitech-l] New branch "testing" in operations/mediawiki-config

2012-06-29 Thread Krinkle
On Jun 29, 2012, at 2:11 PM, Petr Bena wrote: > Current idea: > > someone submit a config change > this change is merged to testing branch > we git pull on labs > people test if change works ok and submit review to gerrit > we merge to master branch or reject it > > On Fri, Jun 29, 2012 at 2:07

Re: [Wikitech-l] New branch "testing" in operations/mediawiki-config

2012-06-29 Thread Petr Bena
Current idea: someone submit a config change this change is merged to testing branch we git pull on labs people test if change works ok and submit review to gerrit we merge to master branch or reject it On Fri, Jun 29, 2012 at 2:07 PM, Petr Bena wrote: > Yes but that would probably overwrite

Re: [Wikitech-l] New branch "testing" in operations/mediawiki-config

2012-06-29 Thread Petr Bena
Yes but that would probably overwrite any previous tests On Fri, Jun 29, 2012 at 1:23 PM, Krinkle wrote: > On Jun 29, 2012, at 1:04 PM, Chad wrote: > >> On Fri, Jun 29, 2012 at 6:58 AM, Petr Bena wrote: >>> Can we create a new branch which would be speedily merged when changes >>> were done to i

Re: [Wikitech-l] New branch "testing" in operations/mediawiki-config

2012-06-29 Thread Krinkle
On Jun 29, 2012, at 1:04 PM, Chad wrote: > On Fri, Jun 29, 2012 at 6:58 AM, Petr Bena wrote: >> Can we create a new branch which would be speedily merged when changes >> were done to it, so that we could check out on labs and apply the >> change there in order to test if patches submitted by devs

Re: [Wikitech-l] New branch "testing" in operations/mediawiki-config

2012-06-29 Thread Chad
On Fri, Jun 29, 2012 at 6:58 AM, Petr Bena wrote: > Can we create a new branch which would be speedily merged when changes > were done to it, so that we could check out on labs and apply the > change there in order to test if patches submitted by devs works ok? > Thanks to Antoine we use the same

[Wikitech-l] New branch "testing" in operations/mediawiki-config

2012-06-29 Thread Petr Bena
Can we create a new branch which would be speedily merged when changes were done to it, so that we could check out on labs and apply the change there in order to test if patches submitted by devs works ok? Thanks to Antoine we use the same repository on beta project, but right now it's really hard