ubuntu-server-iso-testing

Merge lp:~patrickmwright/ubuntu-server-iso-testing/dl-lucid into lp:ubuntu-server-iso-testing

  1. dl-lucid
  2. Merge into trunk
Proposed by Patrick Wright
Status: Merged
Merged at revision: 226
Proposed branch: lp:~patrickmwright/ubuntu-server-iso-testing/dl-lucid
Merge into: lp:ubuntu-server-iso-testing
Diff against target: 325 lines (+264/-0)
8 files modified
download-latest-test-iso.py (+6/-0)
templates.kernel/preseeds-common/base (+3/-0)
templates.kernel/test_cases/generic-proposed/preseed (+56/-0)
templates.kernel/test_cases/generic-proposed/test (+29/-0)
templates.kernel/test_cases/server-proposed/preseed (+56/-0)
templates.kernel/test_cases/server-proposed/test (+29/-0)
templates.kernel/test_cases/virtual-proposed/preseed (+56/-0)
templates.kernel/test_cases/virtual-proposed/test (+29/-0)
To merge this branch: bzr merge lp:~patrickmwright/ubuntu-server-iso-testing/dl-lucid
Reviewer Review Type Date Requested Status
Ubuntu Server Iso Testing Developers Pending
Review via email: mp+68479@code.launchpad.net

Description of the change

Needed to account for Lucid cdimages url path

see link the best view of the changes:

