Merge into trunk : fix-enlistment : Code : MAAS

Status:

Merged

Approved by:

Andres Rodriguez on 2015-02-26

Approved revision:

no longer in the source branch.

Merged at revision:

3569

Proposed branch:

lp:~martin-nowack/maas/fix-enlistment

Merge into:

lp:~maas-committers/maas/trunk

Diff against target:

16 lines (+2/-2)

1 file modified

etc/maas/templates/commissioning-user-data/snippets/maas_enlist.sh (+2/-2)

To merge this branch:

bzr merge lp:~martin-nowack/maas/fix-enlistment

Critical

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Andres Rodriguez (community)		2015-02-26	Approve on 2015-02-26
Review via email: mp+251099@code.launchpad.net

Commit message

Fix incorrect handling of '-' in dns name during enlistment.

Revision history for this message

Andres Rodriguez (andreserl) wrote on 2015-02-26:

#

lgtm!

review: Approve

Revision history for this message

MAAS Lander (maas-lander) wrote on 2015-02-26:

#

Download full text (27.0 KiB)

The attempt to merge lp:~martin-nowack/maas/fix-enlistment into lp:maas failed. Below is the output from the failed tests.

Ign http://security.ubuntu.com trusty-security InRelease
Ign http://nova.clouds.archive.ubuntu.com trusty InRelease
Hit http://security.ubuntu.com trusty-security Release.gpg
Hit http://security.ubuntu.com trusty-security Release
Ign http://nova.clouds.archive.ubuntu.com trusty-updates InRelease
Hit http://nova.clouds.archive.ubuntu.com trusty Release.gpg
Hit http://nova.clouds.archive.ubuntu.com trusty-updates Release.gpg
Hit http://nova.clouds.archive.ubuntu.com trusty Release
Hit http://nova.clouds.archive.ubuntu.com trusty-updates Release
Hit http://security.ubuntu.com trusty-security/main Sources
Hit http://security.ubuntu.com trusty-security/universe Sources
Hit http://security.ubuntu.com trusty-security/main amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com trusty/main Sources
Hit http://security.ubuntu.com trusty-security/universe amd64 Packages
Hit http://security.ubuntu.com trusty-security/main Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty/universe Sources
Hit http://security.ubuntu.com trusty-security/universe Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty/main amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com trusty/universe amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com trusty/main Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty/universe Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/main Sources
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/universe Sources
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/main amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/universe amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/main Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/universe Translation-en
Ign http://nova.clouds.archive.ubuntu.com trusty/main Translation-en_US
Ign http://nova.clouds.archive.ubuntu.com trusty/universe Translation-en_US
Reading package lists...
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
--no-install-recommends install apache2 authbind bind9 bind9utils build-essential bzr-builddeb chromium-browser chromium-chromedriver curl daemontools debhelper dh-apport distro-info dnsutils firefox freeipmi-tools gjs ipython isc-dhcp-common libjs-angularjs libjs-jquery libjs-raphael libjs-yui3-full libjs-yui3-min libpq-dev make nodejs-legacy npm pep8 postgresql pyflakes python-bson python-bzrlib python-convoy python-crochet python-cssselect python-curtin python-dev python-distro-info python-django python-django-piston python-django-south python-djorm-ext-pgarray python-docutils python-extras python-fixtures python-flake8 python-formencode python-hivex python-httplib2 python-iscpy python-jinja2 python-jsonschema python-lockfile python-lxml python-mock python-netaddr python-netifaces python-nose python-oauth python-openssl python-paramiko python-pexpect python-pip python-pocket-lint python-psycopg2 python-pyinotify python-pyparsing python-pyscss python-seamicroclient python-simplejson python-simplestreams python-...

The attempt to merge lp:~martin-nowack/maas/fix-enlistment into lp:maas failed. Below is the output from the failed tests.

