[SCM] debian-live/autotesting branch, master, updated. 54cef8d9808760657863db8f97ea3fd6dfa0eedb
Brendan M. Sleight (none)
bms at brum.
Sat May 29 07:31:12 UTC 2010
The following commit has been merged in the master branch:
commit 54cef8d9808760657863db8f97ea3fd6dfa0eedb
Author: Brendan M. Sleight <bms at brum.(none)>
Date: Sat May 29 08:32:49 2010 +0100
Finishing master test list installed as full.xml
diff --git a/Makefile b/Makefile
index ded22b5..f08b8f6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-LIST = build-60alpha1-i386-iso-hybrid-lxde-desktop-daily.xml build-60alpha1-amd64-iso-hybrid-all-monthly.xml build-60alpha1-powerpc-iso-all-monthly.xml build-60alpha1-i386-iso-hybrid-all-monthly.xml
+LIST = build-60alpha1-i386-iso-hybrid-lxde-desktop-daily.xml build-60alpha1-amd64-iso-lxde-desktop-daily.xml build-60alpha1-powerpc-iso-lxde-desktop-daily.xml build-60alpha1-amd64-iso-hybrid-all-monthly.xml build-60alpha1-powerpc-iso-all-monthly.xml build-60alpha1-i386-iso-hybrid-all-monthly.xml
all: install
diff --git a/autotesting.py b/autotesting.py
index c1bd9ef..f9ff818 100644
--- a/autotesting.py
+++ b/autotesting.py
@@ -95,7 +95,7 @@ def wget(url, limit):
tmpFile = tempfile.NamedTemporaryFile(prefix="autotesting_wget_")
L = ['wget', '-nv', str(url), '-O', tmpFile.name]
if limit == True:
- L.append('--limit-rate=1.5M')
+ L.append('--limit-rate=1M')
# Maybe do something with the retcode in the future.
retcode = subprocess.call(L)
return tmpFile
@@ -214,17 +214,17 @@ def runningQemu(display, test, qemuDownload):
""" Start qemu running, with a local telnet port at 55555 listening acting as the qemu monitor
returns subprocess.process"""
telnet = ("127.0.0.1", "55555")
- address, port = telnet
- monitor = "telnet:" + address + ":" + port + ",server,nowait"
qemuBinary = str(test.qemu.binary)
log("Starting " + qemuBinary)
if not qemuBinary.startswith("qemu"):
log("WARNING! : " + qemuBinary + " does not start with qemu, using qemu instead.")
qemuBinary = "qemu"
- qemuCommand = [qemuBinary, "-monitor", monitor, "-rtc", "clock=vm", "-full-screen"]
- for o in str(test.qemu.options).split(' '):
+ address, port = telnet
+ monitor = "telnet:" + address + ":" + port + ",server,nowait"
+ qemuCommandStr = qemuBinary + " -monitor " + monitor + " -full-screen " + str(test.qemu.options) + " " + str(qemuDownload)
+ qemuCommand = []
+ for o in qemuCommandStr.split(' '):
qemuCommand.append(o)
- qemuCommand.append(str(qemuDownload))
log("Qemu command: " + str(qemuCommand))
qemu = subprocess.Popen(qemuCommand, env={"DISPLAY": display})
sendkeysToQemu(test, telnet)
@@ -270,7 +270,7 @@ def createMontage(video, test):
listFramesNames = []
# Total frames = videoLength * 15fps. Hence for get 16 snapshots.
# (not forgetting a snapshot at frame=0)
- framestep = "framestep=" + str(int((videoLength * 15)/17))
+ framestep = "framestep=" + str(int((videoLength * 15)/14))
mplayer = ["mplayer", "-vf", framestep, "-framedrop", "-nosound",
"-quiet", video.name, "-speed", "100", "-vo",
"jpeg:outdir=" + tempDir]
@@ -344,7 +344,7 @@ def postTweet(test, twit):
today=str(datetime.date.today())
long_url=str(twit.hosting.url) + "/" + local + "/" + today + "/"
tiny=tiny_url(long_url)
- tweet = "Autotesting of: " + str(test.description)[:90] + "... " + str(tiny)
+ tweet = "Autotesting of: " + str(test.description)[:50] + "... " + str(tiny) + " (See test.xml for url of image tested)"
api = twitter.Api(username=str(twit.user), password=str(twit.passw) )
status = api.PostUpdate(tweet)
log("Tweet: " + tweet)
diff --git a/examples/build-daily-bleeding-edge.py b/examples/build-daily-bleeding-edge.py
index 56bc283..04caf21 100644
--- a/examples/build-daily-bleeding-edge.py
+++ b/examples/build-daily-bleeding-edge.py
@@ -93,8 +93,11 @@ def parseBuilds(xml):
def postTweet(twit, message, long_url=False):
if long_url:
- tiny=tiny_url(long_url)
- tweet = message[:120] + "... " + str(tiny)
+ try:
+ tiny=tiny_url(long_url)
+ tweet = message[:120] + "... " + str(tiny)
+ except:
+ tweet = message[:139]
else:
tweet = message[:139]
try:
diff --git a/examples/build.xml b/examples/build.xml
index a33857a..b26db24 100644
--- a/examples/build.xml
+++ b/examples/build.xml
@@ -2,7 +2,7 @@
<autotesting>
<builds>
<distributions>
- <distribution>sid</distribution>
+ <distribution>squeeze</distribution>
</distributions>
<package_lists>
<package_list>standard</package_list>
diff --git a/tests-source/merge-list.xml b/tests-source/merge-list.xml
index 1062d65..0983f1d 100644
--- a/tests-source/merge-list.xml
+++ b/tests-source/merge-list.xml
@@ -3,6 +3,8 @@
<files>
<!-- Daily -->
<file>build-60alpha1-i386-iso-hybrid-lxde-desktop-daily.xml</file>
+ <file>build-60alpha1-amd64-iso-lxde-desktop-daily.xml</file>
+ <file>build-60alpha1-powerpc-iso-lxde-desktop-daily.xml</file>
<file>webconverger-daily.xml</file>
<file>autobuilds.xml</file>
<!-- Weekly -->
diff --git a/tests-source/parts/images-iso-hybrid.xml b/tests-source/parts/images-iso-hybrid.xml
index 317e0b3..b1f8b07 100644
--- a/tests-source/parts/images-iso-hybrid.xml
+++ b/tests-source/parts/images-iso-hybrid.xml
@@ -5,13 +5,13 @@
<name>iso-hybrid</name>
<nametwo>boot-as-cdrom</nametwo>
<extension>.iso</extension>
- <qemu_options>-cdrom</qemu_options>
+ <qemu_options>-vga std -cdrom</qemu_options>
</image>
<image>
<name>iso-hybrid</name>
<nametwo>boot-as-usb</nametwo>
<extension>.iso</extension>
- <qemu_options>-hda</qemu_options>
+ <qemu_options>-vga std -hda</qemu_options>
</image>
</images>
</common>
diff --git a/tests-source/parts/images-iso.xml b/tests-source/parts/images-iso.xml
index 1bc6a6b..a986c81 100644
--- a/tests-source/parts/images-iso.xml
+++ b/tests-source/parts/images-iso.xml
@@ -4,7 +4,7 @@
<image>
<name>iso</name>
<extension>.iso</extension>
- <qemu_options>-cdrom</qemu_options>
+ <qemu_options>-vga std -cdrom</qemu_options>
</image>
</images>
</common>
diff --git a/tests-source/parts/qemu-powerpc.xml b/tests-source/parts/qemu-powerpc.xml
index 4b213df..acbc3d7 100644
--- a/tests-source/parts/qemu-powerpc.xml
+++ b/tests-source/parts/qemu-powerpc.xml
@@ -4,7 +4,7 @@
<xscreen>1024x768x16</xscreen>
<pause>10</pause>
<sendkeys>b,o,o,t,spc,c,d,r,o,m,shift-semicolon,kp_enter,kp_enter</sendkeys>
- <time>900</time>
+ <time>1200</time>
</qemu>
</common>
</autotesting>
diff --git a/tests-source/parts/qemu.xml b/tests-source/parts/qemu.xml
index 9ca3c0d..0b1a720 100644
--- a/tests-source/parts/qemu.xml
+++ b/tests-source/parts/qemu.xml
@@ -1,10 +1,10 @@
<autotesting>
<common>
<qemu>
- <xscreen>1024x768x16</xscreen>
+ <xscreen>800x600x16</xscreen>
<pause>10</pause>
<sendkeys>kp_enter</sendkeys>
- <time>900</time>
+ <time>1200</time>
</qemu>
</common>
</autotesting>
diff --git a/tests-source/transform-to-test-list.xml b/tests-source/transform-to-test-list.xml
index 3d13242..d416416 100644
--- a/tests-source/transform-to-test-list.xml
+++ b/tests-source/transform-to-test-list.xml
@@ -25,7 +25,6 @@
<xsl:copy-of select="//autotesting/source/title" />
<description><xsl:value-of select="//autotesting/source/description" />
<xsl:value-of select="$processor_name"/>, <xsl:value-of select="$image_name"/>, <xsl:value-of select="."/>
-(<xsl:value-of select="//autotesting/source/root_url" /><xsl:value-of select="$processor_name"/>/<xsl:value-of select="$image_name"/>/<xsl:value-of select="//autotesting/source/filename_start" />-<xsl:value-of select="$processor_name"/>-<xsl:value-of select="$package"/><xsl:value-of select="$extension"/>)
</description>
<xsl:copy-of select="//autotesting/source/background" />
<xsl:copy-of select="//autotesting/source/frequency" />
diff --git a/tests/autobuilds.xml b/tests/autobuilds.xml
index 9c58d85..e382336 100644
--- a/tests/autobuilds.xml
+++ b/tests/autobuilds.xml
@@ -3,11 +3,14 @@
<tests>
<test>
<download>
- <url>http://autobuild.livecd.org/autobuild/debian-live/current/live-snapshot-sid-standard-binary-hybrid.iso</url>
- <md5sum>http://autobuild.livecd.org/autobuild/debian-live/current/live-snapshot-sid-standard-binary-hybrid.iso.md5sum</md5sum>
+ <url>http://autobuild.livecd.org/autobuild/debian-live/</url>
+ <dateformat>%Y-%m-%d</dateformat>
+ <!-- Need to do today's (0) or yesterdays (1) etc... -->
+ <daysofset>0</daysofset>
+ <dateformatend>/live-snapshot-squeeze-standard-binary-hybrid.iso</dateformatend>
</download>
<title>Debian Live Autobuild</title>
- <description>Debian Live. Autobuild. Using lh snapshots at live.debian.net.[Sid Standard]</description>
+ <description>Debian Live. Autobuild. Using lh snapshots at live.debian.net.[Squeeze Standard]</description>
<background>http://live.debian.net/image.png</background>
<frequency>daily</frequency>
<qemu>
@@ -22,7 +25,7 @@
<keep>4</keep>
<root>/var/www/autotesting/</root>
<video>autotesting.ogv</video>
- <local>debian-live/autobuild/sid/standard/</local>
+ <local>debian-live/autobuild/squeeze/standard/live.debian.net_packages/</local>
<screenshots>
<final>final-screenshot.png</final>
<montage>montage-of-video-frames.png</montage>
@@ -31,11 +34,14 @@
</test>
<test>
<download>
- <url>http://autobuild.livecd.org/autobuild/debian-live/current/git-debian-next-sid-standard-binary-hybrid.iso</url>
- <md5sum>http://autobuild.livecd.org/autobuild/debian-live/current/git-debian-next-sid-standard-binary-hybrid.iso.md5sum</md5sum>
+ <url>http://autobuild.livecd.org/autobuild/debian-live/</url>
+ <dateformat>%Y-%m-%d</dateformat>
+ <!-- Need to do today's (0) or yesterdays (1) etc... -->
+ <daysofset>0</daysofset>
+ <dateformatend>/git-debian-next-squeeze-standard-binary-hybrid.iso</dateformatend>
</download>
<title>Debian Live Autobbuild</title>
- <description>Debian Live. Autobuild. Using lh from git debian-next branch [Sid Standard]</description>
+ <description>Debian Live. Autobuild. Using lh from git debian-next branch [Squeeze Standard]</description>
<background>http://live.debian.net/image.png</background>
<frequency>daily</frequency>
<qemu>
@@ -50,7 +56,7 @@
<keep>4</keep>
<root>/var/www/autotesting/</root>
<video>autotesting.ogv</video>
- <local>debian-live/autobuild/sid/standard/</local>
+ <local>debian-live/autobuild/squeeze/standard/git-debian-next/</local>
<screenshots>
<final>final-screenshot.png</final>
<montage>montage-of-video-frames.png</montage>
diff --git a/tests/webconverger-daily.xml b/tests/webconverger-daily.xml
index 69abc30..bea3297 100644
--- a/tests/webconverger-daily.xml
+++ b/tests/webconverger-daily.xml
@@ -17,13 +17,13 @@ Building midnight European time the very latest developments.
<background>http://webconverger.com/logos/flower600.png</background>
<frequency>daily</frequency>
<qemu>
- <xscreen>1024x768x24</xscreen>
+ <xscreen>800x600x16</xscreen>
<binary>qemu-system-i386</binary>
<options>-cdrom</options>
<pause>10</pause>
<sendkeys>kp_enter</sendkeys>
<!-- Time to run qmeu -->
- <time>375</time>
+ <time>600</time>
</qemu>
<output>
<!-- Number of test sets to keep -->
--
debian-live/autotesting
More information about the debian-live-changes
mailing list