[SCM] debian-live/autotesting branch, master, updated. ec4f0880bfc6028acddacacfc12870405e8f224b
Brendan M. Sleight
bms.debian at barwap.com
Sun Jul 27 21:40:37 UTC 2008
The following commit has been merged in the master branch:
commit ec4f0880bfc6028acddacacfc12870405e8f224b
Author: Brendan M. Sleight <bms.debian at barwap.com>
Date: Sun Jul 27 21:40:19 2008 +0000
Adding homepage files, Setting default resolution bigger to avoid qemu SDL errors. All files directly on /var/www not symlinked to allow cortado.jar to run smoothly - see theora videos on webpage. Also adding daily local builds.
diff --git a/autotesting.cron.txt b/autotesting.cron.txt
index d650004..f4a4bc3 100644
--- a/autotesting.cron.txt
+++ b/autotesting.cron.txt
@@ -1,15 +1,13 @@
0 0 * * * /bin/echo "New Day " >/home/autotesting/log/daily/autotesting.log
-0 1 * * * /bin/bash /home/autotesting/debian-live/autotesting/run-batch-autotesting.sh /home/autotesting/debian-live/autotesting/daily.lst /home/autotesting/iso/daily/ /home/autotesting/video/daily/ /home/autotesting/www-root/debian-live/i386/ >>/home/autotesting/log/daily/autotesting.log 2>&1
-
-0 5 * * * /bin/bash /home/autotesting/debian-live/autotesting/run-batch-autotesting.sh /home/autotesting/debian-live/autotesting/webconverger.lst /home/autotesting/iso/daily/ /home/autotesting/video/daily/ /home/autotesting/www-root/webconverger/i386/ webc-3.2.mini.iso.MD5SUM >>/home/autotesting/log/daily/autotesting.log 2>&1
+0 1 * * * /bin/bash /home/autotesting/debian-live/autotesting/daily-cron-script.sh
0 0 * * 5 /bin/echo "New Week " >/home/autotesting/log/weekly/autotesting.log
-0 9 * * 5 /bin/bash /home/autotesting/debian-live/autotesting/run-batch-autotesting.sh /home/autotesting/debian-live/autotesting/weekly.lst /home/autotesting/iso/weekly/ /home/autotesting/video/weekly/ /home/autotesting/www-root/debian-live/i386/ >>/home/autotesting/log/weekly/autotesting.log 2>&1
+0 9 * * 5 /bin/bash /home/autotesting/debian-live/autotesting/run-batch-autotesting.sh /home/autotesting/debian-live/autotesting/weekly.lst /home/autotesting/iso/weekly/ /home/autotesting/video/weekly/ /var/www/debian-live/i386/ >>/home/autotesting/log/weekly/autotesting.log 2>&1
0 0 15 * * /bin/echo "New Month " >/home/autotesting/log/daily/autotesting.log
-0 17 15 * * /bin/bash /home/autotesting/debian-live/autotesting/run-batch-autotesting.sh /home/autotesting/debian-live/autotesting/monthly.lst /home/autotesting/iso/monthly/ /home/autotesting/video/monthly/ /home/autotesting/www-root/debian-live/i386/ >>/home/autotesting/log/monthly/autotesting.log 2>&1
+0 17 15 * * /bin/bash /home/autotesting/debian-live/autotesting/run-batch-autotesting.sh /home/autotesting/debian-live/autotesting/monthly.lst /home/autotesting/iso/monthly/ /home/autotesting/video/monthly/ /var/www/debian-live/i386/ >>/home/autotesting/log/monthly/autotesting.log 2>&1
0 0 * * * /bin/bash /home/autotesting/debian-live/autotesting/clean-old-files.sh
-
-#/home/autotesting/debian-live/autotesting/local_build_debian-live.sh /home/autotesting/iso/local/debian-live-etch-i386-xfce-desktop.iso etch xfce >>/home/autotesting/log/local/autobuild.log 2>&1
+# webwml
+0 */1 * * * cd /var/www && touch index.wml && make > /dev/null 2>&1
diff --git a/clean-old-files.sh b/clean-old-files.sh
index 98486f6..88bad44 100755
--- a/clean-old-files.sh
+++ b/clean-old-files.sh
@@ -2,17 +2,15 @@
#
# Remove old files
find /home/autotesting/*/daily/ -not -type d -ctime +4 -print0 | xargs --null --no-run-if-empty rm -f
+find /var/www/debian-live/i386/*-sid-* -not -type d -ctime +4 -print0 | xargs --null --no-run-if-empty rm -f
+find /var/www/webconverger/i386/* -not -type d -ctime +4 -print0 | xargs --null --no-run-if-empty rm -f
+find /var/www/local-build/debian-live/i386/* -not -type d -ctime +4 -print0 | xargs --null --no-run-if-empty rm -f
+
find /home/autotesting/*/weekly/ -not -type d -ctime +28 -print0 | xargs --null --no-run-if-empty rm -f
-find /home/autotesting/*/monthly/ -not -type d -ctime +124 -print0 | xargs --null --no-run-if-empty rm -f
+find /var/www/debian-live/i386/*-lenny-* -not -type d -ctime +28 -print0 | xargs --null --no-run-if-empty rm -f
-# Remove old symlinks
-for f in $(find /home/autotesting/www-root/ -type l)
-do
- if [ ! -e "$f" ]
- then
- echo $f
- fi
-done
+find /home/autotesting/*/monthly/ -not -type d -ctime +124 -print0 | xargs --null --no-run-if-empty rm -f
+find /var/www/debian-live/i386/*-etch-* -not -type d -ctime +4 -print0 | xargs --null --no-run-if-empty rm -f
# Remove empty directories
-find /home/autotesting/www-root/ -depth -type d -empty -exec rmdir {} \;
+find /var/www/*/ -depth -type d -empty -exec rmdir {} \;
diff --git a/daily-cron-script.sh b/daily-cron-script.sh
new file mode 100755
index 0000000..730fcee
--- /dev/null
+++ b/daily-cron-script.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+#
+# Neater then one long cron line
+#
+echo "New Day " >/home/autotesting/log/daily/autotesting.log
+/home/autotesting/debian-live/autotesting/run-batch-autotesting.sh /home/autotesting/debian-live/autotesting/daily.lst /home/autotesting/iso/daily/ /home/autotesting/video/daily/ /var/www/debian-live/i386/ >>/home/autotesting/log/daily/autotesting.log 2>&1
+
+/home/autotesting/debian-live/autotesting/run-batch-autotesting.sh /home/autotesting/debian-live/autotesting/webconverger.lst /home/autotesting/iso/daily/ /home/autotesting/video/daily/ /var/www/webconverger/i386/ webc-3.2.mini.iso.MD5SUM >>/home/autotesting/log/daily/autotesting.log 2>&1
+
+/home/autotesting/debian-live/autotesting/local_build_debian-live.sh /home/autotesting/iso/local/debian-live etch xfce >/home/autotesting/log/local/autobuild.log 2>&1
+/home/autotesting/debian-live/autotesting/local_build_debian-live.sh /home/autotesting/iso/local/debian-live lenny xfce >/home/autotesting/log/local/autobuild.log 2>&1
+/home/autotesting/debian-live/autotesting/local_build_debian-live.sh /home/autotesting/iso/local/debian-live sid xfce >/home/autotesting/log/local/autobuild.log 2>&1
+
+/home/autotesting/debian-live/autotesting/run-batch-autotesting.sh /home/autotesting/debian-live/autotesting/daily.lst /home/autotesting/iso/local/ /home/autotesting/video/local/ /var/www/local-build/debian-live/i386/ >/home/autotesting/log/local/autotesting.log 2>&1
+
diff --git a/homepage/Makefile b/homepage/Makefile
new file mode 100644
index 0000000..de18c90
--- /dev/null
+++ b/homepage/Makefile
@@ -0,0 +1,36 @@
+# Makefile
+
+WORKDIR = $(shell echo $(PWD))
+DESTDIR = $(shell echo $(PWD) | sed -e 's/\.wml//')
+SUBDIRS =
+
+INCLUDES = $(WORKDIR)/includes
+
+WMK = /usr/bin/wmk
+WMKOPT = -I $(INCLUDES) -D IMGROOT=$(WORKDIR)/images -D DOCROOT="" --all
+
+WMLFILES = $(wildcard *.wml)
+HTMLFILES = $(patsubst %.wml,%.html,$(WMLFILES))
+
+existing-SUBS := $(shell for dir in $(wildcard $(SUBS)) ''; do test -d $$dir && echo $$dir; done)
+existing-SUBS-build := $(addsuffix -build,$(existing-SUBS))
+existing-SUBS-clean := $(addsuffix -clean,$(existing-SUBS))
+existing-SUBS-cleandest := $(addsuffix -cleandest,$(existing-SUBS))
+
+
+all: make
+
+$(existing-SUBS-build):
+ $(MAKE) -C $(subst -build,,$@)
+
+make:
+ $(existing-SUBS-build)
+ $(WMK) $(WMKOPT)
+ rm -fv screenshots/*_sm.png
+
+$(existing-SUBS-clean):
+ $(MAKE) -C $(subst -clean,,$@) clean
+
+clean: $(existing-SUBS-clean)
+ rm -f $(HTMLFILES)
+ rm -fv screenshots/*_sm.png
diff --git a/homepage/images/style.css b/homepage/images/style.css
new file mode 100644
index 0000000..36b9411
--- /dev/null
+++ b/homepage/images/style.css
@@ -0,0 +1,302 @@
+/* Stylesheet for mentors.debian.net */
+/* (c) 2005,2006 the mentors.debian.net team */
+
+body
+{
+ font-family: sans-serif;
+ font-size: 10pt;
+ background-color: #ffffff;
+ margin: 0;
+ padding: 0;
+}
+
+img
+{
+ border: 0;
+}
+
+.screenshot-right
+{
+ padding: 15px;
+ float: right;
+}
+
+.screenshot
+{
+ padding: 5px;
+}
+
+h1,h2
+{
+ font-family: "Bitstream Vera Serif", Georgia, Palatino, serif;
+ font-weight: normal;
+ color: #d70751;
+ margin: 0.5em 0 0.2em 0;
+ padding: 0 0 0 0;
+}
+
+h1
+{
+ font-size: 170%;
+ color: #000000;
+}
+
+h2
+{
+ font-size: 140%;
+ color: #808080;
+}
+
+
+#floatmenu
+{
+ float: left;
+ margin: 0.5ex;
+ padding: 0.5ex;
+ width: 20ex;
+}
+
+/* Menu item */
+.menuitem
+{
+ padding: 0.1em 0.2em 0.1em 0.2em;
+ background-color: #f0f0f0;
+ border: 1px solid #d0d0d0;
+ border-left: 3px solid #d70751;
+ margin: 0.5em 0 0 0;
+ text-transform: uppercase;
+}
+
+.menuitem-active
+{
+ padding: 0.1em 0.2em 0.1em 0.2em;
+ background-color: #f0f0f0;
+ border: 1px solid #d0d0d0;
+ border-left: 3px solid #d70751;
+ margin: 0.5em 0 0 0;
+ text-transform: uppercase;
+ font-weight: bolder;
+}
+
+.menusubitem
+{
+ margin: 0 0 0 1em;
+ font-size: 9pt;
+ line-height: 2em;
+}
+
+.menusubitem-active
+{
+ margin: 0 0 0 1em;
+ font-size: 9pt;
+ line-height: 2em;
+ font-weight: bolder;
+}
+
+/*
+.menuitem a
+{
+ text-decoration: none;
+}
+*/
+
+/* The currently running CGI is highlighted */
+.currentcgi
+{
+ border: 1px solid red;
+}
+
+#maincontent
+{
+ margin: 0.5ex 0.5ex 0.5ex 22ex;
+ padding: 0 0 0 1ex;
+ _border-left: 1px dotted red;
+}
+
+#header
+{
+ background-color: #f0f0f0;
+ color: #707070;
+ padding: 0.5ex;
+ min-height: 75px; /* the top area is at least as large as the debian logo */
+ /* does not work with the IE but you won't see me write hacks to
+ * support buggy browsers */
+ border-bottom: 1px solid #b0b0b0;
+}
+
+#debianlogo
+{
+ float: left;
+ position: absolute;
+ top: 5px;
+ left: 5px;
+}
+#headertitle
+{
+ font-family: "Bitstream Vera Serif", Georgia, Palatino, serif;
+ font-size: 300%;
+ margin: 0;
+ margin-left: 70px; /* indentation from the debian logo on the lft */
+ padding: 0;
+ font-weight: 100;
+}
+#headertitle a
+{
+ text-decoration: none;
+ font-weight: 100;
+}
+
+#headersubtitle
+{
+ padding: 0;
+ margin: 0;
+ margin-left: 70px; /* indentation from the debian logo on the lft */
+ font-size: 110%;
+ font-weight: 500;
+}
+
+#footer
+{
+ background-color: #f0f0f0;
+ color: #707070;
+ padding: 0.2em 1em 0.2em 1em;
+ margin: 2em 0 0 0;
+ text-align: center;
+ clear: both;
+ border-top: 1px solid #b0b0b0;
+}
+
+#navigation
+{
+ padding: 0.2em 1em 0.2em 1em;
+ background: #e0e0e0;
+}
+
+#navigation > .right
+{
+ position: absolute;
+ right: 1em;
+}
+
+p,form
+{
+ color: #606060;
+ margin: 0.3ex 0em 1ex 0;
+ padding: 0 0 0 0;
+}
+
+pre
+{
+ color: #606060;
+ background-color: #f0f0f0;
+}
+
+a
+{
+ color: #606060;
+ text-decoration: underline;
+}
+
+a:hover
+{
+ _border-bottom: 1px solid #000000;
+ background-color: #f0f0f0;
+}
+
+ul
+{
+ color: #606060;
+}
+
+/*
+ul
+{
+ _background: #e0ffe0;
+ _margin: 0 0 0 0 0em;
+ padding: 0 0 0 1em;
+}
+
+li
+{
+ _background: #ffe0e0;
+ _list-style: none;
+ padding: 0;
+ margin: 0;
+}
+*/
+
+table
+{
+ border-collapse: collapse;
+ margin: 0.5em 0 0.5em 0;
+}
+
+/*
+tr
+{
+}
+*/
+
+td
+{
+ vertical-align: top;
+ color: #606060;
+ padding: 0.1em 1em 0.1em 0.1em;
+ margin: 0;
+}
+
+/* Table rows with light lines seperating the rows */
+td.lines
+{
+ border-top: 1px solid #e8e8e8;
+ border-bottom: 1px solid #e8e8e8;
+}
+
+th
+{
+ color: #606060;
+ font-weight: bolder;
+ text-align: left;
+ vertical-align: top;
+ padding-right: 1em;
+}
+
+/*
+fieldset
+{
+ _border: 1px solid #808080;
+}
+
+legend
+{
+ padding: 0.2em 0.5em;
+ border: 1px solid #808080;
+ color: #808080;
+ _font-size: 90%;
+ _text-align: right;
+}
+*/
+
+.warning
+{
+ color: red;
+ font-weight: bolder;
+}
+
+.ok
+{
+ color: green;
+ font-weight: bolder;
+}
+
+.donate
+{
+ color: #606060;
+ font-size: 10pt;
+ font-size: 9pt;
+ text-align: center;
+ margin: 2em 1em 2em 1em;
+ border: 1px solid #d0d0d0;
+ padding: 0.2em 1em 0.2em 1em;
+}
+
diff --git a/homepage/includes/body.wmi b/homepage/includes/body.wmi
new file mode 100644
index 0000000..1cf5cf0
--- /dev/null
+++ b/homepage/includes/body.wmi
@@ -0,0 +1,7 @@
+# includes/body.wmi
+
+<div id="maincontent">
+
+<<MAIN__BODY>>
+
+</div>
diff --git a/homepage/includes/common.wmi b/homepage/includes/common.wmi
new file mode 100644
index 0000000..0550248
--- /dev/null
+++ b/homepage/includes/common.wmi
@@ -0,0 +1,13 @@
+# includes/common.wmi
+
+<define-tag webmaster whitespace=delete>
+ Autotesting LiveCD Org
+</define-tag>
+
+<define-tag webmasterhtml whitespace=delete>
+ Autotesting LiveCD Org
+</define-tag>
+
+<define-tag full-url whitespace=delete>
+http://autotesting.livecd.org/
+<define-tag>
diff --git a/homepage/includes/footer.wmi b/homepage/includes/footer.wmi
new file mode 100644
index 0000000..cf8b36d
--- /dev/null
+++ b/homepage/includes/footer.wmi
@@ -0,0 +1,16 @@
+# includes/footer.wmi
+
+<div id="footer">
+ <webmasterhtml> — <br //>
+
+ Last modified:
+ <:
+ @stat = stat($WML_SRC_FILENAME);
+ print scalar localtime($stat[9]);
+ :>
+ -
+ Last compiled:
+ <:
+ print scalar localtime();
+ :>
+</div>
diff --git a/homepage/includes/header.wmi b/homepage/includes/header.wmi
new file mode 100644
index 0000000..004dc48
--- /dev/null
+++ b/homepage/includes/header.wmi
@@ -0,0 +1,7 @@
+# includes/header.wmi
+
+<div id="header">
+ <div id="logo"><a href="/"><img src="images/logo.png" alt="AutoTesting.LiveCD.org logo" /></a></div>
+ <div id="headertitle"><a href="/">Autotesting.LiveCD.org</a></div>
+ <div id="headersubtitle">Testing Live Systems!</div>
+</div>
diff --git a/homepage/includes/link.wmi b/homepage/includes/link.wmi
new file mode 100644
index 0000000..0bea729
--- /dev/null
+++ b/homepage/includes/link.wmi
@@ -0,0 +1,40 @@
+# includes/link.wmi
+
+<define-tag mailto endtag=required whitespace=delete>
+ <a href="mailto:<EMAIL "%0">" title="<EMAIL "%0">">%body</a>
+</define-tag>
+
+<define-tag link endtag=required whitespace=delete>
+ <a href="<URL "%0">">%body</a>
+</define-tag>
+
+<define-tag EMAIL whitespace=delete>
+ <ifeq "%0" "daniel" "daniel at debian.org">
+</define-tag>
+
+<define-tag URL whitespace=delete>
+ <if "%0" "" "$(DOCROOT)">
+ <ifeq "%0" "home" "$(DOCROOT)/">
+ <ifeq "%0" "links" "$(DOCROOT)/links.html">
+ <ifeq "%0" "debian-live" "$(DOCROOT)/debian-live/">
+ <ifeq "%0" "webconverger" "$(DOCROOT)/webconverger/">
+ <ifeq "%0" "local-build" "$(DOCROOT)/local-build/">
+</define-tag>
+
+<define-tag newslink whitespace=delete>
+ <a href="%0">[...]</a>
+</define-tag>
+
+<define-tag screenshot-right whitespace=delete>
+ <a href="$(DOCROOT)/screenshots/%0.png" title="Click for larger version">
+ <img class="screenshot-right" src="$(DOCROOT)/screenshots/%0_sm.png" border="0" />
+ </a>
+</define-tag>
+
+<define-tag screenshot whitespace=delete>
+<p>
+ <a href="$(DOCROOT)/screenshots/%0.png" title="Click for larger version">
+ <img class="screenshot" src="$(DOCROOT)/screenshots/%0_sm.png" border="0" />
+ </a>
+</p>
+</define-tag>
diff --git a/homepage/includes/main.wmi b/homepage/includes/main.wmi
new file mode 100644
index 0000000..93ef438
--- /dev/null
+++ b/homepage/includes/main.wmi
@@ -0,0 +1,40 @@
+# includes/main.wmi
+
+#include "link.wmi"
+#include "common.wmi"
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
+<html>
+ <head>
+ <title><<MAIN__TITLE>></title>
+ <protect><link rel="icon" href="favicon.ico" type="image/ico"></protect>
+ <protect><link rel="stylesheet" type="text/css" href="images/style.css" /></protect>
+ <meta name="Author" content="<webmaster>">
+ <meta http-equiv="content-type" content="text/html; charset=iso-8859-15">
+ <meta name="keywords" content="<<MAIN__KEYWORDS>>">
+ <meta name="description" content="<<MAIN__DESCRIPTION>>">
+ </head>
+
+<body>
+
+#include "header.wmi"
+#include "menu.wmi"
+#include "body.wmi"
+#include "footer.wmi"
+
+</body>
+</html>
+
+<define-tag title>
+..MAIN__TITLE>>%0<<..
+</define-tag>
+
+<define-tag keywords>
+..MAIN__KEYWORDS>>%0<<..
+</define-tag>
+
+<define-tag description>
+..MAIN__DESCRIPTION>>%0<<..
+</define-tag>
+
+..MAIN__BODY>>
diff --git a/homepage/includes/menu.wmi b/homepage/includes/menu.wmi
new file mode 100644
index 0000000..69ef83d
--- /dev/null
+++ b/homepage/includes/menu.wmi
@@ -0,0 +1,10 @@
+# includes/menu.wmi
+
+<div id="floatmenu">
+ <div class="menuitem">Welcome</div>
+ <div class="menusubitem"><link home>Home</link></div>
+ <div class="menuitem">Autotesting</div>
+ <div class="menusubitem"><link debian-live>Debian-Live</link></div>
+ <div class="menusubitem"><link webconverger>Webconverger</link></div>
+ <div class="menusubitem"><link local-build>local-builds</link></div>
+</div>
diff --git a/homepage/index.wml b/homepage/index.wml
new file mode 100644
index 0000000..f945321
--- /dev/null
+++ b/homepage/index.wml
@@ -0,0 +1,59 @@
+#!wml
+#include "main.wmi"
+
+<title "Autotesting LiveCD Org">
+<description "Autotesting LiveCD Images">
+<keywords "Autotesting, LiveCD">
+
+<h1>About</h1>
+
+<p>
+
+ A project to Autotest LiveCD images. The output of the autotesting is to create video recordings of booting live
+images "This will be really great for doing QA on the images, so that we know before downloading if a
+latest-and-greatest sid image is even booting/working correctly :)"
+
+</p>
+
+
+<:{
+use File::Find;
+use File::Basename;
+
+$dir = "./";
+$search_path="index\.html";
+$search_pattern_part2=".(current).";
+
+find({ wanted => \&filter, follow => 1 }, $dir);
+
+sub filter() {
+ $filename = $_;
+ $fullname = $File::Find::name;
+ if ($fullname =~ /$search_path/i) {
+ if($fullname =~ /$search_pattern_part2/i) {
+ push (@current, $fullname)
+ }
+ else {
+ push (@other, $fullname)
+ }
+ last;
+ }
+ }
+
+print "<h2>Current Videos</h2>";
+foreach(sort @current) {
+ print "</p><a href=\"$_\">$_</a> </p>\n";
+}
+
+print "<h2>Older Videos</h2>";
+foreach(sort @other) {
+ if ($_ !~ /\.\/index\.html/) {
+ print "</p><a href=\"$_\">$_</a> </p>\n";
+ }
+}
+
+
+
+}:>
+
+
diff --git a/homepage/video-page.wml b/homepage/video-page.wml
new file mode 100644
index 0000000..6a130e8
--- /dev/null
+++ b/homepage/video-page.wml
@@ -0,0 +1,129 @@
+#!wml
+#include <main.wmi>
+#
+# Not the best perl I ever written.
+
+<title "Autotesting LiveCD Org">
+<description "Autotesting LiveCD Images">
+<keywords "Autotesting, LiveCD">
+
+
+<define-tag dlurl whitespace=delete>
+<:{
+sub GetSetting
+{
+ my ($cfg_value,$cfg_filename,$cfg_default)=@_;
+ open(CFGFILE,"<$cfg_filename") or die "Can't open configuration file $cfg_filename.";
+ my @cf=<CFGFILE>;
+ foreach $cfg_line (@cf)
+ {
+ if (index($cfg_line,"#")==0) { next; } # Lines starting with a hash mark are comments
+ my @ln=split("=",$cfg_line);
+ if ($ln[0] =~ /$cfg_value/i) {
+ chomp $ln[1];
+ return $ln[1];
+ }
+ }
+ close CFGFILE;
+ return $cfg_default; # Return default if we can't find the value
+}
+my $url = GetSetting('url','details.txt','http://debian-live.alioth.debian.org/');
+print "$url";
+}:>
+</define-tag>
+
+<define-tag built whitespace=delete>
+<:{
+my $built = GetSetting('built','details.txt','Sometime-Ago');
+print "$built";
+}:>
+</define-tag>
+
+<define-tag tested whitespace=delete>
+<:{
+my $tested = GetSetting('tested','details.txt','Today');
+print "$tested";
+}:>
+</define-tag>
+
+<define-tag tested-long whitespace=delete>
+<:{
+my $tested = GetSetting('tested_long','details.txt','Today');
+print "$tested_long";
+}:>
+</define-tag>
+
+<define-tag basename whitespace=delete>
+<:{
+my $basename = GetSetting('image','details.txt','.iso');
+print "$basename";
+}:>
+</define-tag>
+
+
+<h1>Autesting of <basename></h1>
+<p>Download: <a href=<dlurl>><dlurl></a><p>
+<p>Build: <built></p>
+<p>Tested: <tested-long></p>
+
+<h2>Final Frame</h2>
+<:{
+my $tested = GetSetting('tested','details.txt','Today');
+print "$tested";
+print "<img src=\"./final-screenshot_", $tested, ".jpg\" border=\"0\" >"
+}:>
+
+
+<h2>Video</h2>
+
+<p>Below is a video of the booting of this image within qemu.</p>
+
+<p>Please note - Java or gjc is required to play the video via the <a href=http://www.flumotion.net/cortado/>
+Cortado Java applet</a>. This applet plays the <a href=http://en.wikipedia.org/wiki/Theora>theora</a> encoded video.
+</p>
+<p>Bug: At the moment seek button or the seek bar does not work. It is worth watching in the whole video (1 minute).
+Note the first part of the boot up can appear slow, this is to avoid a qemu bug. </p>
+
+
+<script language="javascript">
+ function doPlay() {document.applets[0].doPlay();}
+ function doPause() {document.applets[0].doPause();}
+ function doSeek(pos) {document.applets[0].doSeek(pos);}
+</script>
+ <applet code="com.fluendo.player.Cortado.class" archive="http://autotesting.livecd.org/jar/cortado.jar" width="800" height="600"/>
+<:{
+ use Cwd;
+ my $dir = getcwd;
+ ($absolut) = $dir =~ m|/var/www(/.*)$|;
+ my $tested = GetSetting('tested','details.txt','Today');
+ print "$tested";
+ print "<param name=\"url\" value=\"http://autotesting.livecd.org$absolut/video-booting.theora_", $tested , ".ogg\"/>";
+}:>
+ <param name="local" value="false"/>
+ <param name="seekable" value="false"/>
+ <param name="keepaspect" value="true" />
+ <param name="video" value="true" />
+ <param name="audio" value="false" />
+ <param name="showStatus" value="true" />
+ <param name="bufferSize" value="200" />
+ <param name="statusHeight" VALUE="36" />
+ <param name="autoPlay" VALUE="false" />
+ <param name="duration" VALUE="140" />
+ </applet>
+<p>
+<button onClick="doPlay()">
+Play
+</button>
+
+<button onClick="doPause()">
+Pause
+</button>
+
+<:{
+my $tested = GetSetting('tested','details.txt','Today');
+print "$tested";
+print "<p>The <a href=./video-booting.theora_", $tested, ".ogg>video is available for download</a> for offline viewing.<p>"
+
+}:>
+
+
diff --git a/local.lst b/local.lst
new file mode 100644
index 0000000..6640d9e
--- /dev/null
+++ b/local.lst
@@ -0,0 +1,3 @@
+/home/autotesting/iso/local/debian-live-sid-i386-xfce.iso
+/home/autotesting/iso/local/debian-live-lenny-i386-xfce.iso
+/home/autotesting/iso/local/debian-live-etch-i386-xfce.iso
diff --git a/local_build_debian-live.sh b/local_build_debian-live.sh
index ee4982e..1317d96 100755
--- a/local_build_debian-live.sh
+++ b/local_build_debian-live.sh
@@ -3,6 +3,7 @@
# Locally build a debian-live image.
# as crontab from root
# Kick auotesting to test..
+# debian-live-lenny-i386-gnome-desktop.iso
if [ -z "$1" -a -z "$2" ]
then
@@ -13,9 +14,9 @@ fi
if [ -z "$3" ]
then
echo "blank packages-lists"
- PACKAGE_LISTS=""
+ PACKAGES_LISTS=""
else
- PACKAGE_LISTS=" --packages-lists \"$2 \""
+ PACKAGES_LISTS="--packages-lists $3"
fi
TODAY=$(date +"%F")
@@ -24,9 +25,9 @@ mkdir $TMP_DIR
#chmod a+w $TMP_DIR
cd $TMP_DIR
-lh_config --distribution $2 "$PACKAGE_LISTS"
+lh_config --distribution $2 $PACKAGES_LISTS
sudo lh_build
-cp ./binary.iso "$1"
+cp ./binary.iso ${1}-${2}-${3}.iso
ls ./ "$1"
#chmod a+w "$1"
sudo rm $TMP_DIR -R
diff --git a/run-batch-autotesting.sh b/run-batch-autotesting.sh
index ef82e78..88bef7a 100755
--- a/run-batch-autotesting.sh
+++ b/run-batch-autotesting.sh
@@ -98,36 +98,43 @@ do
else
DATE_IMAGE_BUILT=$(ls -lh --time-style long-iso $DIRECTORY/$BASE_NAME |tr -s " "|cut -d" " -f6)
DATE_DOWNLOADED=$(ls -lc --time-style long-iso $DIRECTORY/$BASE_NAME |tr -s " "|cut -d" " -f6)
+ TODAY=$(date +"%F")
+ TODAY_LONG=$(date )
mkdir "$VIDEO_DIRECTORY/${BASE_NAME}"
- VIDEO_NAME="$VIDEO_DIRECTORY/${BASE_NAME}/Built_${DATE_IMAGE_BUILT}_Tested_${DATE_DOWNLOADED}_.ogg"
- LOG_FILE="$VIDEO_DIRECTORY/${BASE_NAME}/Built_${DATE_IMAGE_BUILT}_Tested_${DATE_DOWNLOADED}_log.txt"
+ VIDEO_NAME="$VIDEO_DIRECTORY/${BASE_NAME}/Built_${DATE_IMAGE_BUILT}_Tested_${TODAY}_.ogg"
+ LOG_FILE="$VIDEO_DIRECTORY/${BASE_NAME}/Built_${DATE_IMAGE_BUILT}_Tested_${TODAY}_log.txt"
echo "AutoTesting $BASE_NAME $VIDEO_NAME"
- $VIDEO_QEMU_BOOTING -g 1024x768 -t 420 -v 5 $DIRECTORY/$BASE_NAME $VIDEO_NAME >$LOG_FILE 2>&1
+ $VIDEO_QEMU_BOOTING -g 1280x960 -t 420 -v 5 $DIRECTORY/$BASE_NAME $VIDEO_NAME >$LOG_FILE 2>&1
echo "Finished Autotesting $BASE_NAME"
echo
echo "----"
echo
- echo "* Creating symlinks to webserver"
- LN_S_ROOT="$WEB_ROOT/$BASE_NAME/built_${DATE_IMAGE_BUILT}/Tested_${DATE_DOWNLOADED}"
+ echo "* Moving to webserver"
+ LN_S_ROOT="$WEB_ROOT/$BASE_NAME/built_${DATE_IMAGE_BUILT}/Tested_${TODAY}"
LN_S_CURRENT="$WEB_ROOT/$BASE_NAME/current"
# making directories if required.
mkdir -p "$LN_S_ROOT"
+ rm "$LN_S_CURRENT/*" -rf
mkdir -p "$LN_S_CURRENT"
# get rid of the old current
- rm "$LN_S_CURRENT/*"
- ln -s $VIDEO_NAME "$LN_S_ROOT/video-booting.theora.ogg"
- ln -s $VIDEO_NAME "$LN_S_CURRENT/video-booting.theora.ogg"
- ln -s $VIDEO_NAME.montage.jpg "$LN_S_ROOT/video-booting-montage.jpg"
- ln -s $VIDEO_NAME.montage.jpg "$LN_S_CURRENT/video-booting-montage.jpg"
- ln -s $VIDEO_NAME.end.jpg "$LN_S_ROOT/final-screenshot.jpg"
- ln -s $VIDEO_NAME.end.jpg "$LN_S_CURRENT/final-screenshot.jpg"
- SWF_NAME=$(echo $VIDEO_NAME.swf | rev | cut -d"/" -f 1 | rev)
- ln -s $VIDEO_NAME.swf "$LN_S_ROOT/$SWF_NAME"
- ln -s $VIDEO_NAME.swf "$LN_S_CURRENT/$SWF_NAME"
- HTML_PAGE="$VIDEO_DIRECTORY/${BASE_NAME}/Built_${DATE_IMAGE_BUILT}_Tested_${DATE_DOWNLOADED}__View_swf_Video_.html"
- ln -s $HTML_PAGE "$LN_S_ROOT/play-video-booting-swf.html"
- ln -s $HTML_PAGE "$LN_S_CURRENT/play-video-booting-swf.html"
+ cp $VIDEO_NAME "$LN_S_ROOT/video-booting.theora_${TODAY}.ogg"
+ mv $VIDEO_NAME "$LN_S_CURRENT/video-booting.theora_${TODAY}.ogg"
+ cp $VIDEO_NAME.montage.jpg "$LN_S_ROOT/video-booting-montage_${TODAY}.jpg"
+ mv $VIDEO_NAME.montage.jpg "$LN_S_CURRENT/video-booting-montage_${TODAY}.jpg"
+ cp $VIDEO_NAME.end.jpg "$LN_S_ROOT/final-screenshot_${TODAY}.jpg"
+ mv $VIDEO_NAME.end.jpg "$LN_S_CURRENT/final-screenshot_${TODAY}.jpg"
echo "----"
+ cp /home/autotesting/debian-live/autotesting/homepage/video-page.wml "$LN_S_ROOT/index.wml"
+ cp /home/autotesting/debian-live/autotesting/homepage/video-page.wml "$LN_S_CURRENT/index.wml"
+ DETAILS_TXT="$VIDEO_DIRECTORY/${BASE_NAME}/Built_${DATE_IMAGE_BUILT}_Tested_${TODAY}__details.txt"
+ echo "# Setting used for index.wml" >$DETAILS_TXT
+ echo "url=${URL}" >>$DETAILS_TXT
+ echo "image=${BASE_NAME}" >>$DETAILS_TXT
+ echo "built=${DATE_IMAGE_BUILT}" >>$DETAILS_TXT
+ echo "tested=${TODAY}" >>$DETAILS_TXT
+ echo "tested_long=\"${TODAY_LONG}\" " >>$DETAILS_TXT
+ cp $DETAILS_TXT "$LN_S_ROOT/details.txt"
+ mv $DETAILS_TXT "$LN_S_CURRENT/details.txt"
echo
fi
fi
diff --git a/video-qemu-booting-iso.sh b/video-qemu-booting-iso.sh
index 1d19e64..c479dc6 100755
--- a/video-qemu-booting-iso.sh
+++ b/video-qemu-booting-iso.sh
@@ -178,9 +178,9 @@ gen_video ()
#Need to runs some tests to ensure vncrec -movie does temriante at end of session.
echo "Generating video from recorded vnc stream. "
vncrec -movie $TMP_DIR/qemu.1.vnc 2>/dev/null | ffmpeg2theora $FFMPEG_DIM_SCALE --videoquality $VQUALITY --inputfps 40 --artist "AutoTesting.livecd.org" --title "Video of Qemu booting $ISO" --date "$TODAY" -o $VIDEO - 2>/dev/null
-vnc2swf-edit -o $VIDEO.swf -l -c -s 0.703125 -t video $TMP_DIR/qemu.1.vnc
-VIDEO_NO_EXT=${VIDEO%.*}
-mv $VIDEO.html ${VIDEO_NO_EXT}_View_swf_Video_.html
+#vnc2swf-edit -o $VIDEO.swf -l -c -s 0.703125 -t video $TMP_DIR/qemu.1.vnc
+#VIDEO_NO_EXT=${VIDEO%.*}
+#mv $VIDEO.html ${VIDEO_NO_EXT}_View_swf_Video_.html
}
gen_video_preview ()
diff --git a/webconverger.lst b/webconverger.lst
new file mode 100644
index 0000000..65ca8e8
--- /dev/null
+++ b/webconverger.lst
@@ -0,0 +1 @@
+http://download.webconverger.com/mini/webc-3.2.mini.iso
--
debian-live/autotesting
More information about the debian-live-changes
mailing list