Re: svn commit: r839584 - /infrastructure/buildbot/aegis/buildmaster/master1/projects/openofficeorg.conf

2012-11-27 Thread Andrew Rist 

Done

$ svn switch http://svn.apache.org/repos/asf/openoffice/trunk

At revision 1414324



also ran a switch on the win7snap build area:

$ svn switch http://svn.apache.org/repos/asf/openoffice/tags/SNAPSHOT

At revision 1414342




I now see that you did it through an imaginative set of buildbot config 
steps - nice work.
also - at first the revisions above looked identical, while trying to 
figure that out it was just a dyslexia thing on the last two digits...



A.


On 11/27/2012 12:06 AM, Herbert Duerr wrote:

Hi Andrew,

On 26.11.2012 20:02, Andrew Rist wrote:

Did you run switch on the svn tree for the windows nightly build? That
seems to be the only piece not updated by this change.
A.
[...]

@@ -36,13 +36,13 @@ c['schedulers'].append(Nightly(name='aoo
  c['schedulers'].append(Nightly(name='aoo-win7-nightly',
builderNames=['aoo-win7'],
-  branch='incubator/ooo/trunk',
+  branch='openoffice/trunk',
hour=4,
minute=30))


See the change above, the aoo-win7-nightly was updated to the TLP 
location. The problem is that the win7 buildbot doesn't run a SVN 
step, it does its own thing by doing a "svn up" in its pristine svn 
checkout. So someone with ssh access into that box needs to switch 
this pristine checkout to the change upstream location.


Herbert

Re: svn commit: r839584 - /infrastructure/buildbot/aegis/buildmaster/master1/projects/openofficeorg.conf

2012-11-27 Thread Herbert Duerr 

Following up to my

Hi Andrew,

On 26.11.2012 20:02, Andrew Rist wrote:

Did you run switch on the svn tree for the windows nightly build? That
seems to be the only piece not updated by this change.
A.
[...]

@@ -36,13 +36,13 @@ c['schedulers'].append(Nightly(name='aoo
  c['schedulers'].append(Nightly(name='aoo-win7-nightly',
builderNames=['aoo-win7'],
-  branch='incubator/ooo/trunk',
+  branch='openoffice/trunk',
hour=4,
minute=30))


See the change above, the aoo-win7-nightly was updated to the TLP
location. The problem is that the win7 buildbot doesn't run a SVN step,
it does its own thing by doing a "svn up" in its pristine svn checkout.
So someone with ssh access into that box needs to switch this pristine
checkout to the change upstream location.


I solved that problem using an efficient trick but somewhat dirty trick: 
I changed the relevant buildbot steps of both the win7-nightly and 
win7-snapshot bots to do the svn-switch, ran them successfully and 
reverted the temporary changes to the buildbot steps again. So now also 
our w7-bots are updated to the switched upstream location.


Herbert

Re: svn commit: r839584 - /infrastructure/buildbot/aegis/buildmaster/master1/projects/openofficeorg.conf

2012-11-27 Thread Herbert Duerr 

Hi Andrew,

On 26.11.2012 20:02, Andrew Rist wrote:

Did you run switch on the svn tree for the windows nightly build? That
seems to be the only piece not updated by this change.
A.
[...]

@@ -36,13 +36,13 @@ c['schedulers'].append(Nightly(name='aoo
  c['schedulers'].append(Nightly(name='aoo-win7-nightly',
builderNames=['aoo-win7'],
-  branch='incubator/ooo/trunk',
+  branch='openoffice/trunk',
hour=4,
minute=30))


See the change above, the aoo-win7-nightly was updated to the TLP 
location. The problem is that the win7 buildbot doesn't run a SVN step, 
it does its own thing by doing a "svn up" in its pristine svn checkout. 
So someone with ssh access into that box needs to switch this pristine 
checkout to the change upstream location.


Herbert

Re: svn commit: r839584 - /infrastructure/buildbot/aegis/buildmaster/master1/projects/openofficeorg.conf

2012-11-26 Thread Andrew Rist 

Herbert,
Did you run switch on the svn tree for the windows nightly build? That 
seems to be the only piece not updated by this change.

A.

On 11/26/2012 12:30 AM, h...@apache.org wrote:

Author: hdu
Date: Mon Nov 26 08:30:23 2012
New Revision: 839584

Log:
after graduation openoffice moved from incubator/ooo

Modified:
 
infrastructure/buildbot/aegis/buildmaster/master1/projects/openofficeorg.conf

Modified: 
infrastructure/buildbot/aegis/buildmaster/master1/projects/openofficeorg.conf
==
--- 
infrastructure/buildbot/aegis/buildmaster/master1/projects/openofficeorg.conf 
(original)
+++ 
infrastructure/buildbot/aegis/buildmaster/master1/projects/openofficeorg.conf 
Mon Nov 26 08:30:23 2012
@@ -3,32 +3,32 @@
  # schedulers
  
  c['schedulers'].append(AnyBranchScheduler(name="on-openofficeorg-commit",

- branches=["incubator/ooo/site"],
+ branches=["openoffice/site"],
   treeStableTimer=2,
   builderNames=["openofficeorg-site-staging"]))
  
  c['schedulers'].append(Nightly(name='openoffice-linux64-nightly',

builderNames=['openoffice-linux64-nightly'],
-  branch='incubator/ooo/trunk',
+  branch='openoffice/trunk',
hour=4,
minute=10))
  
  c['schedulers'].append(Nightly(name='openoffice-linux64-rat',

builderNames=['openoffice-linux64-rat'],
-  branch='incubator/ooo/trunk',
+  branch='openoffice/trunk',
dayOfWeek=0,
hour=3,
minute=10))
  
  c['schedulers'].append(Nightly(name='openoffice-linux32-nightly',

builderNames=['openoffice-linux32-nightly'],
-  branch='incubator/ooo/trunk',
+  branch='openoffice/trunk',
hour=4,
minute=20))
  
  c['schedulers'].append(Nightly(name='aoo-win7-weekly',

builderNames=['aoo-win7'],
-  branch='incubator/ooo/trunk',
+  branch='openoffice/trunk',
properties={'rsync_opts':'--delete'},
dayOfWeek=0,
hour=6,
@@ -36,13 +36,13 @@ c['schedulers'].append(Nightly(name='aoo
  
  c['schedulers'].append(Nightly(name='aoo-win7-nightly',

builderNames=['aoo-win7'],
-  branch='incubator/ooo/trunk',
+  branch='openoffice/trunk',
hour=4,
minute=30))
  
  c['schedulers'].append(Nightly(name='aoo-win7-snapshot',

builderNames=['aoo-w7snap'],
-  branch='incubator/ooo/trunk',
+  branch='openoffice/trunk',
dayOfWeek=0,
hour=2,
minute=30))
@@ -73,7 +73,7 @@ c['status'].append(mail.MailNotifier(fro
  # schedulers
  
  c['schedulers'].append(AnyBranchScheduler(name="on-ooo-site-commit",

- branches=["incubator/ooo/ooo-site"],
+ branches=["openoffice/ooo-site"],
   treeStableTimer=2,
   builderNames=["ooo-site-site-staging"]))
  
@@ -98,7 +98,7 @@ f_ooo_1 = factory.BuildFactory()

  f_ooo_1.addStep(SVN(
  mode="copy",
  baseURL="http://svn.apache.org/repos/asf/";,
-defaultBranch="incubator/ooo/trunk",
+defaultBranch="openoffice/trunk",
  ))
  
  f_ooo_1.addStep(SetProperty(command="date +%Y-%m-%d_%H:%M:%S", property="today"))

@@ -228,7 +228,7 @@ f_ooo_1r = factory.BuildFactory()
  f_ooo_1r.addStep(SVN(
  mode="copy",
  baseURL="http://svn.apache.org/repos/asf/";,
-defaultBranch="incubator/ooo/trunk",
+defaultBranch="openoffice/trunk",
  ))
  
  # RAT reporting. An xml config file on the slave points the rat jar to main/rat-excludes as part of its run.

@@ -418,7 +418,7 @@ c['builders'].append(b_ooo_w1)
  f_ooo_w2 = factory.BuildFactory()
  
  # svn under cygwin - as required by windows build

-# f_ooo_w2.addStep(Compile(command=[winbash , '-cliex', 'cd 
/cygdrive/e/slave14/aoo-w7snap/ ; svn co 
http://svn.apache.org/repos/asf/incubator/ooo/tags/SNAPSHOT build_svn'],
+# f_ooo_w2.addStep(Compile(command=[winbash , '-cliex', 'cd 
/cygdrive/e/slave14/aoo-w7snap/ ; svn co 
http://svn.apache.org/repos/asf/openoffice/tags/SNAPSHOT build_svn'],
  f_ooo_w2.addStep(Compile(command=[winbash , '-cliex', 'cd 
/cygdrive/e/slave14/aoo-w7snap/ ; svn up build_svn'],
  haltOnFailure=True, workdir="build",
  description=["updating","reference source"], 
descriptionDone=["updated","reference source"],
@@ -562,7 +562,7 @@ f_ooo_3 = factory.BuildFactory()
  f_ooo_3.addStep(SVN(
  mode="copy",
  baseURL="http://svn.apache.org/repos/asf/";,
-defaultBranch="incubator/ooo/trunk",
+defaultBranch="openoffice/trunk",
  ))
  
  f_ooo_3.addStep(SetProperty(command="date +%Y-%m-%d_%H:%M:%S", proper