Ign http://security.ubuntu.com trusty-security InRelease
Ign http://nova.clouds.archive.ubuntu.com trusty InRelease
Hit http://security.ubuntu.com trusty-security Release.gpg
Hit http://security.ubuntu.com trusty-security Release
Ign http://nova.clouds.archive.ubuntu.com trusty-updates InRelease
Hit http://nova.clouds.archive.ubuntu.com trusty Release.gpg
Hit http://nova.clouds.archive.ubuntu.com trusty-updates Release.gpg
Hit http://nova.clouds.archive.ubuntu.com trusty Release
Hit http://nova.clouds.archive.ubuntu.com trusty-updates Release
Hit http://security.ubuntu.com trusty-security/main Sources
Hit http://security.ubuntu.com trusty-security/universe Sources
Hit http://security.ubuntu.com trusty-security/main amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com trusty/main Sources
Hit http://security.ubuntu.com trusty-security/universe amd64 Packages
Hit http://security.ubuntu.com trusty-security/main Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty/universe Sources
Hit http://security.ubuntu.com trusty-security/universe Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty/main amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com trusty/universe amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com trusty/main Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty/universe Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/main Sources
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/universe Sources
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/main amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/universe amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/main Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/universe Translation-en
Ign http://nova.clouds.archive.ubuntu.com trusty/main Translation-en_US
Ign http://nova.clouds.archive.ubuntu.com trusty/universe Translation-en_US
Reading package lists...
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
	    --no-install-recommends install apache2 authbind bind9 bind9utils build-essential bzr-builddeb chromium-browser chromium-chromedriver curl daemontools debhelper dh-apport distro-info dnsutils firefox freeipmi-tools gjs ipython isc-dhcp-common libjs-angularjs libjs-jquery libjs-raphael libjs-yui3-full libjs-yui3-min libpq-dev make nodejs-legacy npm pep8 postgresql pyflakes python-bson python-bzrlib python-convoy python-crochet python-cssselect python-curtin python-dev python-distro-info python-django python-django-piston python-django-south python-djorm-ext-pgarray python-docutils python-extras python-fixtures python-flake8 python-formencode python-hivex python-httplib2 python-iscpy python-jinja2 python-jsonschema python-lockfile python-lxml python-mock python-netaddr python-netifaces python-nose python-oauth python-openssl python-paramiko python-pexpect python-pip python-pocket-lint python-psycopg2 python-pyinotify python-pyparsing python-pyscss python-seamicroclient python-simplejson python-simplestreams python-sphinx python-subunit python-tempita python-testresources python-testscenarios python-testtools python-twisted python-txtftp python-tz python-unittest2 python-virtualenv python-yaml python-zope.interface syslinux-common tgt ubuntu-cloudimage-keyring wget xvfb
Reading package lists...
Building dependency tree...
Reading state information...
authbind is already the newest version.
build-essential is already the newest version.
debhelper is already the newest version.
distro-info is already the newest version.
isc-dhcp-common is already the newest version.
libjs-jquery 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.
make is already the newest version.
pep8 is already the newest version.
postgresql is already the newest version.
pyflakes is already the newest version.
python-bson is already the newest version.
python-convoy is already the newest version.
python-crochet is already the newest version.
python-dev is already the newest version.
python-distro-info 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-extras is already the newest version.
python-fixtures is already the newest version.
python-formencode is already the newest version.
python-httplib2 is already the newest version.
python-iscpy is already the newest version.
python-jinja2 is already the newest version.
python-jsonschema is already the newest version.
python-lockfile is already the newest version.
python-mock is already the newest version.
python-netifaces is already the newest version.
python-nose is already the newest version.
python-oauth is already the newest version.
python-openssl is already the newest version.
python-paramiko is already the newest version.
python-psycopg2 is already the newest version.
python-pyinotify is already the newest version.
python-pyparsing is already the newest version.
python-simplejson is already the newest version.
python-subunit is already the newest version.
python-tempita is already the newest version.
python-testresources is already the newest version.
python-testscenarios is already the newest version.
python-testtools is already the newest version.
python-twisted is already the newest version.
python-txtftp is already the newest version.
python-tz is already the newest version.
python-unittest2 is already the newest version.
python-zope.interface 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.
bzr-builddeb is already the newest version.
daemontools is already the newest version.
ipython is already the newest version.
libjs-angularjs is already the newest version.
nodejs-legacy is already the newest version.
npm is already the newest version.
python-cssselect is already the newest version.
python-flake8 is already the newest version.
python-hivex is already the newest version.
python-pip is already the newest version.
python-pocket-lint is already the newest version.
python-pyscss is already the newest version.
python-virtualenv is already the newest version.
apache2 is already the newest version.
bind9 is already the newest version.
bind9utils is already the newest version.
curl is already the newest version.
dh-apport is already the newest version.
dnsutils is already the newest version.
firefox is already the newest version.
freeipmi-tools is already the newest version.
libpq-dev is already the newest version.
python-bzrlib is already the newest version.
python-curtin is already the newest version.
python-django is already the newest version.
python-lxml is already the newest version.
python-netaddr is already the newest version.
python-pexpect is already the newest version.
python-seamicroclient is already the newest version.
python-simplestreams is already the newest version.
python-sphinx is already the newest version.
python-yaml is already the newest version.
wget is already the newest version.
xvfb is already the newest version.
chromium-browser is already the newest version.
chromium-chromedriver is already the newest version.
gjs is already the newest version.
0 upgraded, 0 newly installed, 0 to remove and 7 not upgraded.
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
	    purge 