http://bazaar.launchpad.net/~patrickmwright/ubuntu-server-iso-testing/dl-lucid/revision/225?remember=223&compare_revid=223

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'download-latest-test-iso.py'
--- download-latest-test-iso.py 2011-06-21 12:19:18 +0000
+++ download-latest-test-iso.py 2011-07-19 22:39:30 +0000
@@ -104,6 +104,8 @@
104 dest='no_act', help='compute everything but don\'t actually download')104 dest='no_act', help='compute everything but don\'t actually download')
105parser.add_option('-u', '--url', dest="base_url", default=BASE_URL, 105parser.add_option('-u', '--url', dest="base_url", default=BASE_URL,
106 help="Base URL for cdimage retrieval website (default=%s)" % BASE_URL)106 help="Base URL for cdimage retrieval website (default=%s)" % BASE_URL)
107parser.add_option('-c', '--custom-url', dest="custom_url", default=False,
108 help="Full URL for cdimage retrieval website")
107109
108(options, args) = parser.parse_args()110(options, args) = parser.parse_args()
109111
@@ -127,6 +129,10 @@
127elif options.variant == 'alternate':129elif options.variant == 'alternate':
128 l_url = ALTERNATE_URL130 l_url = ALTERNATE_URL
129131
132# override url setting if custom url is provided
133if options.custom_url:
134 l_url = options.custom_url
135
130# Check options for architectures136# Check options for architectures
131l_archs = []137l_archs = []
132if options.arch == 'all':138if options.arch == 'all':
133139
=== 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 22:39:30 +0000
@@ -152,6 +152,9 @@
152# add a hostname to use a different server than security.ubuntu.com.152# add a hostname to use a different server than security.ubuntu.com.
153d-i apt-setup/security_host string153d-i apt-setup/security_host string
154154
155{% block additional_repositories %}
156{% endblock %}
157
155# Additional repositories, local[0-9] available158# Additional repositories, local[0-9] available
156#d-i apt-setup/local0/repository string http://server/localrep/ ./159#d-i apt-setup/local0/repository string http://server/localrep/ ./
157#d-i apt-setup/local0/comment string Comment160#d-i apt-setup/local0/comment string Comment
158161
=== 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 22:39:30 +0000
@@ -0,0 +1,56 @@
1#
2# Copyright (C) 2010, Canonical Ltd (http://www.canonical.com/)
3#
4# This file is part of ubuntu-server-iso-testing.
5#
6# ubuntu-server-iso-testing is free software: you can redistribute it
7# and/or modify it under the terms of the GNU General Public License
8# as published by the Free Software Foundation, either version 3 of
9# the License, or (at your option) any later version.
10#
11# ubuntu-server-iso-testing is distributed in the hope that it will
12# be useful, but WITHOUT ANY WARRANTY; without even the implied warranty
13# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with ubuntu-server-iso-testing. If not, see
18# <http://www.gnu.org/licenses/>.
19#
20
21{% extends "base" %}
22
23{% block kernel_flavor %}
24d-i base-installer/kernel/override-image string linux-generic
25{% endblock %}
26
27{% block pkgsel_first %}
28d-i pkgsel/include string openssh-server python-couchdb subunit python-subunit python-junitxml ltp build-essential
29d-i pkgsel/update-policy select No automatic updates
30{% endblock %}
31
32{% block d_i_answers %}
33postfix postfix/mailname string {{ hostname }}
34postfix postfix/tlsmgr_upgrade_warning boolean
35postfix postfix/recipient_delim string +
36postfix postfix/main_mailer_type select Internet Site
37postfix postfix/retry_upgrade_warning boolean
38# Install postfix despite an unsupported kernel?
39postfix postfix/kernel_version_warning boolean
40postfix postfix/relayhost string
41postfix postfix/procmail boolean false
42postfix postfix/bad_recipient_delimiter error
43postfix postfix/chattr boolean false
44postfix postfix/root_address string
45postfix postfix/rfc1035_violation boolean false
46postfix postfix/mydomain_warning boolean
47postfix postfix/mynetworks string 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128
48postfix postfix/destinations string {{ hostname }}, localhost.localdomain, localhost
49postfix postfix/not_configured error
50postfix postfix/mailbox_limit string 0
51postfix postfix/protocols select all
52{% endblock %}
53
54{% block additional_repositories %}
55d-i apt-setup/proposed boolean true
56{% endblock %}
057
=== 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 22:39:30 +0000
@@ -0,0 +1,29 @@
1#!/usr/bin/python
2
3import logging
4import unittest
5import subprocess
6import os
7
8logging.basicConfig(level=logging.DEBUG)
9
10class ltpTest(unittest.TestCase):
11
12 def testLTPlite(self):
13 # hack: at least for ltp-lite:
14 os.makedirs ('/usr/lib/ltp/results/')
15 os.makedirs ('/usr/lib/ltp/tools/pan')
16 os.symlink ('/usr/lib/ltp/tools/ltp-pan', '/usr/lib/ltp/tools/pan/ltp-pan')
17 # end hack
18 logging.debug ('running /usr/lib/ltp/tools/runltp -f ltplite')
19 Test = subprocess.Popen (['/usr/lib/ltp/tools/runltp',
20 '-f ltplite'],
21 stdout=subprocess.PIPE,
22 stderr=subprocess.PIPE)
23 (stdout, stderr) = Test.communicate ()
24 logging.info ('%s' % stdout)
25 logging.info ('%s' % stderr)
26 self.assertEqual(Test.returncode, 0)
27
28if __name__ == '__main__':
29 unittest.main()
030
=== 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 22:39:30 +0000
@@ -0,0 +1,56 @@
1#
2# Copyright (C) 2010, Canonical Ltd (http://www.canonical.com/)
3#
4# This file is part of ubuntu-server-iso-testing.
5#
6# ubuntu-server-iso-testing is free software: you can redistribute it
7# and/or modify it under the terms of the GNU General Public License
8# as published by the Free Software Foundation, either version 3 of
9# the License, or (at your option) any later version.
10#
11# ubuntu-server-iso-testing is distributed in the hope that it will
12# be useful, but WITHOUT ANY WARRANTY; without even the implied warranty
13# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with ubuntu-server-iso-testing. If not, see
18# <http://www.gnu.org/licenses/>.
19#
20
21{% extends "base" %}
22
23{% block kernel_flavor %}
24d-i base-installer/kernel/override-image string linux-generic
25{% endblock %}
26
27{% block pkgsel_first %}
28d-i pkgsel/include string openssh-server python-couchdb subunit python-subunit python-junitxml ltp build-essential
29d-i pkgsel/update-policy select No automatic updates
30{% endblock %}
31
32{% block d_i_answers %}
33postfix postfix/mailname string {{ hostname }}
34postfix postfix/tlsmgr_upgrade_warning boolean
35postfix postfix/recipient_delim string +
36postfix postfix/main_mailer_type select Internet Site
37postfix postfix/retry_upgrade_warning boolean
38# Install postfix despite an unsupported kernel?
39postfix postfix/kernel_version_warning boolean
40postfix postfix/relayhost string
41postfix postfix/procmail boolean false
42postfix postfix/bad_recipient_delimiter error
43postfix postfix/chattr boolean false
44postfix postfix/root_address string
45postfix postfix/rfc1035_violation boolean false
46postfix postfix/mydomain_warning boolean
47postfix postfix/mynetworks string 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128
48postfix postfix/destinations string {{ hostname }}, localhost.localdomain, localhost
49postfix postfix/not_configured error
50postfix postfix/mailbox_limit string 0
51postfix postfix/protocols select all
52{% endblock %}
53
54{% block additional_repositories %}
55d-i apt-setup/proposed boolean true
56{% endblock %}
057
=== 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 22:39:30 +0000
@@ -0,0 +1,29 @@
1#!/usr/bin/python
2
3import logging
4import unittest
5import subprocess
6import os
7
8logging.basicConfig(level=logging.DEBUG)
9
10class ltpTest(unittest.TestCase):
11
12 def testLTPlite(self):
13 # hack: at least for ltp-lite:
14 os.makedirs ('/usr/lib/ltp/results/')
15 os.makedirs ('/usr/lib/ltp/tools/pan')
16 os.symlink ('/usr/lib/ltp/tools/ltp-pan', '/usr/lib/ltp/tools/pan/ltp-pan')
17 # end hack
18 logging.debug ('running /usr/lib/ltp/tools/runltp -f ltplite')
19 Test = subprocess.Popen (['/usr/lib/ltp/tools/runltp',
20 '-f ltplite'],
21 stdout=subprocess.PIPE,
22 stderr=subprocess.PIPE)
23 (stdout, stderr) = Test.communicate ()
24 logging.info ('%s' % stdout)
25 logging.info ('%s' % stderr)
26 self.assertEqual(Test.returncode, 0)
27
28if __name__ == '__main__':
29 unittest.main()
030
=== 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 22:39:30 +0000
@@ -0,0 +1,56 @@
1#
2# Copyright (C) 2010, Canonical Ltd (http://www.canonical.com/)
3#
4# This file is part of ubuntu-server-iso-testing.
5#
6# ubuntu-server-iso-testing is free software: you can redistribute it
7# and/or modify it under the terms of the GNU General Public License
8# as published by the Free Software Foundation, either version 3 of
9# the License, or (at your option) any later version.
10#
11# ubuntu-server-iso-testing is distributed in the hope that it will
12# be useful, but WITHOUT ANY WARRANTY; without even the implied warranty
13# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with ubuntu-server-iso-testing. If not, see
18# <http://www.gnu.org/licenses/>.
19#
20
21{% extends "base" %}
22
23{% block kernel_flavor %}
24d-i base-installer/kernel/override-image string linux-generic
25{% endblock %}
26
27{% block pkgsel_first %}
28d-i pkgsel/include string openssh-server python-couchdb subunit python-subunit python-junitxml ltp build-essential
29d-i pkgsel/update-policy select No automatic updates
30{% endblock %}
31
32{% block d_i_answers %}
33postfix postfix/mailname string {{ hostname }}
34postfix postfix/tlsmgr_upgrade_warning boolean
35postfix postfix/recipient_delim string +
36postfix postfix/main_mailer_type select Internet Site
37postfix postfix/retry_upgrade_warning boolean
38# Install postfix despite an unsupported kernel?
39postfix postfix/kernel_version_warning boolean
40postfix postfix/relayhost string
41postfix postfix/procmail boolean false
42postfix postfix/bad_recipient_delimiter error
43postfix postfix/chattr boolean false
44postfix postfix/root_address string
45postfix postfix/rfc1035_violation boolean false
46postfix postfix/mydomain_warning boolean
47postfix postfix/mynetworks string 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128
48postfix postfix/destinations string {{ hostname }}, localhost.localdomain, localhost
49postfix postfix/not_configured error
50postfix postfix/mailbox_limit string 0
51postfix postfix/protocols select all
52{% endblock %}
53
54{% block additional_repositories %}
55d-i apt-setup/proposed boolean true
56{% endblock %}
057
=== 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 22:39:30 +0000
@@ -0,0 +1,29 @@
1#!/usr/bin/python
2
3import logging
4import unittest
5import subprocess
6import os
7
8logging.basicConfig(level=logging.DEBUG)
9
10class ltpTest(unittest.TestCase):
11
12 def testLTPlite(self):
13 # hack: at least for ltp-lite:
14 os.makedirs ('/usr/lib/ltp/results/')
15 os.makedirs ('/usr/lib/ltp/tools/pan')
16 os.symlink ('/usr/lib/ltp/tools/ltp-pan', '/usr/lib/ltp/tools/pan/ltp-pan')
17 # end hack
18 logging.debug ('running /usr/lib/ltp/tools/runltp -f ltplite')
19 Test = subprocess.Popen (['/usr/lib/ltp/tools/runltp',
20 '-f ltplite'],
21 stdout=subprocess.PIPE,
22 stderr=subprocess.PIPE)
23 (stdout, stderr) = Test.communicate ()
24 logging.info ('%s' % stdout)
25 logging.info ('%s' % stderr)
26 self.assertEqual(Test.returncode, 0)
27
28if __name__ == '__main__':
29 unittest.main()

Subscribers

People subscribed via source and target branches