Merge into trunk : lp1240972 : Code : MAAS

Status:

Superseded

Proposed branch:

lp:~andreserl/maas/lp1240972

Merge into:

lp:~maas-committers/maas/trunk

Diff against target:

13 lines (+0/-2)

1 file modified

etc/maas/templates/dhcp/dhcpd.conf.template (+0/-2)

To merge this branch:

bzr merge lp:~andreserl/maas/lp1240972

Low

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Julian Edwards (community)		2013-10-17	Approve on 2013-10-17
Review via email: mp+191714@code.launchpad.net

This proposal has been superseded by a proposal from 2013-10-29.

Commit message

No longer add ignore-client-uids on raring+ because versions of MAAS backported to precise via the CA also include newer version of isc-dhcp that supports this option

Revision history for this message

Julian Edwards (julian-edwards) wrote on 2013-10-17:

#

By doing this, we are saying that you can no longer run trunk on precise unless you are using the cloud archive. I'm fine with that, but are you?

review: Approve

Revision history for this message

MAAS Lander (maas-lander) wrote on 2013-10-24:

#

Download full text (15.2 KiB)

The attempt to merge lp:~andreserl/maas/lp1240972 into lp:maas failed. Below is the output from the failed tests.

Ign http://security.ubuntu.com saucy-security InRelease
Hit http://security.ubuntu.com saucy-security Release.gpg
Hit http://security.ubuntu.com saucy-security Release
Ign http://nova.clouds.archive.ubuntu.com saucy InRelease
Ign http://nova.clouds.archive.ubuntu.com saucy-updates InRelease
Hit http://nova.clouds.archive.ubuntu.com saucy Release.gpg
Get:1 http://nova.clouds.archive.ubuntu.com saucy-updates Release.gpg [933 B]
Hit http://nova.clouds.archive.ubuntu.com saucy Release
Get:2 http://nova.clouds.archive.ubuntu.com saucy-updates Release [49.6 kB]
Hit http://security.ubuntu.com saucy-security/main Sources
Hit http://security.ubuntu.com saucy-security/universe Sources
Hit http://security.ubuntu.com saucy-security/main amd64 Packages
Hit http://security.ubuntu.com saucy-security/universe amd64 Packages
Hit http://security.ubuntu.com saucy-security/main Translation-en
Hit http://security.ubuntu.com saucy-security/universe Translation-en
Hit http://nova.clouds.archive.ubuntu.com saucy/main Sources
Hit http://nova.clouds.archive.ubuntu.com saucy/universe Sources
Hit http://nova.clouds.archive.ubuntu.com saucy/main amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com saucy/universe amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com saucy/main Translation-en
Ign http://security.ubuntu.com saucy-security/main Translation-en_US
Hit http://nova.clouds.archive.ubuntu.com saucy/universe Translation-en
Ign http://security.ubuntu.com saucy-security/universe Translation-en_US
Get:3 http://nova.clouds.archive.ubuntu.com saucy-updates/main Sources [4,466 B]
Get:4 http://nova.clouds.archive.ubuntu.com saucy-updates/universe Sources [14 B]
Get:5 http://nova.clouds.archive.ubuntu.com saucy-updates/main amd64 Packages [6,499 B]
Get:6 http://nova.clouds.archive.ubuntu.com saucy-updates/universe amd64 Packages [1,621 B]
Hit http://nova.clouds.archive.ubuntu.com saucy-updates/main Translation-en
Hit http://nova.clouds.archive.ubuntu.com saucy-updates/universe Translation-en
Ign http://nova.clouds.archive.ubuntu.com saucy/main Translation-en_US
Ign http://nova.clouds.archive.ubuntu.com saucy/universe Translation-en_US
Ign http://nova.clouds.archive.ubuntu.com saucy-updates/main Translation-en_US
Ign http://nova.clouds.archive.ubuntu.com saucy-updates/universe Translation-en_US
Fetched 63.1 kB in 0s (384 kB/s)
Reading package lists...
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
--no-install-recommends install apache2 avahi-daemon avahi-utils bind9 bind9utils build-essential curl daemontools distro-info dnsutils firefox freeipmi-tools ipython isc-dhcp-common libjs-raphael libjs-yui3-full libjs-yui3-min libpq-dev make postgresql-9.1 python-amqplib python-avahi python-bzrlib python-celery python-convoy python-cssselect python-curtin python-dbus python-dev python-distro-info python-django python-django-piston python-django-south python-djorm-ext-pgarray python-docutils python-formencode python-httplib2 python-jinja2 python-lockfile python-lxml python-netaddr python-netifaces python-oauth python-oops python-oops-amqp python-oops-dat...

The attempt to merge lp:~andreserl/maas/lp1240972 into lp:maas failed. Below is the output from the failed tests.

Ign http://security.ubuntu.com saucy-security InRelease
Hit http://security.ubuntu.com saucy-security Release.gpg
Hit http://security.ubuntu.com saucy-security Release
Ign http://nova.clouds.archive.ubuntu.com saucy InRelease
Ign http://nova.clouds.archive.ubuntu.com saucy-updates InRelease
Hit http://nova.clouds.archive.ubuntu.com saucy Release.gpg
Get:1 http://nova.clouds.archive.ubuntu.com saucy-updates Release.gpg [933 B]
Hit http://nova.clouds.archive.ubuntu.com saucy Release
Get:2 http://nova.clouds.archive.ubuntu.com saucy-updates Release [49.6 kB]
Hit http://security.ubuntu.com saucy-security/main Sources
Hit http://security.ubuntu.com saucy-security/universe Sources
Hit http://security.ubuntu.com saucy-security/main amd64 Packages
Hit http://security.ubuntu.com saucy-security/universe amd64 Packages
Hit http://security.ubuntu.com saucy-security/main Translation-en
Hit http://security.ubuntu.com saucy-security/universe Translation-en
Hit http://nova.clouds.archive.ubuntu.com saucy/main Sources
Hit http://nova.clouds.archive.ubuntu.com saucy/universe Sources
Hit http://nova.clouds.archive.ubuntu.com saucy/main amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com saucy/universe amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com saucy/main Translation-en
Ign http://security.ubuntu.com saucy-security/main Translation-en_US
Hit http://nova.clouds.archive.ubuntu.com saucy/universe Translation-en
Ign http://security.ubuntu.com saucy-security/universe Translation-en_US
Get:3 http://nova.clouds.archive.ubuntu.com saucy-updates/main Sources [4,466 B]
Get:4 http://nova.clouds.archive.ubuntu.com saucy-updates/universe Sources [14 B]
Get:5 http://nova.clouds.archive.ubuntu.com saucy-updates/main amd64 Packages [6,499 B]
Get:6 http://nova.clouds.archive.ubuntu.com saucy-updates/universe amd64 Packages [1,621 B]
Hit http://nova.clouds.archive.ubuntu.com saucy-updates/main Translation-en
Hit http://nova.clouds.archive.ubuntu.com saucy-updates/universe Translation-en
Ign http://nova.clouds.archive.ubuntu.com saucy/main Translation-en_US
Ign http://nova.clouds.archive.ubuntu.com saucy/universe Translation-en_US
Ign http://nova.clouds.archive.ubuntu.com saucy-updates/main Translation-en_US
Ign http://nova.clouds.archive.ubuntu.com saucy-updates/universe Translation-en_US
Fetched 63.1 kB in 0s (384 kB/s)
Reading package lists...
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
	    --no-install-recommends install apache2 avahi-daemon avahi-utils bind9 bind9utils build-essential curl daemontools distro-info dnsutils firefox freeipmi-tools ipython isc-dhcp-common libjs-raphael libjs-yui3-full libjs-yui3-min libpq-dev make postgresql-9.1 python-amqplib python-avahi python-bzrlib python-celery python-convoy python-cssselect python-curtin python-dbus python-dev python-distro-info python-django python-django-piston python-django-south python-djorm-ext-pgarray python-docutils python-formencode python-httplib2 python-jinja2 python-lockfile python-lxml python-netaddr python-netifaces python-oauth python-oops python-oops-amqp python-oops-datedir-repo python-oops-twisted python-oops-wsgi python-pip python-pocket-lint python-psycopg2 python-pyinotify python-simplestreams python-sphinx python-tempita python-twisted python-txamqp python-txlongpoll python-virtualenv python-yaml rabbitmq-server syslinux-common tgt ubuntu-cloudimage-keyring wget xvfb