Reading package lists...
Building dependency tree...
Reading state information...
0 upgraded, 0 newly installed, 0 to remove and 7 not upgraded.
make -C acceptance clean
make[1]: Entering directory `/tmp/tarmac/branch.thqC9S/acceptance'
rm -f -r source build *.build *.changes *.deb
make[1]: Leaving directory `/tmp/tarmac/branch.thqC9S/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 src/maasserver/static/css/maas-styles.css
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/* run-e2e/* services/*/supervise
virtualenv --python=python2.7 --system-site-packages /tmp/tarmac/branch.thqC9S
New python executable in /tmp/tarmac/branch.thqC9S/bin/python2.7
Also creating executable in /tmp/tarmac/branch.thqC9S/bin/python
Installing setuptools, pip...done.
Running virtualenv with interpreter /usr/bin/python2.7
bin/python -m 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 '/tmp/tarmac/branch.thqC9S/parts'.
Creating directory '/tmp/tarmac/branch.thqC9S/develop-eggs'.
Installing database.
Generated script '/tmp/tarmac/branch.thqC9S/bin/database'.
bin/buildout install cli
Installing cli.
Generated script '/tmp/tarmac/branch.thqC9S/bin/maas'.
bin/buildout install cluster
Installing cluster.
Generated script '/tmp/tarmac/branch.thqC9S/bin/maas-probe-dhcp'.
Generated script '/tmp/tarmac/branch.thqC9S/bin/maas-provision'.
Generated script '/tmp/tarmac/branch.thqC9S/bin/twistd.cluster'.
bin/buildout install repl
Installing repl.
Generated script '/tmp/tarmac/branch.thqC9S/bin/ipy'.
Generated interpreter '/tmp/tarmac/branch.thqC9S/bin/py'.
bin/py -m src/maasserver/utils/jsenums src/maasserver/enum.py src/metadataserver/enum.py > src/maasserver/static/js/enums.js
pyscss src/maasserver/static/scss/maas-styles.scss -o src/maasserver/static/css/maas-styles.css --no-compress --load-path=src/maasserver/static/scss
bin/buildout install region
Installing region.
Generated script '/tmp/tarmac/branch.thqC9S/bin/maas-region-admin'.
Generated script '/tmp/tarmac/branch.thqC9S/bin/twistd.region'.
bin/buildout install cli-test
Installing cli-test.
Generated script '/tmp/tarmac/branch.thqC9S/bin/test.cli'.
bin/buildout install cluster-test
Installing cluster-test.
Generated script '/tmp/tarmac/branch.thqC9S/bin/test.cluster'.
bin/buildout install config-test
Installing config-test.
Generated script '/tmp/tarmac/branch.thqC9S/bin/test.config'.
npm install --cache-min 5184000 --prefix include/nodejs protractor
protractor@1.6.1 include/nodejs/node_modules/protractor
├── jasminewd@1.1.0
├── jasminewd2@0.0.2
├── saucelabs@0.1.1
├── q@1.0.0
├── minijasminenode@1.1.1
├── optimist@0.6.1 (wordwrap@0.0.2, minimist@0.0.10)
├── adm-zip@0.4.4
├── glob@3.2.11 (inherits@2.0.1, minimatch@0.3.0)
├── source-map-support@0.2.9 (source-map@0.1.32)
├── request@2.36.0 (json-stringify-safe@5.0.0, forever-agent@0.5.2, aws-sign2@0.5.0, qs@0.6.6, oauth-sign@0.3.0, tunnel-agent@0.4.0, mime@1.2.11, node-uuid@1.4.2, form-data@0.1.4, http-signature@0.10.1, tough-cookie@0.12.1, hawk@1.0.0)
├── lodash@2.4.1
├── jasmine@2.1.1 (jasmine-core@2.1.3)
└── selenium-webdriver@2.44.0 (tmp@0.0.24, xml2js@0.4.4)
bin/buildout install e2e-test
Installing e2e-test.
Generated script '/tmp/tarmac/branch.thqC9S/bin/test.e2e'.
npm install --cache-min 5184000 --prefix include/nodejs karma karma-chrome-launcher karma-firefox-launcher karma-jasmine karma-opera-launcher karma-phantomjs-launcher karma-failed-reporter

