Author: wade
Date: 2007-10-03 19:51:26 -0400 (Wed, 03 Oct 2007)
New Revision: 86840
Modified:
trunk/release/packaging/conf/win-4-i386
trunk/release/packaging/defs/mono
trunk/release/packaging/do-msvn-tar
trunk/release/packaging/rpm_defs/mono-core/mono-core.spec
trunk/release/pyutils/config.py
trunk/release/pyutils/remote_shell.py
trunk/release/pyutils/src_repo_utils.py
Log:
add moon and suse-103-i586 to get scheduled
defs/mono: use more portable shell, add ondotnet tests
mono-core.spec: update version (was bumpbed for obs)
packaging/do-msvn-tar:
pyutils/src_repo_utils.py:
pyutils/config.py:
pyutils/remote_shell.py:
-Consolidate ssh options
-use distro key for logging into boxes/jails
Modified: trunk/release/packaging/conf/win-4-i386
===================================================================
--- trunk/release/packaging/conf/win-4-i386 2007-10-03 23:29:05 UTC (rev
86839)
+++ trunk/release/packaging/conf/win-4-i386 2007-10-03 23:51:26 UTC (rev
86840)
@@ -1,6 +1,6 @@
username=builder
-hostname=x32-win-1.mono.lab.novell.com
-#hostname=cygwin-mono.boston.ximian.com
+#hostname=x32-win-1.mono.lab.novell.com
+hostname=cygwin-mono.boston.ximian.com
USE_ZIP_PKG=1
# Cygwin's ssh server doesn't load this information
# ... let's do it explicitly through sshutils
Modified: trunk/release/packaging/defs/mono
===================================================================
--- trunk/release/packaging/defs/mono 2007-10-03 23:29:05 UTC (rev 86839)
+++ trunk/release/packaging/defs/mono 2007-10-03 23:51:26 UTC (rev 86840)
@@ -341,8 +341,8 @@
POSTBUILD_STEP_NAME2="test-aot"
POSTBUILD_STEP2 () {
# Only run on linux x86 and x86_64
- if [ $BUILD_OS == "linux" ] ; then
- if [ $BUILD_ARCH == "x86" ] || [ $BUILD_ARCH == "x86_64" ] ;
then
+ if test x$BUILD_OS = xlinux ; then
+ if test x$BUILD_ARCH = x"x86" || test x$BUILD_ARCH = x"x86_64"
; then
cd mono/mini
$make_path aotcheck
cd ../tests
@@ -365,7 +365,7 @@
POSTBUILD_STEP_NAME4="test-cas"
POSTBUILD_STEP4 () {
# These hang the tests on sles-9-ia64, so skip for now...
- if [ $DISTRO != "sles-9-ia64" ] ; then
+ if test x$DISTRO != xsles-9-ia64 ; then
cd mono/tests/cas
$make_path -k test
else
@@ -389,6 +389,15 @@
}
+POSTBUILD_STEP_NAME6="test-ondotnet"
+POSTBUILD_STEP6 () {
+ if test x$DISTRO = xwin-4-i386 ; then
+ $make_path make run-test-ondotnet
+ else
+ echo "Skipping... test only on windows"
+ fi
+}
+
# This step gets executed after all tests, or after a build failure
CLEAN_UP () {
#echo "Skipping..."
@@ -411,7 +420,7 @@
rm -Rf /tmp/mcs* /var/tmp/mcs*
# These tend to get left around on win32... ?
- if [ $DISTRO == "win-4-i386" ] ; then
+ if test x$DISTRO = xwin-4-i386 ; then
/home/builder/bin/Process.exe -k mono.exe || true
fi
Modified: trunk/release/packaging/do-msvn-tar
===================================================================
--- trunk/release/packaging/do-msvn-tar 2007-10-03 23:29:05 UTC (rev 86839)
+++ trunk/release/packaging/do-msvn-tar 2007-10-03 23:51:26 UTC (rev 86840)
@@ -67,7 +67,7 @@
# use the key in /usr/share/ximian-build-system/conf/ssh
# This needs to be exported to the environment
-SVN_SSH = "ssh -i %s/distro_source_key -o StrictHostKeyChecking=no " % temp_dir
+SVN_SSH = "ssh -i %s/distro_source_key %s " % (temp_dir, config.ssh_options)
SVNEXPORT = "svn export -q " + rev_arg
MONO_ROOT = config.MONO_ROOT
SVN_PATHS = ":".join(svn_paths)
Modified: trunk/release/packaging/rpm_defs/mono-core/mono-core.spec
===================================================================
--- trunk/release/packaging/rpm_defs/mono-core/mono-core.spec 2007-10-03
23:29:05 UTC (rev 86839)
+++ trunk/release/packaging/rpm_defs/mono-core/mono-core.spec 2007-10-03
23:51:26 UTC (rev 86840)
@@ -6,7 +6,7 @@
Group: Development/Languages/Mono
Summary: A .NET Runtime Environment
URL: http://go-mono.org/
-Version: 1.2.5
+Version: 1.2.5.1
Release: 5.novell
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: mono-%{version}.tar.bz2
Modified: trunk/release/pyutils/config.py
===================================================================
--- trunk/release/pyutils/config.py 2007-10-03 23:29:05 UTC (rev 86839)
+++ trunk/release/pyutils/config.py 2007-10-03 23:51:26 UTC (rev 86840)
@@ -35,6 +35,9 @@
MONO_ROOT = "svn+ssh://[EMAIL PROTECTED]/source"
src_key_file = packaging_dir + os.sep + "distro_source_key"
+#buildenv_key_file = ""
+buildenv_key_file = packaging_dir + os.sep + "distro_source_key"
+
# Url path from view of webserver
web_root_url = ""
web_root_dir = release_repo_root + "/monobuild/www"
@@ -74,6 +77,7 @@
mono-tools
monodevelop
monodoc
+ moon
olive
xsp
""".split()
@@ -111,6 +115,7 @@
sunos-8-sparc
sunos-10-x86
suse-100-i586
+ suse-103-i586
win-4-i386
""".split()
sd_latest_build_packages = td_packages
@@ -181,3 +186,9 @@
######################################
+# Common place to put all ssh options
+ssh_options = '-o BatchMode=yes -o StrictHostKeyChecking=no -o Cipher=blowfish
-o ConnectTimeout=10'
+
+# Add key file to options for all ssh stuff, so all you need is the distro key
+if os.path.exists(buildenv_key_file) and buildenv_key_file != "":
+ ssh_options += ' -i ' + buildenv_key_file
Modified: trunk/release/pyutils/remote_shell.py
===================================================================
--- trunk/release/pyutils/remote_shell.py 2007-10-03 23:29:05 UTC (rev
86839)
+++ trunk/release/pyutils/remote_shell.py 2007-10-03 23:51:26 UTC (rev
86840)
@@ -13,14 +13,13 @@
import utils
debug = False
-ssh_options = '-o "BatchMode yes" -o "StrictHostKeyChecking no" -o "Cipher
blowfish" -o "ConnectTimeout 10" '
class ssh:
def __init__(self, username, hostname, env="", my_logger=""):
# Ignore host checks, and blowfish might be faster and less cpu
intensive
# Add connecttimeout so we don't wait forever for a host that
is down
- self.options = ssh_options
+ self.options = config.ssh_options
self.username = username
self.hostname = hostname
@@ -114,7 +113,7 @@
def __init__(self, username, hostname, env="", my_logger=""):
# Ignore host checks, and blowfish might be faster and less cpu
intensive
- self.options = ssh_options
+ self.options = config.ssh_options
self.username = username
self.hostname = hostname
Modified: trunk/release/pyutils/src_repo_utils.py
===================================================================
--- trunk/release/pyutils/src_repo_utils.py 2007-10-03 23:29:05 UTC (rev
86839)
+++ trunk/release/pyutils/src_repo_utils.py 2007-10-03 23:51:26 UTC (rev
86840)
@@ -16,15 +16,18 @@
self.root = root
- self.auth_env = ""
+ self.ssh_options = config.ssh_options
if key_file:
- self.auth_env = "SVN_SSH='ssh -i %s'" % key_file
+ self.ssh_options += " -i %s" % key_file
+ # Even this won't be used when using svn:// protocol, it won't
hurt
+ self.svn_env = "SVN_SSH='ssh %s'" % self.ssh_options
+
def latest_tree_revision(self):
"""Get the last commit version.
"""
- output = commands.getoutput('%s svn ls %s -v' % (
self.auth_env, self.root ) )
+ output = commands.getoutput('%s svn ls %s -v' % ( self.svn_env,
self.root ) )
versions = []
for line in output.split('\n'):
@@ -58,7 +61,7 @@
dirname = os.path.dirname(item)
module = os.path.basename(item)
- output = commands.getoutput('%s svn ls %s/%s %s -v' % (
self.auth_env, self.root , dirname, rev_arg) )
+ output = commands.getoutput('%s svn ls %s/%s %s -v' % (
self.svn_env, self.root , dirname, rev_arg) )
for line in output.split('\n'):
list = line.split()
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