Reading package lists...
Building dependency tree...
Reading state information...
apache2 is already the newest version.
avahi-daemon is already the newest version.
avahi-utils is already the newest version.
bind9 is already the newest version.
bind9utils is already the newest version.
build-essential is already the newest version.
curl is already the newest version.
distro-info is already the newest version.
dnsutils is already the newest version.
firefox is already the newest version.
freeipmi-tools is already the newest version.
isc-dhcp-common is already the newest version.
libjs-raphael is already the newest version.
libjs-yui3-full is already the newest version.
libjs-yui3-min is already the newest version.
libpq-dev is already the newest version.
make is already the newest version.
postgresql-9.1 is already the newest version.
python-amqplib is already the newest version.
python-avahi is already the newest version.
python-bzrlib is already the newest version.
python-celery is already the newest version.
python-convoy is already the newest version.
python-curtin is already the newest version.
python-dbus is already the newest version.
python-dev is already the newest version.
python-distro-info is already the newest version.
python-django is already the newest version.
python-django-piston is already the newest version.
python-django-south is already the newest version.
python-djorm-ext-pgarray is already the newest version.
python-docutils is already the newest version.
python-formencode is already the newest version.
python-httplib2 is already the newest version.
python-jinja2 is already the newest version.
python-lockfile is already the newest version.
python-lxml is already the newest version.
python-netaddr is already the newest version.
python-netifaces is already the newest version.
python-oauth is already the newest version.
python-oops is already the newest version.
python-oops-amqp is already the newest version.
python-oops-datedir-repo is already the newest version.
python-oops-twisted is already the newest version.
python-oops-wsgi is already the newest version.
python-psycopg2 is already the newest version.
python-pyinotify is already the newest version.
python-simplestreams is already the newest version.
python-sphinx is already the newest version.
python-tempita is already the newest version.
python-twisted is already the newest version.
python-txamqp is already the newest version.
python-txlongpoll is already the newest version.
python-yaml is already the newest version.
rabbitmq-server is already the newest version.
syslinux-common is already the newest version.
tgt is already the newest version.
ubuntu-cloudimage-keyring is already the newest version.
wget is already the newest version.
xvfb is already the newest version.
daemontools is already the newest version.
ipython is already the newest version.
python-cssselect is already the newest version.
python-pip is already the newest version.
python-pocket-lint is already the newest version.
python-virtualenv is already the newest version.
0 upgraded, 0 newly installed, 0 to remove and 125 not upgraded.
make -C acceptance clean
make[1]: Entering directory `/home/ubuntu/maas/acceptance'
rm -f -r source build *.build *.changes *.deb
make[1]: Leaving directory `/home/ubuntu/maas/acceptance'
find . -type f -name '*.py[co]' -print0 | xargs -r0 rm -f
find . -type f -name '*~' -print0 | xargs -r0 rm -f
find . -type f -name dropin.cache -print0 | xargs -r0 rm -f
rm -f -r media/demo/* media/development
rm -f src/maasserver/static/js/enums.js
rm -f *.log
rm -f docs/api.rst
rm -f -r docs/_autosummary docs/_build
rm -f -r man/.doctrees
rm -f -r bin include lib local
rm -f -r eggs develop-eggs
rm -f -r build dist logs/* parts
rm -f tags TAGS .installed.cfg
rm -f -r *.egg *.egg-info src/*.egg-info
rm -f -r run/* services/*/supervise
virtualenv --python=python2.7 --system-site-packages /home/ubuntu/maas
New python executable in /home/ubuntu/maas/bin/python2.7
Also creating executable in /home/ubuntu/maas/bin/python
Installing Setuptools...................................................................................................................................................................................................................................done.
Installing Pip..........................................................................................................................................................................................................................................................................................................................................done.
Running virtualenv with interpreter /usr/bin/python2.7
bin/pip --quiet install --ignore-installed \
	    --no-dependencies bootstrap/zc.buildout-1.5.2.tar.gz