> phantomjs@1.9.15 install /tmp/tarmac/branch.thqC9S/include/nodejs/node_modules/karma-phantomjs-launcher/node_modules/phantomjs
> node install.js

Download already available at /home/ubuntu/tmp/phantomjs/phantomjs-1.9.8-linux-x86_64.tar.bz2
Extracting tar contents (via spawned process)

> ws@0.4.32 install /tmp/tarmac/branch.thqC9S/include/nodejs/node_modules/karma/node_modules/socket.io/node_modules/socket.io-client/node_modules/ws
> (node-gyp rebuild 2> builderror.log) || (exit 0)

make[1]: Entering directory `/tmp/tarmac/branch.thqC9S/include/nodejs/node_modules/karma/node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/build'
  CXX(target) Release/obj.target/bufferutil/src/bufferutil.o
  SOLINK_MODULE(target) Release/obj.target/bufferutil.node
  SOLINK_MODULE(target) Release/obj.target/bufferutil.node: Finished
  COPY Release/bufferutil.node
  CXX(target) Release/obj.target/validation/src/validation.o
Removing /tmp/tarmac/branch.thqC9S/include/nodejs/node_modules/karma-phantomjs-launcher/node_modules/phantomjs/lib/phantom
Copying extracted folder /home/ubuntu/tmp/phantomjs/phantomjs-1.9.8-linux-x86_64.tar.bz2-extract-1424982172949/phantomjs-1.9.8-linux-x86_64 -> /tmp/tarmac/branch.thqC9S/include/nodejs/node_modules/karma-phantomjs-launcher/node_modules/phantomjs/lib/phantom
Writing location.js file
Done. Phantomjs binary available at /tmp/tarmac/branch.thqC9S/include/nodejs/node_modules/karma-phantomjs-launcher/node_modules/phantomjs/lib/phantom/bin/phantomjs
  SOLINK_MODULE(target) Release/obj.target/validation.node
  SOLINK_MODULE(target) Release/obj.target/validation.node: Finished
  COPY Release/validation.node
make[1]: Leaving directory `/tmp/tarmac/branch.thqC9S/include/nodejs/node_modules/karma/node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/build'
karma-firefox-launcher@0.1.4 include/nodejs/node_modules/karma-firefox-launcher

karma-opera-launcher@0.1.0 include/nodejs/node_modules/karma-opera-launcher

karma-chrome-launcher@0.1.7 include/nodejs/node_modules/karma-chrome-launcher

karma-failed-reporter@0.0.3 include/nodejs/node_modules/karma-failed-reporter
└── colors@0.6.2

jasmine-core@2.2.0 include/nodejs/node_modules/jasmine-core

karma-jasmine@0.3.5 include/nodejs/node_modules/karma-jasmine

karma-phantomjs-launcher@0.1.4 include/nodejs/node_modules/karma-phantomjs-launcher
└── phantomjs@1.9.15 (which@1.0.8, progress@1.1.8, request-progress@0.3.1, kew@0.4.0, fs-extra@0.16.3, adm-zip@0.4.4, npmconf@2.0.9, request@2.42.0)

