buildbot master.cfg: Fix location of Angstrom images for cleaning and full builds start from scratch

1 files changed, 6 insertions, 8 deletions

diff --git a/contrib/buildbot/master.cfg b/contrib/buildbot/master.cfg
index 537eb8110e..7fb4578246 100644
--- a/contrib/buildbot/master.cfg
+++ b/contrib/buildbot/master.cfg
@@ -51,8 +51,8 @@ config['schedulers'].append(Nightly(name="Angstrom uclibc incremental build",
 angstrom_glibc_incremental_build = factory.BuildFactory()
 angstrom_glibc_incremental_build.addStep(source.Git(repourl="git://git.openembedded.net/openembedded", branch='stable/2009', mode='update'))
 
-angstrom_glibc_incremental_build.addStep(ShellCommand, description=["Cleaning", "previous", "images"],  command="/bin/rm tmp/deploy/images/*/*/*rootfs* || /bin/true", timeout=600)
-angstrom_glibc_incremental_build.addStep(ShellCommand, description=["Cleaning", "previous", "images", "step 2"],  command="/bin/rm -rf tmp/deploy/images/*/*/*testlab* || /bin/true", timeout=600)
+angstrom_glibc_incremental_build.addStep(ShellCommand, description=["Cleaning", "previous", "images"],  command="/bin/rm tmp/deploy/*/images/*/*rootfs* || /bin/true", timeout=600)
+angstrom_glibc_incremental_build.addStep(ShellCommand, description=["Cleaning", "previous", "images", "step 2"],  command="/bin/rm -rf tmp/deploy/*/images/*/*testlab* || /bin/true", timeout=600)
 runOEImage(angstrom_glibc_incremental_build, 'at91sam9263ek', 'base-image', 'glibc')
 runOEImage(angstrom_glibc_incremental_build, 'at91sam9263ek', 'console-image', 'glibc')
 runOEImage(angstrom_glibc_incremental_build, 'at91sam9263ek', 'x11-image', 'glibc')
@@ -66,8 +66,7 @@ runOEImage(angstrom_glibc_incremental_build, 'qemux86', 'x11-image', 'glibc')
 angstrom_glibc_full_build = factory.BuildFactory()
 angstrom_glibc_full_build.addStep(source.Git(repourl="git://git.openembedded.net/openembedded", branch='stable/2009', mode='update'))
 
-angstrom_glibc_full_build.addStep(ShellCommand, description=["Cleaning", "previous", "images"],  command="/bin/rm tmp/deploy/images/*/*/*rootfs* || /bin/true", timeout=600)
-angstrom_glibc_full_build.addStep(ShellCommand, description=["Cleaning", "previous", "images", "step 2"],  command="/bin/rm -rf tmp/deploy/images/*/*/*testlab* || /bin/true", timeout=600)
+angstrom_glibc_full_build.addStep(ShellCommand, description=["Cleaning", "previous", "build"],  command="/bin/rm -rf tmp", timeout=600)
 runOEImage(angstrom_glibc_full_build, 'at91sam9263ek', 'base-image', 'glibc')
 runOEImage(angstrom_glibc_full_build, 'at91sam9263ek', 'console-image', 'glibc')
 runOEImage(angstrom_glibc_full_build, 'at91sam9263ek', 'x11-image', 'glibc')
@@ -81,8 +80,8 @@ runOEImage(angstrom_glibc_full_build, 'qemux86', 'x11-image', 'glibc')
 angstrom_uclibc_incremental_build = factory.BuildFactory()
 angstrom_uclibc_incremental_build.addStep(source.Git(repourl="git://git.openembedded.net/openembedded", branch='stable/2009', mode='update'))
 
-angstrom_uclibc_incremental_build.addStep(ShellCommand, description=["Cleaning", "previous", "images"],  command="/bin/rm tmp/deploy/images/*/*/*rootfs* || /bin/true", timeout=600)
-angstrom_uclibc_incremental_build.addStep(ShellCommand, description=["Cleaning", "previous", "images", "step 2"],  command="/bin/rm -rf tmp/deploy/images/*/*/*testlab* || /bin/true", timeout=600)
+angstrom_uclibc_incremental_build.addStep(ShellCommand, description=["Cleaning", "previous", "images"],  command="/bin/rm tmp/deploy/*/images/*/*rootfs* || /bin/true", timeout=600)
+angstrom_uclibc_incremental_build.addStep(ShellCommand, description=["Cleaning", "previous", "images", "step 2"],  command="/bin/rm -rf tmp/deploy/*/images/*/*testlab* || /bin/true", timeout=600)
 runOEImage(angstrom_uclibc_incremental_build, 'atngw100', 'base-image', 'uclibc')
 runOEImage(angstrom_uclibc_incremental_build, 'atngw100', 'console-image', 'uclibc')
 runOEImage(angstrom_uclibc_incremental_build, 'atngw100', 'x11-image', 'uclibc')
@@ -99,8 +98,7 @@ runOEImage(angstrom_uclibc_incremental_build, 'qemux86', 'x11-image', 'uclibc')
 angstrom_uclibc_full_build = factory.BuildFactory()
 angstrom_uclibc_full_build.addStep(source.Git(repourl="git://git.openembedded.net/openembedded", branch='stable/2009', mode='update'))
 
-angstrom_uclibc_full_build.addStep(ShellCommand, description=["Cleaning", "previous", "images"],  command="/bin/rm tmp/deploy/images/*/*/*rootfs* || /bin/true", timeout=600)
-angstrom_uclibc_full_build.addStep(ShellCommand, description=["Cleaning", "previous", "images", "step 2"],  command="/bin/rm -rf tmp/deploy/images/*/*/*testlab* || /bin/true", timeout=600)
+angstrom_uclibc_full_build.addStep(ShellCommand, description=["Cleaning", "previous", "images"],  command="/bin/rm -rf tmp", timeout=600)
 runOEImage(angstrom_uclibc_full_build, 'atngw100', 'base-image', 'uclibc')
 runOEImage(angstrom_uclibc_full_build, 'atngw100', 'console-image', 'uclibc')
 runOEImage(angstrom_uclibc_full_build, 'atngw100', 'x11-image', 'uclibc')