rm -f -f README.txt  # zc.buildout installs an annoying README.txt.
bin/buildout install database
Creating directory '/home/ubuntu/maas/parts'.
Creating directory '/home/ubuntu/maas/develop-eggs'.
Installing database.
Generated script '/home/ubuntu/maas/bin/database'.
bin/buildout install repl
Installing repl.
Generated script '/home/ubuntu/maas/bin/ipy'.
Generated interpreter '/home/ubuntu/maas/bin/py'.
bin/py -m src/maasserver/utils/jsenums src/maasserver/enum.py src/metadataserver/enum.py src/provisioningserver/enum.py > src/maasserver/static/js/enums.js
bin/buildout install maas
Installing maas.
Generated script '/home/ubuntu/maas/bin/maas'.
bin/buildout install maas-test
Installing maas-test.
Generated script '/home/ubuntu/maas/bin/test.maas'.
bin/buildout install maascli
Installing maascli.
Generated script '/home/ubuntu/maas/bin/maascli'.
bin/buildout install maascli-test
Installing maascli-test.
Generated script '/home/ubuntu/maas/bin/test.maascli'.
bin/buildout install maastesting-test
Installing maastesting-test.
Generated script '/home/ubuntu/maas/bin/test.maastesting'.
bin/buildout install pserv
Installing pserv.
Generated script '/home/ubuntu/maas/bin/celeryd'.
Generated script '/home/ubuntu/maas/bin/maas-provision'.
Generated script '/home/ubuntu/maas/bin/twistd.pserv'.
bin/buildout install pserv-test
Installing pserv-test.
Generated script '/home/ubuntu/maas/bin/test.pserv'.
bin/buildout install txlongpoll
Installing txlongpoll.
Generated script '/home/ubuntu/maas/bin/twistd.txlongpoll'.
make -C acceptance clean
make[1]: Entering directory `/home/ubuntu/maas/acceptance'
rm -f -r source build *.build *.changes *.deb
make[1]: Leaving directory `/home/ubuntu/maas/acceptance'
find . -type f -name '*.py[co]' -print0 | xargs -r0 rm -f
find . -type f -name '*~' -print0 | xargs -r0 rm -f
find . -type f -name dropin.cache -print0 | xargs -r0 rm -f
rm -f -r media/demo/* media/development
rm -f src/maasserver/static/js/enums.js
rm -f *.log
rm -f docs/api.rst
rm -f -r docs/_autosummary docs/_build
rm -f -r man/.doctrees
bin/py -m src/maasserver/utils/jsenums src/maasserver/enum.py src/metadataserver/enum.py src/provisioningserver/enum.py > src/maasserver/static/js/enums.js
bin/buildout install maas
Updating maas.
bin/buildout install maas-test
Updating maas-test.
echo bin/test.maas bin/test.maascli bin/test.maastesting bin/test.pserv | xargs -n1 env
nosetests --verbosity 1 --exclude=provisioningserver --exclude=maastesting --exclude=maascli
Creating test database for alias 'default'...
Destroying test database for alias 'default'...

.............................................S.......................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................S...........................................................................................................................................................................................................................................................................
----------------------------------------------------------------------
Ran 1777 tests in 279.879s

OK (SKIP=2)
....................................................................................
----------------------------------------------------------------------
Ran 84 tests in 1.405s

OK
.........................................................S.........................................................
----------------------------------------------------------------------
Ran 115 tests in 15.939s

OK (SKIP=1)
F............................................................................................................................................................................................................................................................................SSSS..............................................................................................................................................................................................................................................................................................................................................................................
======================================================================
FAIL: provisioningserver.dhcp.tests.test_config.TestDHCPConfig.test_config_does_contains_config_item_depending_on_release
----------------------------------------------------------------------
_StringException: Traceback (most recent call last):
  File "/home/ubuntu/maas/src/provisioningserver/dhcp/tests/test_config.py", line 131, in test_config_does_contains_config_item_depending_on_release
    self.assertNotIn('ignore-client-uids', config_file)
MismatchError: u'# WARNING: Do not edit /etc/maas/dhcpd.conf yourself.  MAAS will overwrite any\n# changes made there.\n#\n# Instead, edit /etc/maas/templates/dhcp/dhcpd.conf.template and your changes\n# will be present whenever MAAS rewrites the DHCP configuration.  Edit and save\n# the nodegroup\'s configuration in MAAS to trigger an update.\n\nsubnet 10.0.0.0 netmask 255.0.0.0 {\n       filename "pxelinux.0";\n       ignore-client-uids true;\n       option subnet-mask 255.0.0.0;\n       option broadcast-address 10.255.255.255;\n       option domain-name-servers 10.1.0.1 10.1.0.2;\n       option domain-name "example.com";\n       option routers 10.0.0.2;\n       range dynamic-bootp 10.0.0.3 10.0.0.254;\n       class "PXE" {\n          match if substring (option vendor-class-identifier, 0, 3) = "PXE";\n          default-lease-time 30;\n          max-lease-time 30;\n       }\n}\nomapi-port 7911;\nkey omapi_key {\n    algorithm HMAC-MD5;\n    secret "random";\n};\nomapi-key omapi_key;\n' matches Contains(u'ignore-client-uids')

----------------------------------------------------------------------
Ran 639 tests in 36.528s

FAILED (SKIP=4, failures=1)
make: *** [test] Error 123

Revision history for this message

Andres Rodriguez (andreserl) wrote on 2013-10-24:

#

uhmmm so it seems integration tests fail because of this... I think it would make sense to only make this change in the Ubuntu package rather than in trunk...

Revision history for this message

Julian Edwards (julian-edwards) wrote on 2013-10-24:

#

On Thursday 24 Oct 2013 15:25:26 you wrote:
> uhmmm so it seems integration tests fail because of this... I think it would
> make sense to only make this change in the Ubuntu package rather than in
> trunk...

NO NO NO! Please just remove the test, we don't need it any more.

Revision history for this message

Andres Rodriguez (andreserl) wrote on 2013-10-24:

#

Does the integration tests use the version of isc-dhcp with ignore-client-uids? I think we would need to make that happen first!

Revision history for this message

MAAS Lander (maas-lander) wrote on 2013-10-24:

#

Download full text (15.2 KiB)

The attempt to merge lp:~andreserl/maas/lp1240972 into lp:maas failed. Below is the output from the failed tests.

Ign http://security.ubuntu.com saucy-security InRelease
Hit http://security.ubuntu.com saucy-security Release.gpg
Hit http://security.ubuntu.com saucy-security Release
Ign http://nova.clouds.archive.ubuntu.com saucy InRelease
Ign http://nova.clouds.archive.ubuntu.com saucy-updates InRelease
Hit http://nova.clouds.archive.ubuntu.com saucy Release.gpg
Get:1 http://nova.clouds.archive.ubuntu.com saucy-updates Release.gpg [933 B]
Hit http://nova.clouds.archive.ubuntu.com saucy Release
Get:2 http://nova.clouds.archive.ubuntu.com saucy-updates Release [49.6 kB]
Hit http://security.ubuntu.com saucy-security/main Sources
Hit http://security.ubuntu.com saucy-security/universe Sources
Hit http://security.ubuntu.com saucy-security/main amd64 Packages
Hit http://security.ubuntu.com saucy-security/universe amd64 Packages
Hit http://security.ubuntu.com saucy-security/main Translation-en
Hit http://security.ubuntu.com saucy-security/universe Translation-en
Hit http://nova.clouds.archive.ubuntu.com saucy/main Sources
Hit http://nova.clouds.archive.ubuntu.com saucy/universe Sources
Hit http://nova.clouds.archive.ubuntu.com saucy/main amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com saucy/universe amd64 Packages
Ign http://security.ubuntu.com saucy-security/main Translation-en_US
Hit http://nova.clouds.archive.ubuntu.com saucy/main Translation-en
Hit http://nova.clouds.archive.ubuntu.com saucy/universe Translation-en
Ign http://security.ubuntu.com saucy-security/universe Translation-en_US
Get:3 http://nova.clouds.archive.ubuntu.com saucy-updates/main Sources [4,466 B]
Get:4 http://nova.clouds.archive.ubuntu.com saucy-updates/universe Sources [14 B]
Get:5 http://nova.clouds.archive.ubuntu.com saucy-updates/main amd64 Packages [6,499 B]
Get:6 http://nova.clouds.archive.ubuntu.com saucy-updates/universe amd64 Packages [1,621 B]
Hit http://nova.clouds.archive.ubuntu.com saucy-updates/main Translation-en
Hit http://nova.clouds.archive.ubuntu.com saucy-updates/universe Translation-en
Ign http://nova.clouds.archive.ubuntu.com saucy/main Translation-en_US
Ign http://nova.clouds.archive.ubuntu.com saucy/universe Translation-en_US
Ign http://nova.clouds.archive.ubuntu.com saucy-updates/main Translation-en_US
Ign http://nova.clouds.archive.ubuntu.com saucy-updates/universe Translation-en_US
Fetched 63.1 kB in 0s (390 kB/s)
Reading package lists...
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
--no-install-recommends install apache2 avahi-daemon avahi-utils bind9 bind9utils build-essential curl daemontools distro-info dnsutils firefox freeipmi-tools ipython isc-dhcp-common libjs-raphael libjs-yui3-full libjs-yui3-min libpq-dev make postgresql-9.1 python-amqplib python-avahi python-bzrlib python-celery python-convoy python-cssselect python-curtin python-dbus python-dev python-distro-info python-django python-django-piston python-django-south python-djorm-ext-pgarray python-docutils python-formencode python-httplib2 python-jinja2 python-lockfile python-lxml python-netaddr python-netifaces python-oauth python-oops python-oops-amqp python-oops-dat...

The attempt to merge lp:~andreserl/maas/lp1240972 into lp:maas failed. Below is the output from the failed tests.

Ign http://security.ubuntu.com saucy-security InRelease
Hit http://security.ubuntu.com saucy-security Release.gpg
Hit http://security.ubuntu.com saucy-security Release
Ign http://nova.clouds.archive.ubuntu.com saucy InRelease
Ign http://nova.clouds.archive.ubuntu.com saucy-updates InRelease
Hit http://nova.clouds.archive.ubuntu.com saucy Release.gpg
Get:1 http://nova.clouds.archive.ubuntu.com saucy-updates Release.gpg [933 B]
Hit http://nova.clouds.archive.ubuntu.com saucy Release
Get:2 http://nova.clouds.archive.ubuntu.com saucy-updates Release [49.6 kB]
Hit http://security.ubuntu.com saucy-security/main Sources
Hit http://security.ubuntu.com saucy-security/universe Sources
Hit http://security.ubuntu.com saucy-security/main amd64 Packages
Hit http://security.ubuntu.com saucy-security/universe amd64 Packages
Hit http://security.ubuntu.com saucy-security/main Translation-en
Hit http://security.ubuntu.com saucy-security/universe Translation-en
Hit http://nova.clouds.archive.ubuntu.com saucy/main Sources
Hit http://nova.clouds.archive.ubuntu.com saucy/universe Sources
Hit http://nova.clouds.archive.ubuntu.com saucy/main amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com saucy/universe amd64 Packages
Ign http://security.ubuntu.com saucy-security/main Translation-en_US
Hit http://nova.clouds.archive.ubuntu.com saucy/main Translation-en
Hit http://nova.clouds.archive.ubuntu.com saucy/universe Translation-en
Ign http://security.ubuntu.com saucy-security/universe Translation-en_US
Get:3 http://nova.clouds.archive.ubuntu.com saucy-updates/main Sources [4,466 B]
Get:4 http://nova.clouds.archive.ubuntu.com saucy-updates/universe Sources [14 B]
Get:5 http://nova.clouds.archive.ubuntu.com saucy-updates/main amd64 Packages [6,499 B]
Get:6 http://nova.clouds.archive.ubuntu.com saucy-updates/universe amd64 Packages [1,621 B]
Hit http://nova.clouds.archive.ubuntu.com saucy-updates/main Translation-en
Hit http://nova.clouds.archive.ubuntu.com saucy-updates/universe Translation-en
Ign http://nova.clouds.archive.ubuntu.com saucy/main Translation-en_US
Ign http://nova.clouds.archive.ubuntu.com saucy/universe Translation-en_US
Ign http://nova.clouds.archive.ubuntu.com saucy-updates/main Translation-en_US
Ign http://nova.clouds.archive.ubuntu.com saucy-updates/universe Translation-en_US
Fetched 63.1 kB in 0s (390 kB/s)
Reading package lists...
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
	    --no-install-recommends install apache2 avahi-daemon avahi-utils bind9 bind9utils build-essential curl daemontools distro-info dnsutils firefox freeipmi-tools ipython isc-dhcp-common libjs-raphael libjs-yui3-full libjs-yui3-min libpq-dev make postgresql-9.1 python-amqplib python-avahi python-bzrlib python-celery python-convoy python-cssselect python-curtin python-dbus python-dev python-distro-info python-django python-django-piston python-django-south python-djorm-ext-pgarray python-docutils python-formencode python-httplib2 python-jinja2 python-lockfile python-lxml python-netaddr python-netifaces python-oauth python-oops python-oops-amqp python-oops-datedir-repo python-oops-twisted python-oops-wsgi python-pip python-pocket-lint python-psycopg2 python-pyinotify python-simplestreams python-sphinx python-tempita python-twisted python-txamqp python-txlongpoll python-virtualenv python-yaml rabbitmq-server syslinux-common tgt ubuntu-cloudimage-keyring wget xvfb
Reading package lists...
Building dependency tree...
Reading state information...
apache2 is already the newest version.
avahi-daemon is already the newest version.
avahi-utils is already the newest version.
bind9 is already the newest version.
bind9utils is already the newest version.
build-essential is already the newest version.
curl is already the newest version.
distro-info is already the newest version.
dnsutils is already the newest version.
firefox is already the newest version.
freeipmi-tools is already the newest version.
isc-dhcp-common is already the newest version.
libjs-raphael is already the newest version.
libjs-yui3-full is already the newest version.
libjs-yui3-min is already the newest version.
libpq-dev is already the newest version.
make is already the newest version.
postgresql-9.1 is already the newest version.
python-amqplib is already the newest version.
python-avahi is already the newest version.
python-bzrlib is already the newest version.
python-celery is already the newest version.
python-convoy is already the newest version.
python-curtin is already the newest version.
python-dbus is already the newest version.
python-dev is already the newest version.
python-distro-info is already the newest version.
python-django is already the newest version.
python-django-piston is already the newest version.
python-django-south is already the newest version.
python-djorm-ext-pgarray is already the newest version.
python-docutils is already the newest version.
python-formencode is already the newest version.
python-httplib2 is already the newest version.
python-jinja2 is already the newest version.
python-lockfile is already the newest version.
python-lxml is already the newest version.
python-netaddr is already the newest version.
python-netifaces is already the newest version.
python-oauth is already the newest version.
python-oops is already the newest version.
python-oops-amqp is already the newest version.
python-oops-datedir-repo is already the newest version.
python-oops-twisted is already the newest version.
python-oops-wsgi is already the newest version.
python-psycopg2 is already the newest version.
python-pyinotify is already the newest version.
python-simplestreams is already the newest version.
python-sphinx is already the newest version.
python-tempita is already the newest version.
python-twisted is already the newest version.
python-txamqp is already the newest version.
python-txlongpoll is already the newest version.
python-yaml is already the newest version.
rabbitmq-server is already the newest version.
syslinux-common is already the newest version.
tgt is already the newest version.
ubuntu-cloudimage-keyring is already the newest version.
wget is already the newest version.
xvfb is already the newest version.
daemontools is already the newest version.
ipython is already the newest version.
python-cssselect is already the newest version.
python-pip is already the newest version.
python-pocket-lint is already the newest version.
python-virtualenv is already the newest version.
0 upgraded, 0 newly installed, 0 to remove and 125 not upgraded.
make -C acceptance clean
make[1]: Entering directory `/home/ubuntu/maas/acceptance'
rm -f -r source build *.build *.changes *.deb
make[1]: Leaving directory `/home/ubuntu/maas/acceptance'
find . -type f -name '*.py[co]' -print0 | xargs -r0 rm -f
find . -type f -name '*~' -print0 | xargs -r0 rm -f
find . -type f -name dropin.cache -print0 | xargs -r0 rm -f
rm -f -r media/demo/* media/development
rm -f src/maasserver/static/js/enums.js
rm -f *.log
rm -f docs/api.rst
rm -f -r docs/_autosummary docs/_build
rm -f -r man/.doctrees
rm -f -r bin include lib local
rm -f -r eggs develop-eggs
rm -f -r build dist logs/* parts
rm -f tags TAGS .installed.cfg
rm -f -r *.egg *.egg-info src/*.egg-info
rm -f -r run/* services/*/supervise
virtualenv --python=python2.7 --system-site-packages /home/ubuntu/maas
New python executable in /home/ubuntu/maas/bin/python2.7
Also creating executable in /home/ubuntu/maas/bin/python
Installing Setuptools...................................................................................................................................................................................................................................done.
Installing Pip..........................................................................................................................................................................................................................................................................................................................................done.
Running virtualenv with interpreter /usr/bin/python2.7
bin/pip --quiet install --ignore-installed \
	    --no-dependencies bootstrap/zc.buildout-1.5.2.tar.gz