karma@0.12.31 include/nodejs/node_modules/karma
├── di@0.0.1
├── graceful-fs@2.0.3
├── rimraf@2.2.8
├── colors@0.6.2
├── mime@1.2.11
├── q@0.9.7
├── minimatch@0.2.14 (sigmund@1.0.0, lru-cache@2.5.0)
├── optimist@0.6.1 (wordwrap@0.0.2, minimist@0.0.10)
├── source-map@0.1.43 (amdefine@0.1.0)
├── glob@3.2.11 (inherits@2.0.1, minimatch@0.3.0)
├── chokidar@1.0.0-rc3 (async-each@0.1.6, is-binary-path@1.0.0, glob-parent@1.0.0, anymatch@1.1.0, readdirp@1.3.0)
├── log4js@0.6.22 (semver@1.1.4, async@0.2.10, readable-stream@1.0.33)
├── http-proxy@0.10.4 (pkginfo@0.3.0, utile@0.2.1)
├── lodash@2.4.1
├── connect@2.26.6 (cookie@0.1.2, fresh@0.2.4, pause@0.0.1, cookie-signature@1.0.5, response-time@2.0.1, vhost@3.0.0, basic-auth-connect@1.0.0, on-headers@1.0.0, bytes@1.0.0, media-typer@0.3.0, parseurl@1.3.0, depd@0.4.5, connect-timeout@1.3.0, finalhandler@0.2.0, cookie-parser@1.3.4, qs@2.2.4, method-override@2.2.0, debug@2.0.0, morgan@1.3.2, csurf@1.6.6, serve-favicon@2.1.7, express-session@1.8.2, serve-static@1.6.5, multiparty@3.3.2, errorhandler@1.2.4, body-parser@1.8.4, compression@1.1.2, type-is@1.5.7, serve-index@1.2.1)
├── useragent@2.0.10 (lru-cache@2.2.4)
└── socket.io@0.9.16 (base64id@0.1.0, policyfile@0.0.4, redis@0.7.3, socket.io-client@0.9.16)
bin/buildout install js-test
Installing js-test.
Generated script '/tmp/tarmac/branch.thqC9S/bin/test.js'.
bin/buildout install region-test
Installing region-test.
Generated script '/tmp/tarmac/branch.thqC9S/bin/test.region'.
bin/buildout install testing-test
Installing testing-test.
Generated script '/tmp/tarmac/branch.thqC9S/bin/test.testing'.
make -C acceptance clean
make[1]: Entering directory `/tmp/tarmac/branch.thqC9S/acceptance'
rm -f -r source build *.build *.changes *.deb
make[1]: Leaving directory `/tmp/tarmac/branch.thqC9S/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 src/maasserver/static/css/maas-styles.css
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/maasserver/static/js/enums.js
pyscss src/maasserver/static/scss/maas-styles.scss -o src/maasserver/static/css/maas-styles.css --no-compress --load-path=src/maasserver/static/scss
bin/buildout install region
Updating region.
bin/buildout install region
Updating region.
bin/buildout install region-test
Updating region-test.
echo bin/test.cli bin/test.cluster bin/test.config bin/test.js bin/test.region bin/test.testing | xargs -n1 env
INFO [karma]: Karma v0.12.31 server started at http://localhost:9876/
INFO [launcher]: Starting browser Chrome
INFO [launcher]: Starting browser Firefox
INFO [launcher]: Starting browser PhantomJS
INFO [PhantomJS 1.9.8 (Linux)]: Connected on socket FZgur2u5yClD52Kujuau with id 36930617
INFO [Chromium 40.0.2214 (Ubuntu)]: Connected on socket Rczec9a3XUiuEWkWjuav with id 91478592
INFO [Firefox 36.0.0 (Ubuntu)]: Connected on socket 5iUDCFN14MgbB261juaw with id 85117566

nosetests --exclude=provisioningserver --exclude=maastesting --exclude=maascli --logging-level=INFO --logging-clear-handlers --verbosity=1
Creating test database for alias 'default'...
Destroying test database for alias 'default'...

npm WARN optional dep failed, continuing fsevents@0.3.5
...............................................................................................................................
----------------------------------------------------------------------
Ran 127 tests in 1.989s

OK
.........................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................S..................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................
----------------------------------------------------------------------
Ran 1836 tests in 16.116s

OK (SKIP=1)
..............................................
----------------------------------------------------------------------
Ran 46 tests in 0.360s

