Herbert,
This was a good try - but
http://ci.apache.org/builders/aoo-win7/builds/356/steps/compile_1/logs/err.html
will look at it a bit later...
A.
On 10/22/2012 9:18 AM, h...@apache.org wrote:
Author: hdu
Date: Mon Oct 22 16:18:02 2012
New Revision: 835763
Log:
merge aoo-win7 weekly and nightly builders by using the scheduler property
rsync_opts
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 Oct 22 16:18:02 2012
@@ -27,14 +27,16 @@ c['schedulers'].append(Nightly(name='ope
minute=20))
c['schedulers'].append(Nightly(name='aoo-win7',
- builderNames=[],
+ builderNames=['aoo-win7'],
branch='incubator/ooo/trunk',
+ properties={'rsync_opts':''},
hour=4,
minute=30))
c['schedulers'].append(Nightly(name='aoo-win7w',
- builderNames=[],
+ builderNames=['aoo-win7'],
branch='incubator/ooo/trunk',
+ properties={'rsync_opts':'--delete'},
dayOfWeek=0,
hour=6,
minute=30))
@@ -239,7 +241,10 @@ c['builders'].append(b_ooo_1r)
-# building ooo source on Win7 - nightly incremental build
+# building ooo source on Win7, either
+# - a weekly full build
+# - a nightly incremental build
+# depending on whether the property rsync_clean is set to "--delete" or ""
# First lets create a variable to full path of cygwin bash.
winbash = r'C:\cygwin\bin\bash.exe'
@@ -250,7 +255,7 @@ f_ooo_w1.addStep(Compile(command=[winbas
haltOnFailure=True, workdir="build",
))
# sync files from svn - deleting all other files for clean build - i.e.
clobber
-f_ooo_w1.addStep(Compile(command=[winbash , '-cliex', 'cd
/cygdrive/e/slave14/aoo-win7/ ; rsync -av --delete build_svn/ build/'],
+f_ooo_w1.addStep(Compile(command=[winbash , '-cliex', WithProperties('cd
/cygdrive/e/slave14/aoo-win7/ ; rsync -av %(rsync_opts) build_svn/ build/')],
haltOnFailure=True, workdir="build",
))
f_ooo_w1.addStep(SetProperty(command="svnversion e:\\slave14\\aoo-win7\\build_svn",
property="got_revision"))
@@ -340,125 +345,16 @@ f_ooo_w1.addStep(MasterShellCommand(comm
alwaysRun=True,
))
-b_ooo_w1 = {'name': "aoo-win7w",
+b_ooo_w1 = {'name': "aoo-win7",
'slavename': "bb-win7",
'builddir': "aoo-win7",
'factory': f_ooo_w1,
'category': "aoo-win7",
}
-# c['builders'].append(b_ooo_w1)
+c['builders'].append(b_ooo_w1)
-
-# building ooo source on Win7 weekly clean build
-# First lets create a variable to full path of cygwin bash.
-
-f_ooo_w2 = factory.BuildFactory()
-
-f_ooo_w2.addStep(Compile(command=[winbash , '-cliex', 'cd
/cygdrive/e/slave14/aoo-win7/ ; svn up build_svn'],
- haltOnFailure=True, workdir="build",
-))
-# sync files from svn - without deleting build files
-f_ooo_w2.addStep(Compile(command=[winbash , '-cliex', 'cd
/cygdrive/e/slave14/aoo-win7/ ; rsync -av build_svn/ build/'],
- haltOnFailure=True, workdir="build",
-))
-f_ooo_w2.addStep(SetProperty(command="svnversion e:\\slave14\\aoo-win7\\build_svn",
property="got_revision"))
-
-f_ooo_w2.addStep(ShellCommand(command=[winbash , '-cliex', 'cd
/cygdrive/e/slave14/aoo-win7/build/main ; cp -arfv ../../main_xtra/* .'],
- haltOnFailure=False, workdir="build/main",
-))
-
-f_ooo_w2.addStep(ShellCommand(command=[winbash , '-cliex', 'cd
/cygdrive/e/slave14/aoo-win7/build/main ; "/cygdrive/c/Program Files/MicrosoftVisual
Studio 9.0/VC/bin/vcvars32.bat" ; autoconf'],
- haltOnFailure=False, workdir="build/main",
-))
-
-f_ooo_w2.addStep(ShellCommand(command=[winbash , '-cliex', WithProperties('cd /cygdrive/e/slave14/aoo-win7/build/main ; "/cygdrive/c/Progra~1/Microsoft Visual Studio
9.0/VC/bin/vcvars32.bat" ; ./configure --enable-verbose --with-dmake-url="http://dmake.apache-extras.org.codespot.com/files/dmake-4.12.tar.bz2";
--with-cl-home="/cygdrive/c/Progra~1/MicrosoftVisual Studio 9.0/VC" --with-jdk-home="/cygdrive/c/PROGRA~1/Java/jdk1.6.0_30" --with-psdk-home="/cygdrive/c/PROGRA~1/Microsoft
SDKs/Windows/v6.1" --with-directx-home="/cygdrive/c/PROGRA~1/Microsoft DirectX SDK (June 2010)" --with-mspdb-path="/cygdrive/c/Progra~1/Microsoft Visual Studio
9.0/Common7/IDE" --with-frame-home="/cygdrive/c/Progra~1/Microsoft SDKs/Windows/v6.1" --with-midl-path="/cygdrive/c/Progra~1/Microsoft SDKs/Windows/v6.1/Bin"
--with-asm-home="/cygdrive/c/Progra~1/Microsoft Visual Studio 9.0" --with-csc-path="/cygdrive/c/Progra~1/Microsoft Visual Studio 9.0/SDK/v3.5"
--with-ant-home="/cygdrive/c/ant" --disabl!
e-
build-mozilla --with-mozilla-build="/cygdrive/c/mozilla-build" --without-junit
--enable-category-b --disable-binfilter --enable-bundled-dictionaries --with-lang="en-US ar de cs fr es
gl it ja zh-CN pt-BR nl hu ru zh-TW fi" --with-vendor="Apache OpenOffice buildbot"
--with-build-version=Rev.%s', 'got_revision')],
- haltOnFailure=False, workdir="build/main",
-))
-
-f_ooo_w2.addStep(ShellCommand(command=[winbash , '-cliex', 'cd
/cygdrive/e/slave14/aoo-win7/build/main ; "/cygdrive/c/Program Files/MicrosoftVisual
Studio 9.0/VC/bin/vcvars32.bat" ; ./bootstrap'],
- haltOnFailure=False, workdir="build/main",
-))
-
-f_ooo_w2.addStep(ShellCommand(command=[winbash , '-cliex', 'cd
/cygdrive/e/slave14/aoo-win7/build/main ; "/cygdrive/c/Program Files/MicrosoftVisual
Studio 9.0/VC/bin/vcvars32.bat" ; source winenv.Set.sh ; cd instsetoo_native ; perl
$SOLARENV/bin/build.pl --all --html -P2 -- -P2'],
- haltOnFailure=False, workdir="build/main",timeout=12000
-))
-
-# Collection of logs and useful bits
-
-# create area for collecting log files on buildslave
-f_ooo_w2.addStep(ShellCommand(command=[winbash , '-cliex', 'cd
/cygdrive/e/slave14/aoo-win7/build ; mkdir -p log/logarch/log ; rm -rf
log/logarch/log/*'],
- haltOnFailure=False, workdir="build",
-))
-
-# copy the log index to a location relative to where we will put the logs
-f_ooo_w2.addStep(ShellCommand(command=[winbash , '-cliex', 'cd
/cygdrive/e/slave14/aoo-win7/build ; cp -f log/*.html log/logarch/log'],
- haltOnFailure=False, workdir="build",
-))
-
-# create the directory tree for copying the logs (looking for logs director
under the platform tag)
-f_ooo_w2.addStep(ShellCommand(command=[winbash , '-cliex', 'cd
/cygdrive/e/slave14/aoo-win7/build ; find main -name logs | grep wntmsci12.pro|
xargs -I file mkdir -p log/logarch/file'],
- haltOnFailure=False, workdir="build",
-))
-
-# copy all of our logs to the staging area in a proper relative location for
the log index
-f_ooo_w2.addStep(ShellCommand(command=[winbash , '-cliex', 'cd
/cygdrive/e/slave14/aoo-win7/build ; find main -name logs | grep wntmsci12.pro|
xargs -I file find file | xargs -I file cp -rf file log/logarch/file'],
- haltOnFailure=False, workdir="build",
-))
-
-#upload the logs directory
-f_ooo_w2.addStep(DirectoryUpload(slavesrc="log/logarch",
masterdest="/tmp/openoffice/win/log", haltOnFailure=True,
-))
-
-f_ooo_w2.addStep(MasterShellCommand(command="""
- cp -r /tmp/openoffice/win/log/*
/home/buildmaster/master1/public_html/projects/openoffice/buildlogs/win/"""))
-
-
-# Upload install bits
-# Here we upload the artifacts created by the win build
-# create a working directory to collect the install bits
-f_ooo_w2.addStep(ShellCommand(command=[winbash , '-cliex', 'cd
/cygdrive/e/slave14/aoo-win7/build ; mkdir -p log/install ; rm -rf
log/install/*'],
- haltOnFailure=False, workdir="build",
-))
-
-# copy all of our install bits to the staging area
-f_ooo_w2.addStep(ShellCommand(command=[winbash , '-cliex', 'cd
/cygdrive/e/slave14/aoo-win7/build ; find main -name *download | grep
wntmsci12.pro | xargs -I file find file -type f | xargs -I file cp -f file
log/install'],
- haltOnFailure=False, workdir="build",
-))
-
-# rename the files with the build number in them
-f_ooo_w2.addStep(ShellCommand(command=[winbash , '-cliex', WithProperties("cd
/cygdrive/e/slave14/aoo-win7/build ; find log/install -name *.exe | xargs -I file mv file
file_%s.exe", "got_revision")],
- haltOnFailure=False, workdir="build",
-))
-
-#upload the install directory
-f_ooo_w2.addStep(DirectoryUpload(slavesrc="log\\install",
masterdest="/tmp/openoffice/win/install", haltOnFailure=True,
-))
-
-
-# Remove any other snapshots before today and insert latest one.
-# Eventually the intent is to keep more copies, disk space and bandwidth
permitting
-f_ooo_w2.addStep(MasterShellCommand(command="""
- rm -f
/home/buildmaster/master1/public_html/projects/openoffice/install/win/*;
- cp /tmp/openoffice/win/install/*
/home/buildmaster/master1/public_html/projects/openoffice/install/win/"""))
-
-# Cleanup tmp
-# Always run the tmp cleanup step, in case of failures part way through
uploading etc..
-f_ooo_w2.addStep(MasterShellCommand(command="""
- rm -rf /tmp/openoffice/win;""",
- alwaysRun=True,
-))
-
-b_ooo_w2 = {'name': "aoo-win7",
- 'slavename': "bb-win7",
- 'builddir': "aoo-win7",
- 'factory': f_ooo_w2,
- 'category': "aoo-win7",
- }
-
-# c['builders'].append(b_ooo_w2)
-
# building ooo source on Ubuntu 32bit
f_ooo_3 = factory.BuildFactory()