rm -f -f README.txt  # zc.buildout installs an annoying README.txt.
bin/buildout install database
Creating directory '/home/ubuntu/maas/parts'.
Creating directory '/home/ubuntu/maas/develop-eggs'.
Installing database.
Generated script '/home/ubuntu/maas/bin/database'.
bin/buildout install repl
Installing repl.
Generated script '/home/ubuntu/maas/bin/ipy'.
Generated interpreter '/home/ubuntu/maas/bin/py'.
bin/py -m src/maasserver/utils/jsenums src/maasserver/enum.py src/metadataserver/enum.py src/provisioningserver/enum.py > src/maasserver/static/js/enums.js
bin/buildout install maas
Installing maas.
Generated script '/home/ubuntu/maas/bin/maas'.
bin/buildout install maas-test
Installing maas-test.
Generated script '/home/ubuntu/maas/bin/test.maas'.
bin/buildout install maascli
Installing maascli.
Generated script '/home/ubuntu/maas/bin/maascli'.
bin/buildout install maascli-test
Installing maascli-test.
Generated script '/home/ubuntu/maas/bin/test.maascli'.
bin/buildout install maastesting-test
Installing maastesting-test.
Generated script '/home/ubuntu/maas/bin/test.maastesting'.
bin/buildout install pserv
Installing pserv.
Generated script '/home/ubuntu/maas/bin/celeryd'.
Generated script '/home/ubuntu/maas/bin/maas-provision'.
Generated script '/home/ubuntu/maas/bin/twistd.pserv'.
bin/buildout install pserv-test
Installing pserv-test.
Generated script '/home/ubuntu/maas/bin/test.pserv'.
bin/buildout install txlongpoll
Installing txlongpoll.
Generated script '/home/ubuntu/maas/bin/twistd.txlongpoll'.
make -C acceptance clean
make[1]: Entering directory `/home/ubuntu/maas/acceptance'
rm -f -r source build *.build *.changes *.deb
make[1]: Leaving directory `/home/ubuntu/maas/acceptance'
find . -type f -name '*.py[co]' -print0 | xargs -r0 rm -f
find . -type f -name '*~' -print0 | xargs -r0 rm -f
find . -type f -name dropin.cache -print0 | xargs -r0 rm -f
rm -f -r media/demo/* media/development
rm -f src/maasserver/static/js/enums.js
rm -f *.log
rm -f docs/api.rst
rm -f -r docs/_autosummary docs/_build
rm -f -r man/.doctrees
bin/py -m src/maasserver/utils/jsenums src/maasserver/enum.py src/metadataserver/enum.py src/provisioningserver/enum.py > src/maasserver/static/js/enums.js
bin/buildout install maas
Updating maas.
bin/buildout install maas-test
Updating maas-test.
echo bin/test.maas bin/test.maascli bin/test.maastesting bin/test.pserv | xargs -n1 env
nosetests --verbosity 1 --exclude=provisioningserver --exclude=maastesting --exclude=maascli
Creating test database for alias 'default'...
Destroying test database for alias 'default'...

.............................................S.......................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................S...........................................................................................................................................................................................................................................................................
----------------------------------------------------------------------
Ran 1777 tests in 277.709s

OK (SKIP=2)
....................................................................................
----------------------------------------------------------------------
Ran 84 tests in 1.367s

OK
.........................................................S.........................................................
----------------------------------------------------------------------
Ran 115 tests in 15.789s

OK (SKIP=1)
F............................................................................................................................................................................................................................................................................SSSS..............................................................................................................................................................................................................................................................................................................................................................................
======================================================================
FAIL: provisioningserver.dhcp.tests.test_config.TestDHCPConfig.test_config_does_contains_config_item_depending_on_release
----------------------------------------------------------------------
_StringException: Traceback (most recent call last):
  File "/home/ubuntu/maas/src/provisioningserver/dhcp/tests/test_config.py", line 131, in test_config_does_contains_config_item_depending_on_release
    self.assertNotIn('ignore-client-uids', config_file)
MismatchError: u'# WARNING: Do not edit /etc/maas/dhcpd.conf yourself.  MAAS will overwrite any\n# changes made there.\n#\n# Instead, edit /etc/maas/templates/dhcp/dhcpd.conf.template and your changes\n# will be present whenever MAAS rewrites the DHCP configuration.  Edit and save\n# the nodegroup\'s configuration in MAAS to trigger an update.\n\nsubnet 10.0.0.0 netmask 255.0.0.0 {\n       filename "pxelinux.0";\n       ignore-client-uids true;\n       option subnet-mask 255.0.0.0;\n       option broadcast-address 10.255.255.255;\n       option domain-name-servers 10.1.0.1 10.1.0.2;\n       option domain-name "example.com";\n       option routers 10.0.0.2;\n       range dynamic-bootp 10.0.0.3 10.0.0.254;\n       class "PXE" {\n          match if substring (option vendor-class-identifier, 0, 3) = "PXE";\n          default-lease-time 30;\n          max-lease-time 30;\n       }\n}\nomapi-port 7911;\nkey omapi_key {\n    algorithm HMAC-MD5;\n    secret "random";\n};\nomapi-key omapi_key;\n' matches Contains(u'ignore-client-uids')

----------------------------------------------------------------------
Ran 639 tests in 37.136s

FAILED (SKIP=4, failures=1)
make: *** [test] Error 123

Revision history for this message

MAAS Lander (maas-lander) wrote on 2013-10-24:

#

Download full text (15.3 KiB)

The attempt to merge lp:~andreserl/maas/lp1240972 into lp:maas failed. Below is the output from the failed tests.

Ign http://security.ubuntu.com saucy-security InRelease
Get:1 http://security.ubuntu.com saucy-security Release.gpg [933 B]
Get:2 http://security.ubuntu.com saucy-security Release [49.6 kB]
Ign http://nova.clouds.archive.ubuntu.com saucy InRelease
Ign http://nova.clouds.archive.ubuntu.com saucy-updates InRelease
Hit http://nova.clouds.archive.ubuntu.com saucy Release.gpg
Get:3 http://nova.clouds.archive.ubuntu.com saucy-updates Release.gpg [933 B]
Hit http://nova.clouds.archive.ubuntu.com saucy Release
Get:4 http://nova.clouds.archive.ubuntu.com saucy-updates Release [49.6 kB]
Get:5 http://security.ubuntu.com saucy-security/main Sources [2,846 B]
Hit http://nova.clouds.archive.ubuntu.com saucy/main Sources
Get:6 http://security.ubuntu.com saucy-security/universe Sources [14 B]
Get:7 http://security.ubuntu.com saucy-security/main amd64 Packages [4,463 B]
Hit http://nova.clouds.archive.ubuntu.com saucy/universe Sources
Hit http://nova.clouds.archive.ubuntu.com saucy/main amd64 Packages
Get:8 http://security.ubuntu.com saucy-security/universe amd64 Packages [2,023 B]
Hit http://nova.clouds.archive.ubuntu.com saucy/universe amd64 Packages
Hit http://security.ubuntu.com saucy-security/main Translation-en
Hit http://nova.clouds.archive.ubuntu.com saucy/main Translation-en
Hit http://security.ubuntu.com saucy-security/universe Translation-en
Hit http://nova.clouds.archive.ubuntu.com saucy/universe Translation-en
Ign http://security.ubuntu.com saucy-security/main Translation-en_US
Ign http://security.ubuntu.com saucy-security/universe Translation-en_US
Get:9 http://nova.clouds.archive.ubuntu.com saucy-updates/main Sources [5,774 B]
Get:10 http://nova.clouds.archive.ubuntu.com saucy-updates/universe Sources [14 B]
Get:11 http://nova.clouds.archive.ubuntu.com saucy-updates/main amd64 Packages [9,747 B]
Get:12 http://nova.clouds.archive.ubuntu.com saucy-updates/universe amd64 Packages [3,105 B]
Hit http://nova.clouds.archive.ubuntu.com saucy-updates/main Translation-en
Hit http://nova.clouds.archive.ubuntu.com saucy-updates/universe Translation-en
Ign http://nova.clouds.archive.ubuntu.com saucy/main Translation-en_US
Ign http://nova.clouds.archive.ubuntu.com saucy/universe Translation-en_US
Ign http://nova.clouds.archive.ubuntu.com saucy-updates/main Translation-en_US
Ign http://nova.clouds.archive.ubuntu.com saucy-updates/universe Translation-en_US
Fetched 129 kB in 0s (706 kB/s)
Reading package lists...
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
--no-install-recommends install apache2 avahi-daemon avahi-utils bind9 bind9utils build-essential curl daemontools distro-info dnsutils firefox freeipmi-tools ipython isc-dhcp-common libjs-raphael libjs-yui3-full libjs-yui3-min libpq-dev make postgresql-9.1 python-amqplib python-avahi python-bzrlib python-celery python-convoy python-cssselect python-curtin python-dbus python-dev python-distro-info python-django python-django-piston python-django-south python-djorm-ext-pgarray python-docutils python-formencode python-httplib2 python-jinja2 python-lockfile python-lxml python-netaddr pytho...

The attempt to merge lp:~andreserl/maas/lp1240972 into lp:maas failed. Below is the output from the failed tests.

Ign http://security.ubuntu.com saucy-security InRelease
Get:1 http://security.ubuntu.com saucy-security Release.gpg [933 B]
Get:2 http://security.ubuntu.com saucy-security Release [49.6 kB]
Ign http://nova.clouds.archive.ubuntu.com saucy InRelease
Ign http://nova.clouds.archive.ubuntu.com saucy-updates InRelease
Hit http://nova.clouds.archive.ubuntu.com saucy Release.gpg
Get:3 http://nova.clouds.archive.ubuntu.com saucy-updates Release.gpg [933 B]
Hit http://nova.clouds.archive.ubuntu.com saucy Release
Get:4 http://nova.clouds.archive.ubuntu.com saucy-updates Release [49.6 kB]
Get:5 http://security.ubuntu.com saucy-security/main Sources [2,846 B]
Hit http://nova.clouds.archive.ubuntu.com saucy/main Sources
Get:6 http://security.ubuntu.com saucy-security/universe Sources [14 B]
Get:7 http://security.ubuntu.com saucy-security/main amd64 Packages [4,463 B]
Hit http://nova.clouds.archive.ubuntu.com saucy/universe Sources
Hit http://nova.clouds.archive.ubuntu.com saucy/main amd64 Packages
Get:8 http://security.ubuntu.com saucy-security/universe amd64 Packages [2,023 B]
Hit http://nova.clouds.archive.ubuntu.com saucy/universe amd64 Packages
Hit http://security.ubuntu.com saucy-security/main Translation-en
Hit http://nova.clouds.archive.ubuntu.com saucy/main Translation-en
Hit http://security.ubuntu.com saucy-security/universe Translation-en
Hit http://nova.clouds.archive.ubuntu.com saucy/universe Translation-en
Ign http://security.ubuntu.com saucy-security/main Translation-en_US
Ign http://security.ubuntu.com saucy-security/universe Translation-en_US
Get:9 http://nova.clouds.archive.ubuntu.com saucy-updates/main Sources [5,774 B]
Get:10 http://nova.clouds.archive.ubuntu.com saucy-updates/universe Sources [14 B]
Get:11 http://nova.clouds.archive.ubuntu.com saucy-updates/main amd64 Packages [9,747 B]
Get:12 http://nova.clouds.archive.ubuntu.com saucy-updates/universe amd64 Packages [3,105 B]
Hit http://nova.clouds.archive.ubuntu.com saucy-updates/main Translation-en
Hit http://nova.clouds.archive.ubuntu.com saucy-updates/universe Translation-en
Ign http://nova.clouds.archive.ubuntu.com saucy/main Translation-en_US
Ign http://nova.clouds.archive.ubuntu.com saucy/universe Translation-en_US
Ign http://nova.clouds.archive.ubuntu.com saucy-updates/main Translation-en_US
Ign http://nova.clouds.archive.ubuntu.com saucy-updates/universe Translation-en_US
Fetched 129 kB in 0s (706 kB/s)
Reading package lists...
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
	    --no-install-recommends install apache2 avahi-daemon avahi-utils bind9 bind9utils build-essential curl daemontools distro-info dnsutils firefox freeipmi-tools ipython isc-dhcp-common libjs-raphael libjs-yui3-full libjs-yui3-min libpq-dev make postgresql-9.1 python-amqplib python-avahi python-bzrlib python-celery python-convoy python-cssselect python-curtin python-dbus python-dev python-distro-info python-django python-django-piston python-django-south python-djorm-ext-pgarray python-docutils python-formencode python-httplib2 python-jinja2 python-lockfile python-lxml python-netaddr python-netifaces python-oauth python-oops python-oops-amqp python-oops-datedir-repo python-oops-twisted python-oops-wsgi python-pip python-pocket-lint python-psycopg2 python-pyinotify python-simplestreams python-sphinx python-tempita python-twisted python-txamqp python-txlongpoll python-virtualenv python-yaml rabbitmq-server syslinux-common tgt ubuntu-cloudimage-keyring wget xvfb
Reading package lists...
Building dependency tree...
Reading state information...
apache2 is already the newest version.
avahi-daemon is already the newest version.
avahi-utils is already the newest version.
bind9 is already the newest version.
bind9utils is already the newest version.
build-essential is already the newest version.
curl is already the newest version.
distro-info is already the newest version.
dnsutils is already the newest version.
firefox is already the newest version.
freeipmi-tools is already the newest version.
isc-dhcp-common is already the newest version.
libjs-raphael is already the newest version.
libjs-yui3-full is already the newest version.
libjs-yui3-min is already the newest version.
libpq-dev is already the newest version.
make is already the newest version.
postgresql-9.1 is already the newest version.
python-amqplib is already the newest version.
python-avahi is already the newest version.
python-bzrlib is already the newest version.
python-celery is already the newest version.
python-convoy is already the newest version.
python-curtin is already the newest version.
python-dbus is already the newest version.
python-dev is already the newest version.
python-distro-info is already the newest version.
python-django is already the newest version.
python-django-piston is already the newest version.
python-django-south is already the newest version.
python-djorm-ext-pgarray is already the newest version.
python-docutils is already the newest version.
python-formencode is already the newest version.
python-httplib2 is already the newest version.
python-jinja2 is already the newest version.
python-lockfile is already the newest version.
python-lxml is already the newest version.
python-netaddr is already the newest version.
python-netifaces is already the newest version.
python-oauth is already the newest version.
python-oops is already the newest version.
python-oops-amqp is already the newest version.
python-oops-datedir-repo is already the newest version.
python-oops-twisted is already the newest version.
python-oops-wsgi is already the newest version.
python-psycopg2 is already the newest version.
python-pyinotify is already the newest version.
python-simplestreams is already the newest version.
python-sphinx is already the newest version.
python-tempita is already the newest version.
python-twisted is already the newest version.
python-txamqp is already the newest version.
python-txlongpoll is already the newest version.
python-yaml is already the newest version.
rabbitmq-server is already the newest version.
syslinux-common is already the newest version.
tgt is already the newest version.
ubuntu-cloudimage-keyring is already the newest version.
wget is already the newest version.
xvfb is already the newest version.
daemontools is already the newest version.
ipython is already the newest version.
python-cssselect is already the newest version.
python-pip is already the newest version.
python-pocket-lint is already the newest version.
python-virtualenv is already the newest version.
0 upgraded, 0 newly installed, 0 to remove and 125 not upgraded.
make -C acceptance clean
make[1]: Entering directory `/home/ubuntu/maas/acceptance'
rm -f -r source build *.build *.changes *.deb
make[1]: Leaving directory `/home/ubuntu/maas/acceptance'
find . -type f -name '*.py[co]' -print0 | xargs -r0 rm -f
find . -type f -name '*~' -print0 | xargs -r0 rm -f
find . -type f -name dropin.cache -print0 | xargs -r0 rm -f
rm -f -r media/demo/* media/development
rm -f src/maasserver/static/js/enums.js
rm -f *.log
rm -f docs/api.rst
rm -f -r docs/_autosummary docs/_build
rm -f -r man/.doctrees
rm -f -r bin include lib local
rm -f -r eggs develop-eggs
rm -f -r build dist logs/* parts
rm -f tags TAGS .installed.cfg
rm -f -r *.egg *.egg-info src/*.egg-info
rm -f -r run/* services/*/supervise
virtualenv --python=python2.7 --system-site-packages /home/ubuntu/maas
New python executable in /home/ubuntu/maas/bin/python2.7
Also creating executable in /home/ubuntu/maas/bin/python
Installing Setuptools...................................................................................................................................................................................................................................done.
Installing Pip..........................................................................................................................................................................................................................................................................................................................................done.
Running virtualenv with interpreter /usr/bin/python2.7
bin/pip --quiet install --ignore-installed \
	    --no-dependencies bootstrap/zc.buildout-1.5.2.tar.gz
