ubuntu-server-iso-testing-dev team mailing list archive
-
ubuntu-server-iso-testing-dev team
-
Mailing list archive
-
Message #00046
lp:~patrickmwright/ubuntu-server-iso-testing/usit-kernel-proposed into lp:ubuntu-server-iso-testing
Patrick Wright has proposed merging lp:~patrickmwright/ubuntu-server-iso-testing/usit-kernel-proposed into lp:ubuntu-server-iso-testing.
Requested reviews:
Ubuntu Server Iso Testing Developers (ubuntu-server-iso-testing-dev)
For more details, see:
https://code.launchpad.net/~patrickmwright/ubuntu-server-iso-testing/usit-kernel-proposed/+merge/68410
Tested in a local environment
--
https://code.launchpad.net/~patrickmwright/ubuntu-server-iso-testing/usit-kernel-proposed/+merge/68410
Your team Ubuntu Server Iso Testing Developers is requested to review the proposed merge of lp:~patrickmwright/ubuntu-server-iso-testing/usit-kernel-proposed into lp:ubuntu-server-iso-testing.
=== modified file 'templates.kernel/preseeds-common/base'
--- templates.kernel/preseeds-common/base 2011-06-14 10:00:59 +0000
+++ templates.kernel/preseeds-common/base 2011-07-19 15:44:32 +0000
@@ -152,6 +152,9 @@
# add a hostname to use a different server than security.ubuntu.com.
d-i apt-setup/security_host string
+{% block additional_repositories %}
+{% endblock %}
+
# Additional repositories, local[0-9] available
#d-i apt-setup/local0/repository string http://server/localrep/ ./
#d-i apt-setup/local0/comment string Comment
=== added directory 'templates.kernel/test_cases/generic-proposed'
=== added file 'templates.kernel/test_cases/generic-proposed/preseed'
--- templates.kernel/test_cases/generic-proposed/preseed 1970-01-01 00:00:00 +0000
+++ templates.kernel/test_cases/generic-proposed/preseed 2011-07-19 15:44:32 +0000
@@ -0,0 +1,56 @@
+#
+# Copyright (C) 2010, Canonical Ltd (http://www.canonical.com/)
+#
+# This file is part of ubuntu-server-iso-testing.
+#
+# ubuntu-server-iso-testing is free software: you can redistribute it
+# and/or modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation, either version 3 of
+# the License, or (at your option) any later version.
+#
+# ubuntu-server-iso-testing is distributed in the hope that it will
+# be useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with ubuntu-server-iso-testing. If not, see
+# <http://www.gnu.org/licenses/>.
+#
+
+{% extends "base" %}
+
+{% block kernel_flavor %}
+d-i base-installer/kernel/override-image string linux-generic
+{% endblock %}
+
+{% block pkgsel_first %}
+d-i pkgsel/include string openssh-server python-couchdb subunit python-subunit python-junitxml ltp build-essential
+d-i pkgsel/update-policy select No automatic updates
+{% endblock %}
+
+{% block d_i_answers %}
+postfix postfix/mailname string {{ hostname }}
+postfix postfix/tlsmgr_upgrade_warning boolean
+postfix postfix/recipient_delim string +
+postfix postfix/main_mailer_type select Internet Site
+postfix postfix/retry_upgrade_warning boolean
+# Install postfix despite an unsupported kernel?
+postfix postfix/kernel_version_warning boolean
+postfix postfix/relayhost string
+postfix postfix/procmail boolean false
+postfix postfix/bad_recipient_delimiter error
+postfix postfix/chattr boolean false
+postfix postfix/root_address string
+postfix postfix/rfc1035_violation boolean false
+postfix postfix/mydomain_warning boolean
+postfix postfix/mynetworks string 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128
+postfix postfix/destinations string {{ hostname }}, localhost.localdomain, localhost
+postfix postfix/not_configured error
+postfix postfix/mailbox_limit string 0
+postfix postfix/protocols select all
+{% endblock %}
+
+{% block additional_repositories %}
+d-i apt-setup/proposed boolean true
+{% endblock %}
=== added file 'templates.kernel/test_cases/generic-proposed/test'
--- templates.kernel/test_cases/generic-proposed/test 1970-01-01 00:00:00 +0000
+++ templates.kernel/test_cases/generic-proposed/test 2011-07-19 15:44:32 +0000
@@ -0,0 +1,29 @@
+#!/usr/bin/python
+
+import logging
+import unittest
+import subprocess
+import os
+
+logging.basicConfig(level=logging.DEBUG)
+
+class ltpTest(unittest.TestCase):
+
+ def testLTPlite(self):
+ # hack: at least for ltp-lite:
+ os.makedirs ('/usr/lib/ltp/results/')
+ os.makedirs ('/usr/lib/ltp/tools/pan')
+ os.symlink ('/usr/lib/ltp/tools/ltp-pan', '/usr/lib/ltp/tools/pan/ltp-pan')
+ # end hack
+ logging.debug ('running /usr/lib/ltp/tools/runltp -f ltplite')
+ Test = subprocess.Popen (['/usr/lib/ltp/tools/runltp',
+ '-f ltplite'],
+ stdout=subprocess.PIPE,
+ stderr=subprocess.PIPE)
+ (stdout, stderr) = Test.communicate ()
+ logging.info ('%s' % stdout)
+ logging.info ('%s' % stderr)
+ self.assertEqual(Test.returncode, 0)
+
+if __name__ == '__main__':
+ unittest.main()
=== added directory 'templates.kernel/test_cases/server-proposed'
=== added file 'templates.kernel/test_cases/server-proposed/preseed'
--- templates.kernel/test_cases/server-proposed/preseed 1970-01-01 00:00:00 +0000
+++ templates.kernel/test_cases/server-proposed/preseed 2011-07-19 15:44:32 +0000
@@ -0,0 +1,56 @@
+#
+# Copyright (C) 2010, Canonical Ltd (http://www.canonical.com/)
+#
+# This file is part of ubuntu-server-iso-testing.
+#
+# ubuntu-server-iso-testing is free software: you can redistribute it
+# and/or modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation, either version 3 of
+# the License, or (at your option) any later version.
+#
+# ubuntu-server-iso-testing is distributed in the hope that it will
+# be useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with ubuntu-server-iso-testing. If not, see
+# <http://www.gnu.org/licenses/>.
+#
+
+{% extends "base" %}
+
+{% block kernel_flavor %}
+d-i base-installer/kernel/override-image string linux-generic
+{% endblock %}
+
+{% block pkgsel_first %}
+d-i pkgsel/include string openssh-server python-couchdb subunit python-subunit python-junitxml ltp build-essential
+d-i pkgsel/update-policy select No automatic updates
+{% endblock %}
+
+{% block d_i_answers %}
+postfix postfix/mailname string {{ hostname }}
+postfix postfix/tlsmgr_upgrade_warning boolean
+postfix postfix/recipient_delim string +
+postfix postfix/main_mailer_type select Internet Site
+postfix postfix/retry_upgrade_warning boolean
+# Install postfix despite an unsupported kernel?
+postfix postfix/kernel_version_warning boolean
+postfix postfix/relayhost string
+postfix postfix/procmail boolean false
+postfix postfix/bad_recipient_delimiter error
+postfix postfix/chattr boolean false
+postfix postfix/root_address string
+postfix postfix/rfc1035_violation boolean false
+postfix postfix/mydomain_warning boolean
+postfix postfix/mynetworks string 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128
+postfix postfix/destinations string {{ hostname }}, localhost.localdomain, localhost
+postfix postfix/not_configured error
+postfix postfix/mailbox_limit string 0
+postfix postfix/protocols select all
+{% endblock %}
+
+{% block additional_repositories %}
+d-i apt-setup/proposed boolean true
+{% endblock %}
=== added file 'templates.kernel/test_cases/server-proposed/test'
--- templates.kernel/test_cases/server-proposed/test 1970-01-01 00:00:00 +0000
+++ templates.kernel/test_cases/server-proposed/test 2011-07-19 15:44:32 +0000
@@ -0,0 +1,29 @@
+#!/usr/bin/python
+
+import logging
+import unittest
+import subprocess
+import os
+
+logging.basicConfig(level=logging.DEBUG)
+
+class ltpTest(unittest.TestCase):
+
+ def testLTPlite(self):
+ # hack: at least for ltp-lite:
+ os.makedirs ('/usr/lib/ltp/results/')
+ os.makedirs ('/usr/lib/ltp/tools/pan')
+ os.symlink ('/usr/lib/ltp/tools/ltp-pan', '/usr/lib/ltp/tools/pan/ltp-pan')
+ # end hack
+ logging.debug ('running /usr/lib/ltp/tools/runltp -f ltplite')
+ Test = subprocess.Popen (['/usr/lib/ltp/tools/runltp',
+ '-f ltplite'],
+ stdout=subprocess.PIPE,
+ stderr=subprocess.PIPE)
+ (stdout, stderr) = Test.communicate ()
+ logging.info ('%s' % stdout)
+ logging.info ('%s' % stderr)
+ self.assertEqual(Test.returncode, 0)
+
+if __name__ == '__main__':
+ unittest.main()
=== added directory 'templates.kernel/test_cases/virtual-proposed'
=== added file 'templates.kernel/test_cases/virtual-proposed/preseed'
--- templates.kernel/test_cases/virtual-proposed/preseed 1970-01-01 00:00:00 +0000
+++ templates.kernel/test_cases/virtual-proposed/preseed 2011-07-19 15:44:32 +0000
@@ -0,0 +1,56 @@
+#
+# Copyright (C) 2010, Canonical Ltd (http://www.canonical.com/)
+#
+# This file is part of ubuntu-server-iso-testing.
+#
+# ubuntu-server-iso-testing is free software: you can redistribute it
+# and/or modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation, either version 3 of
+# the License, or (at your option) any later version.
+#
+# ubuntu-server-iso-testing is distributed in the hope that it will
+# be useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with ubuntu-server-iso-testing. If not, see
+# <http://www.gnu.org/licenses/>.
+#
+
+{% extends "base" %}
+
+{% block kernel_flavor %}
+d-i base-installer/kernel/override-image string linux-generic
+{% endblock %}
+
+{% block pkgsel_first %}
+d-i pkgsel/include string openssh-server python-couchdb subunit python-subunit python-junitxml ltp build-essential
+d-i pkgsel/update-policy select No automatic updates
+{% endblock %}
+
+{% block d_i_answers %}
+postfix postfix/mailname string {{ hostname }}
+postfix postfix/tlsmgr_upgrade_warning boolean
+postfix postfix/recipient_delim string +
+postfix postfix/main_mailer_type select Internet Site
+postfix postfix/retry_upgrade_warning boolean
+# Install postfix despite an unsupported kernel?
+postfix postfix/kernel_version_warning boolean
+postfix postfix/relayhost string
+postfix postfix/procmail boolean false
+postfix postfix/bad_recipient_delimiter error
+postfix postfix/chattr boolean false
+postfix postfix/root_address string
+postfix postfix/rfc1035_violation boolean false
+postfix postfix/mydomain_warning boolean
+postfix postfix/mynetworks string 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128
+postfix postfix/destinations string {{ hostname }}, localhost.localdomain, localhost
+postfix postfix/not_configured error
+postfix postfix/mailbox_limit string 0
+postfix postfix/protocols select all
+{% endblock %}
+
+{% block additional_repositories %}
+d-i apt-setup/proposed boolean true
+{% endblock %}
=== added file 'templates.kernel/test_cases/virtual-proposed/test'
--- templates.kernel/test_cases/virtual-proposed/test 1970-01-01 00:00:00 +0000
+++ templates.kernel/test_cases/virtual-proposed/test 2011-07-19 15:44:32 +0000
@@ -0,0 +1,29 @@
+#!/usr/bin/python
+
+import logging
+import unittest
+import subprocess
+import os
+
+logging.basicConfig(level=logging.DEBUG)
+
+class ltpTest(unittest.TestCase):
+
+ def testLTPlite(self):
+ # hack: at least for ltp-lite:
+ os.makedirs ('/usr/lib/ltp/results/')
+ os.makedirs ('/usr/lib/ltp/tools/pan')
+ os.symlink ('/usr/lib/ltp/tools/ltp-pan', '/usr/lib/ltp/tools/pan/ltp-pan')
+ # end hack
+ logging.debug ('running /usr/lib/ltp/tools/runltp -f ltplite')
+ Test = subprocess.Popen (['/usr/lib/ltp/tools/runltp',
+ '-f ltplite'],
+ stdout=subprocess.PIPE,
+ stderr=subprocess.PIPE)
+ (stdout, stderr) = Test.communicate ()
+ logging.info ('%s' % stdout)
+ logging.info ('%s' % stderr)
+ self.assertEqual(Test.returncode, 0)
+
+if __name__ == '__main__':
+ unittest.main()
Follow ups