SF.net SVN: opencsw:[672] buildfarm/bin
wahwah at users.sourceforge.net
wahwah at users.sourceforge.net
Sat Mar 1 21:08:54 CET 2014
Revision: 672
http://sourceforge.net/p/opencsw/code/672
Author: wahwah
Date: 2014-03-01 20:08:51 +0000 (Sat, 01 Mar 2014)
Log Message:
-----------
Committing long-standing changes from web.
Modified Paths:
--------------
buildfarm/bin/cleanup-experimental
buildfarm/bin/find-obsolete-pkgs
buildfarm/bin/generate-unstable
buildfarm/bin/list-experimental
buildfarm/bin/make-experimental-browsable
buildfarm/bin/opencsw-future-update
buildfarm/bin/pkg-browse-template.html
buildfarm/bin/push-opencsw-to-mirror
buildfarm/bin/send-catalog-update-notifications
Modified: buildfarm/bin/cleanup-experimental
===================================================================
--- buildfarm/bin/cleanup-experimental 2014-01-09 11:05:35 UTC (rev 671)
+++ buildfarm/bin/cleanup-experimental 2014-03-01 20:08:51 UTC (rev 672)
@@ -64,6 +64,8 @@
} else {
# Contents is different.
print STDERR " Contents differs: $p/$f\n";
+ print "Deleting anyway $p/$f\n";
+ unlink( "$experimentaldir/$p/$f" );
}
}
@@ -77,6 +79,8 @@
if( cmprev( $latestpkgrev{$name}, $rev ) > 0 ) {
print STDERR "Newer PKG released. Testing: $p/$f\n";
print STDERR " Released: $latestpkgname{$name}\n";
+ print "Deleting anyway $p/$f\n";
+ unlink( "$experimentaldir/$p/$f" );
}
}
}
Modified: buildfarm/bin/find-obsolete-pkgs
===================================================================
--- buildfarm/bin/find-obsolete-pkgs 2014-01-09 11:05:35 UTC (rev 671)
+++ buildfarm/bin/find-obsolete-pkgs 2014-03-01 20:08:51 UTC (rev 672)
@@ -8,24 +8,19 @@
HTMLDIR=/opt/csw/apache2/share/htdocs/buildfarm/obsolete-pkgs
+mkdir -p ${HTMLDIR}.new
+cd ${HTMLDIR}.new
for A in sparc i386; do
for R in SunOS5.9 SunOS5.10 SunOS5.11; do
- echo "unstable -> kiel $A $R"
+ echo "dublin -> unstable $A $R"
/home/web/bin/gar/lib/python/find_obsolete_pkgs.py \
- --from-catalog-release=unstable \
- --to-catalog-release=kiel \
+ --verbose \
+ --from-catalog-release=dublin \
+ --to-catalog-release=unstable \
--os-arch=$A --os-release=$R \
- >$(HTMLDIR)/.unstable2kiel-${A}-${R}.new 2>&1
- mv $(HTMLDIR)/.unstable2kiel-${A}-${R}.new \
- $(HTMLDIR)/unstable2kiel-${A}-${R}
- echo "kiel -> dublin $A $R"
- /home/web/bin/gar/lib/python/find_obsolete_pkgs.py \
- --from-catalog-release=kiel \
- --to-catalog-release=dublin \
- --os-arch=$A --os-release=$R \
- >$(HTMLDIR)/.kiel2dublin-${A}-${R}.new 2>&1
- mv $(HTMLDIR)/.kiel2dublin-${A}-${R}.new \
- $(HTMLDIR)/kiel2dublin-${A}-${R}
+ >${HTMLDIR}.new/unstable2kiel-${A}-${R}.log 2>&1
done
done
-
+mv ${HTMLDIR} ${HTMLDIR}.old
+mv ${HTMLDIR}.new ${HTMLDIR}
+rm -rf ${HTMLDIR}.old
Modified: buildfarm/bin/generate-unstable
===================================================================
--- buildfarm/bin/generate-unstable 2014-01-09 11:05:35 UTC (rev 671)
+++ buildfarm/bin/generate-unstable 2014-03-01 20:08:51 UTC (rev 672)
@@ -11,13 +11,20 @@
set -e
set -x
-declare -r catalogs=( "unstable" "dublin" "kiel" "bratislava")
+declare -r catalogs=(
+ "beanie"
+ "bratislava"
+ "dublin"
+ "kiel"
+ "unstable"
+)
declare -r os_rels=( "5.8" "5.9" "5.10" "5.11" )
declare -r mirror_name="opencsw-official"
declare -r mirror_root="/home/mirror/${mirror_name}"
for catalog in "${catalogs[@]}"
do
+ PYTHONPATH=/home/web/bin/gar \
/home/web/bin/gar/bin/pkgdb \
gen-cat --catalog-release "${catalog}" \
${mirror_root}/allpkgs \
@@ -34,11 +41,13 @@
cat_dir="${mirror_name}/${cat_3}"
abs_cat_dir="${mirror_root}/${cat_3}"
grm -vf "${abs_cat_dir}/catalog"* "${abs_cat_dir}/descriptions"*
+ PYTHONPATH=/home/web/bin/gar \
/home/web/bin/gar/lib/python/generate_catalog_file.py \
--catalog-release ${catalog} \
--arch ${arch} \
--os-release SunOS${osrel} \
--out-dir "${abs_cat_dir}"
+ # PYTHONPATH=mgar/gar/v2 ./mgar/gar/v2/lib/python/compare_catalog.py /export/mirror/opencsw-official/unstable/sparc/5.10/catalog /export/mirror/opencsw-official/testing/sparc/5.10/catalog >/dev/null 2>&1; echo $?
/home/web/bin/generate-catalog "${cat_dir}"
popd
done
Modified: buildfarm/bin/list-experimental
===================================================================
--- buildfarm/bin/list-experimental 2014-01-09 11:05:35 UTC (rev 671)
+++ buildfarm/bin/list-experimental 2014-03-01 20:08:51 UTC (rev 672)
@@ -111,8 +111,10 @@
}
}
print $fd "Last update of this page: " . sprintf( "%d-%02d-%02d %2d:%02d:%02d", $year + 1900, $mon + 1, $mday, $hour, $min, $sec ) . "<br/>\n";
- our ($csec,$cmin,$chour,$cmday,$cmon,$cyear,$cwday,$cyday,$cisdst) = localtime($newestcat);
- print $fd "Catalog for this project: " . sprintf( "%d-%02d-%02d %2d:%02d:%02d", $cyear + 1900, $cmon + 1, $cmday, $chour, $cmin, $csec );
+ if( $newestcat ) {
+ our ($csec,$cmin,$chour,$cmday,$cmon,$cyear,$cwday,$cyday,$cisdst) = localtime($newestcat);
+ print $fd "Catalog for this project: " . sprintf( "%d-%02d-%02d %2d:%02d:%02d", $cyear + 1900, $cmon + 1, $cmday, $chour, $cmin, $csec );
+ }
print $fd " (<a href=\"http://buildfarm.opencsw.org/opencsw/experimental/$project/\">Browse it</a>)<br/>\n";
if( -f "$DIR/README" ) {
@@ -131,7 +133,7 @@
} else {
print $fd "There are no checkpkg results for this project available yet.<p/>";
}
- opendir T, $DIR || die "Can't open $DIR";
+ opendir T, $DIR or die "Can't open $DIR";
my @pkgs = grep { !/^\./ && -f "$DIR/$_" } readdir T;
closedir T;
Modified: buildfarm/bin/make-experimental-browsable
===================================================================
--- buildfarm/bin/make-experimental-browsable 2014-01-09 11:05:35 UTC (rev 671)
+++ buildfarm/bin/make-experimental-browsable 2014-03-01 20:08:51 UTC (rev 672)
@@ -126,12 +126,13 @@
print join( " ", "/home/web/bin/gar/bin/checkpkg",
"--catalog-release=unstable",
"--os-releases", $os,
- "--architecture", $arch,
+ "--catalog-architecture", $arch,
@files ), "\n";
+ $ENV{PYTHONPATH} = '/home/web/bin/gar';
system( "/home/web/bin/gar/bin/checkpkg",
"--catalog-release=unstable",
"--os-releases", $os,
- "--architecture", $arch, @files );
+ "--catalog-architecture", $arch, @files );
push @md5s2check, map { $pkglist{$_} } @files;
}
}
Modified: buildfarm/bin/opencsw-future-update
===================================================================
--- buildfarm/bin/opencsw-future-update 2014-01-09 11:05:35 UTC (rev 671)
+++ buildfarm/bin/opencsw-future-update 2014-03-01 20:08:51 UTC (rev 672)
@@ -2,6 +2,8 @@
# A wrapper around a list of scripts.
+exec >/dev/null 2>&1
+
set -x
set -e
set -u
@@ -18,15 +20,18 @@
exit 1
fi
echo "Removing stale lockfile ${pidfile}, continuing."
+ # Race condition here.
rm -f ${pidfile}
else
echo "'${lockpath}' is locked, but there is no pidfile, continuing."
fi
fi
-trap "rm -f \"${pidfile}\"; rmdir \"${lockpath}\"; exit 0" 1 2 3 5 6 15 ERR
+trap "rm -f \"${pidfile}\"; rmdir \"${lockpath}\"; mv /opt/csw/apache2/share/htdocs/buildfarm/catalog-generation.log.new /opt/csw/apache2/share/htdocs/buildfarm/catalog-generation.log; exit 0" 1 2 3 5 6 15 ERR
echo $$ > "${pidfile}"
+exec >/opt/csw/apache2/share/htdocs/buildfarm/catalog-generation.log.new 2>&1
+date
${BASE_DIR}/sync-mirror
${BASE_DIR}/sync-checkpkg
@@ -37,6 +42,10 @@
${BASE_DIR}/send-catalog-update-notifications
echo "$0 completed successfully"
+date
+mv /opt/csw/apache2/share/htdocs/buildfarm/catalog-generation.log.new \
+ /opt/csw/apache2/share/htdocs/buildfarm/catalog-generation.log
+
rm -f "${pidfile}"
rmdir "${lockpath}"
Modified: buildfarm/bin/pkg-browse-template.html
===================================================================
--- buildfarm/bin/pkg-browse-template.html 2014-01-09 11:05:35 UTC (rev 671)
+++ buildfarm/bin/pkg-browse-template.html 2014-03-01 20:08:51 UTC (rev 672)
@@ -257,22 +257,22 @@
</a>
</h2>
<ul>
-#for bin in $pkg["binaries_dump_info"]
+#for path, base_name, soname, needed_sonames, runpath, runpath_rpath_the_same, rpath_set, runpath_set in $pkg["binaries_dump_info"]
<li>
- <strong>$bin.path</strong>
+ <strong>$path</strong>
## ['base_name', 'RUNPATH RPATH the same', 'runpath', 'RPATH set', 'needed sonames', 'path', 'RUNPATH set']
<ul>
<li>
- base name: <code>$bin.base_name</code>
+ base name: <code>$base_name</code>
</li>
-#if 'soname' in $bin
+#if $soname
<li>
soname:
<ul>
<li>
<code>
- <a href="http://www.opencsw.org/packagesContainingFile/?fileName=$bin.soname&searchsubmit=1">
- $bin.soname
+ <a href="http://www.opencsw.org/packagesContainingFile/?fileName=$soname&searchsubmit=1">
+ $soname
</a>
</code>
</li>
@@ -281,7 +281,7 @@
#end if
<li> runpath:
<ul>
-#for runpath_el in $bin.runpath
+#for runpath_el in $runpath
<li>
<code>
$runpath_el
@@ -291,11 +291,11 @@
</ul>
<li> needed sonames:
<ul>
-#for soname in $bin["needed sonames"]
+#for needed_soname in $needed_sonames
<li>
<code>
- <a href="http://www.opencsw.org/packagesContainingFile/?fileName=$soname&searchsubmit=1">
- $soname
+ <a href="http://www.opencsw.org/packagesContainingFile/?fileName=$needed_soname&searchsubmit=1">
+ $needed_soname
</a>
</code>
</li>
@@ -339,15 +339,15 @@
</tr>
#for md in $pkg.files_metadata
<tr>
-#if os.path.exists("/export/mirror/pkgbrowser/pkgs/"+$pkg.basic_stats.md5_sum[:2]+"/"+$pkg.basic_stats.md5_sum+"/"+$pkg.pkginfo.PKG+"/root/"+$md.path)
- <td><a href="http://pkg.opencsw.org/pkgbrowser/pkgs/${pkg.basic_stats.md5_sum[:2]}/${pkg.basic_stats.md5_sum}/${pkg.pkginfo.PKG}/root/${md.path}">$md.path</a></td>
+#if os.path.exists("/export/mirror/pkgbrowser/pkgs/"+$pkg.basic_stats.md5_sum[:2]+"/"+$pkg.basic_stats.md5_sum+"/"+$pkg.pkginfo.PKG+"/root/"+$md[0])
+ <td><a href="http://pkg.opencsw.org/pkgbrowser/pkgs/${pkg.basic_stats.md5_sum[:2]}/${pkg.basic_stats.md5_sum}/${pkg.pkginfo.PKG}/root/${md[0]}">$md[0]</a></td>
#else
- <td> $md.path </td>
+ <td> $md[0] </td>
#end if
- <td> $md.mime_type </td>
+ <td> $md[1] </td>
<td style="text-align: center;">
-#if "machine_id" in $md
- $hachoir_machines[$md.machine_id].name
+#if $md[2] is not None
+ $hachoir_machines[$md[2]].name
#else
#end if
@@ -418,7 +418,7 @@
<ul class="code">
#for entry in $pkg.pkgmap
<li>
- $entry.line
+ $entry[0]
</li>
#end for
</ul>
Modified: buildfarm/bin/push-opencsw-to-mirror
===================================================================
--- buildfarm/bin/push-opencsw-to-mirror 2014-01-09 11:05:35 UTC (rev 671)
+++ buildfarm/bin/push-opencsw-to-mirror 2014-03-01 20:08:51 UTC (rev 672)
@@ -9,11 +9,13 @@
# The new mirror (as of 2011-09)
/opt/csw/bin/rsync -raHv --delete-after \
--rsync-path=/opt/csw/bin/rsync \
+ --exclude=MIRROR_LAST_SYNC \
/export/mirror/opencsw-official/ \
mirror@${push_target_host}:/vhost/mirror.opencsw.org/htdocs/opencsw
- /opt/csw/bin/rsync -raHv --delete-after \
- --rsync-path=/opt/csw/bin/rsync \
- /export/mirror/opencsw-future/ \
- mirror@${push_target_host}:/vhost/mirror.opencsw.org/htdocs/opencsw-future
+# Disable future, dam 18.12.2013
+# /opt/csw/bin/rsync -raHv --delete-after \
+# --rsync-path=/opt/csw/bin/rsync \
+# /export/mirror/opencsw-future/ \
+# mirror@${push_target_host}:/vhost/mirror.opencsw.org/htdocs/opencsw-future
done
Modified: buildfarm/bin/send-catalog-update-notifications
===================================================================
--- buildfarm/bin/send-catalog-update-notifications 2014-01-09 11:05:35 UTC (rev 671)
+++ buildfarm/bin/send-catalog-update-notifications 2014-03-01 20:08:51 UTC (rev 672)
@@ -22,6 +22,7 @@
# echo /home/web/bin/gar/lib/python/catalog_notifier.py --help
# /home/web/bin/gar/lib/python/catalog_notifier.py --help
+PYTHONPATH=/home/web/bin/gar \
/home/web/bin/gar/lib/python/catalog_notifier.py \
--url http://mirror.opencsw.org/opencsw/ \
-p /home/web/official-catalog-state.pickle \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list