rm -f -f README.txt  # zc.buildout installs an annoying README.txt.
bin/buildout install database
Creating directory '/home/ubuntu/maas/parts'.
Creating directory '/home/ubuntu/maas/develop-eggs'.
Installing database.
Generated script '/home/ubuntu/maas/bin/database'.
bin/buildout install repl
Installing repl.
Generated script '/home/ubuntu/maas/bin/ipy'.
Generated interpreter '/home/ubuntu/maas/bin/py'.
bin/py -m src/maasserver/utils/jsenums src/maasserver/enum.py src/metadataserver/enum.py src/provisioningserver/enum.py > src/maasserver/static/js/enums.js
bin/buildout install maas
Installing maas.
Generated script '/home/ubuntu/maas/bin/maas'.
bin/buildout install maas-test
Installing maas-test.
Generated script '/home/ubuntu/maas/bin/test.maas'.
bin/buildout install maascli
Installing maascli.
Generated script '/home/ubuntu/maas/bin/maascli'.
bin/buildout install maascli-test
Installing maascli-test.
Generated script '/home/ubuntu/maas/bin/test.maascli'.
bin/buildout install maastesting-test
Installing maastesting-test.
Generated script '/home/ubuntu/maas/bin/test.maastesting'.
bin/buildout install pserv
Installing pserv.
Generated script '/home/ubuntu/maas/bin/celeryd'.
Generated script '/home/ubuntu/maas/bin/maas-provision'.
Generated script '/home/ubuntu/maas/bin/twistd.pserv'.
bin/buildout install pserv-test
Installing pserv-test.
Generated script '/home/ubuntu/maas/bin/test.pserv'.
bin/buildout install txlongpoll
Installing txlongpoll.
Generated script '/home/ubuntu/maas/bin/twistd.txlongpoll'.
make -C acceptance clean
make[1]: Entering directory `/home/ubuntu/maas/acceptance'
rm -f -r source build *.build *.changes *.deb
make[1]: Leaving directory `/home/ubuntu/maas/acceptance'
find . -type f -name '*.py[co]' -print0 | xargs -r0 rm -f
find . -type f -name '*~' -print0 | xargs -r0 rm -f
find . -type f -name dropin.cache -print0 | xargs -r0 rm -f
rm -f -r media/demo/* media/development
rm -f src/maasserver/static/js/enums.js
rm -f *.log
rm -f docs/api.rst
rm -f -r docs/_autosummary docs/_build
rm -f -r man/.doctrees
bin/py -m src/maasserver/utils/jsenums src/maasserver/enum.py src/metadataserver/enum.py src/provisioningserver/enum.py > src/maasserver/static/js/enums.js
bin/buildout install maas
Updating maas.
bin/buildout install maas-test
Updating maas-test.
echo bin/test.maas bin/test.maascli bin/test.maastesting bin/test.pserv | xargs -n1 env
nosetests --verbosity 1 --exclude=provisioningserver --exclude=maastesting --exclude=maascli
Creating test database for alias 'default'...
Destroying test database for alias 'default'...

.............................................S........................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................S...........................................................................................................................................................................................................................................................................
----------------------------------------------------------------------
Ran 1778 tests in 280.185s

OK (SKIP=2)
....................................................................................
----------------------------------------------------------------------
Ran 84 tests in 1.376s

OK
.........................................................S.........................................................
----------------------------------------------------------------------
Ran 115 tests in 16.316s

OK (SKIP=1)
F............................................................................................................................................................................................................................................................................SSSS..............................................................................................................................................................................................................................................................................................................................................................................
======================================================================
FAIL: provisioningserver.dhcp.tests.test_config.TestDHCPConfig.test_config_does_contains_config_item_depending_on_release
----------------------------------------------------------------------
_StringException: Traceback (most recent call last):
  File "/home/ubuntu/maas/src/provisioningserver/dhcp/tests/test_config.py", line 131, in test_config_does_contains_config_item_depending_on_release
    self.assertNotIn('ignore-client-uids', config_file)
MismatchError: u'# WARNING: Do not edit /etc/maas/dhcpd.conf yourself.  MAAS will overwrite any\n# changes made there.\n#\n# Instead, edit /etc/maas/templates/dhcp/dhcpd.conf.template and your changes\n# will be present whenever MAAS rewrites the DHCP configuration.  Edit and save\n# the nodegroup\'s configuration in MAAS to trigger an update.\n\nsubnet 10.0.0.0 netmask 255.0.0.0 {\n       filename "pxelinux.0";\n       ignore-client-uids true;\n       option subnet-mask 255.0.0.0;\n       option broadcast-address 10.255.255.255;\n       option domain-name-servers 10.1.0.1 10.1.0.2;\n       option domain-name "example.com";\n       option routers 10.0.0.2;\n       range dynamic-bootp 10.0.0.3 10.0.0.254;\n       class "PXE" {\n          match if substring (option vendor-class-identifier, 0, 3) = "PXE";\n          default-lease-time 30;\n          max-lease-time 30;\n       }\n}\nomapi-port 7911;\nkey omapi_key {\n    algorithm HMAC-MD5;\n    secret "random";\n};\nomapi-key omapi_key;\n' matches Contains(u'ignore-client-uids')

----------------------------------------------------------------------
Ran 639 tests in 37.835s

FAILED (SKIP=4, failures=1)
make: *** [test] Error 123

1	=== modified file 'etc/maas/templates/dhcp/dhcpd.conf.template'
2	--- etc/maas/templates/dhcp/dhcpd.conf.template 2013-08-15 00:59:32 +0000
3	+++ etc/maas/templates/dhcp/dhcpd.conf.template 2013-10-17 20:54:03 +0000
4	@@ -7,9 +7,7 @@
5
6	subnet {{subnet}} netmask {{subnet_mask}} {
7	filename "{{bootloader}}";
8	- {{if platform_codename >= 'raring'}}
9	ignore-client-uids true;
10	- {{endif}}
11	option subnet-mask {{subnet_mask}};
12	option broadcast-address {{broadcast_ip}};
13	option domain-name-servers {{dns_servers}};

MAAS

Merge lp:~andreserl/maas/lp1240972 into lp:~maas-committers/maas/trunk

Commit message

Description of the change

Preview Diff

Subscribers