OK
.....S..................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................S.................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................No handlers could be found for logger "django.request"
......................................................................................................................................................................................................................................................................................S..............................................................................................................................................................................................................................................................................................................................................................................................................................................E.........................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................S.....................................................................................................................................................................S.....................................................................................................................
======================================================================
ERROR: maasserver.tests.test_forms_bulknodeaction.TestBulkNodeActionForm.test_gives_stat_when_no_permission
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/usr/lib/python2.7/dist-packages/django/test/testcases.py", line 187, in __call__
    self._post_teardown()
  File "/usr/lib/python2.7/dist-packages/django/test/testcases.py", line 796, in _post_teardown
    self._fixture_teardown()
  File "/tmp/tarmac/branch.thqC9S/src/maastesting/djangotestcase.py", line 117, in _fixture_teardown
    django.test.TransactionTestCase._fixture_teardown(self)
  File "/usr/lib/python2.7/dist-packages/django/test/testcases.py", line 817, in _fixture_teardown
    inhibit_post_syncdb=self.available_apps is not None)
  File "/usr/lib/python2.7/dist-packages/django/core/management/__init__.py", line 159, in call_command
    return klass.execute(*args, **defaults)
  File "/usr/lib/python2.7/dist-packages/django/core/management/base.py", line 285, in execute
    output = self.handle(*args, **options)
  File "/usr/lib/python2.7/dist-packages/django/core/management/base.py", line 415, in handle
    return self.handle_noargs(**options)
  File "/usr/lib/python2.7/dist-packages/django/core/management/commands/flush.py", line 78, in handle_noargs
    six.reraise(CommandError, CommandError(new_msg), sys.exc_info()[2])
  File "/usr/lib/python2.7/dist-packages/django/core/management/commands/flush.py", line 69, in handle_noargs
    cursor.execute(sql)
  File "/usr/lib/python2.7/dist-packages/django/db/backends/util.py", line 53, in execute
    return self.cursor.execute(sql, params)
  File "/usr/lib/python2.7/dist-packages/django/db/utils.py", line 99, in __exit__
    six.reraise(dj_exc_type, dj_exc_value, traceback)
  File "/usr/lib/python2.7/dist-packages/django/db/backends/util.py", line 51, in execute
    return self.cursor.execute(sql)
CommandError: Database test_maas couldn't be flushed. Possible reasons:
  * The database isn't running or isn't configured correctly.
  * At least one of the expected database tables doesn't exist.
  * The SQL was invalid.
Hint: Look at the output of 'django-admin.py sqlflush'. That's the SQL this command wasn't able to run.
The full error: deadlock detected
DETAIL:  Process 18806 waits for AccessExclusiveLock on relation 16510 of database 16385; blocked by process 18807.
Process 18807 waits for AccessShareLock on relation 16476 of database 16385; blocked by process 18806.
HINT:  See server log for query details.

-------------------- >> begin captured logging << --------------------
maas.bootsources: INFO: Updated boot sources cache.
maas.bootsources: INFO: Updated boot sources cache.
--------------------- >> end captured logging << ---------------------

----------------------------------------------------------------------
Ran 4258 tests in 370.649s

FAILED (SKIP=5, errors=1)
.............................................................S........................................................................................
----------------------------------------------------------------------
Ran 150 tests in 32.343s

OK (SKIP=1)
make: *** [test] Error 123

1	=== modified file 'etc/maas/templates/commissioning-user-data/snippets/maas_enlist.sh'
2	--- etc/maas/templates/commissioning-user-data/snippets/maas_enlist.sh 2015-01-15 01:36:33 +0000
3	+++ etc/maas/templates/commissioning-user-data/snippets/maas_enlist.sh 2015-02-26 15:25:12 +0000
4	@@ -199,10 +199,10 @@
5	serverurl="maas.local"
6	servername="$serverurl"
7	fi
8	-if echo "$serverurl" \| egrep -q '(^[a-z]+://\|^)[a-z0-9\.]+($\|/$)'; then
9	+if echo "$serverurl" \| egrep -q '(^[a-z]+://\|^)[a-z0-9\.\-]+($\|/$)'; then
10	api_url="MAAS/api/1.0/nodes/"
11	else
12	- api_url=`echo $serverurl \| sed 's#^\(\\|[a-z]\+://\)[a-zA-Z0-9\.]\+\(\\|\:[0-9]\+\)/##'`
13	+ api_url=`echo $serverurl \| sed 's#^\(\\|[a-z]\+://\)[a-zA-Z0-9\.\-]\+\(\\|\:[0-9]\+\)/##'`
14	fi
15
16	#TODO: Auto-detect hostname?

MAAS

Merge lp:~martin-nowack/maas/fix-enlistment into lp:~maas-committers/maas/trunk

Commit message

Description of the change

Preview Diff

Subscribers