Merge into 1.5 : no-trusty-rc-image-1.5 : Code : MAAS

Status:

Merged

Approved by:

Raphaël Badin on 2014-04-23

Approved revision:

no longer in the source branch.

Merged at revision:

2260

Proposed branch:

lp:~rvb/maas/no-trusty-rc-image-1.5

Merge into:

lp:maas/1.5

Diff against target:

25 lines (+2/-2)

2 files modified

etc/maas/bootresources.yaml (+1/-1)
src/provisioningserver/tests/test_config.py (+1/-1)

To merge this branch:

bzr merge lp:~rvb/maas/no-trusty-rc-image-1.5

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Julian Edwards (community)		2014-04-22	Approve on 2014-04-23
Review via email: mp+216738@code.launchpad.net

Commit message

Do not import Trusty's 'rc' images by default.

Description of the change

This was a temporary measure while we were waiting for the 'release' images to be released. Now that they have been released, MAAS shouldn't import the 'rc' images by default.

Revision history for this message

Julian Edwards (julian-edwards) on 2014-04-23:

#

review: Approve

Revision history for this message

MAAS Lander (maas-lander) wrote on 2014-04-23:

#

Download full text (18.4 KiB)

The attempt to merge lp:~rvb/maas/no-trusty-rc-image-1.5 into lp:maas/1.5 failed. Below is the output from the failed tests.

Ign http://security.ubuntu.com trusty-security InRelease
Get:1 http://security.ubuntu.com trusty-security Release.gpg [933 B]
Get:2 http://security.ubuntu.com trusty-security Release [58.5 kB]
Ign http://nova.clouds.archive.ubuntu.com trusty InRelease
Ign http://nova.clouds.archive.ubuntu.com trusty-updates InRelease
Hit http://nova.clouds.archive.ubuntu.com trusty Release.gpg
Get:3 http://nova.clouds.archive.ubuntu.com trusty-updates Release.gpg [933 B]
Hit http://nova.clouds.archive.ubuntu.com trusty Release
Get:4 http://nova.clouds.archive.ubuntu.com trusty-updates Release [58.5 kB]
Get:5 http://security.ubuntu.com trusty-security/main Sources [972 B]
Hit http://nova.clouds.archive.ubuntu.com trusty/main Sources
Get:6 http://security.ubuntu.com trusty-security/universe Sources [14 B]
Get:7 http://security.ubuntu.com trusty-security/main amd64 Packages [971 B]
Hit http://nova.clouds.archive.ubuntu.com trusty/universe Sources
Hit http://nova.clouds.archive.ubuntu.com trusty/main amd64 Packages
Get:8 http://security.ubuntu.com trusty-security/universe amd64 Packages [14 B]
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://security.ubuntu.com trusty-security/main Translation-en
Hit http://security.ubuntu.com trusty-security/universe Translation-en
Get:9 http://nova.clouds.archive.ubuntu.com trusty-updates/main Sources [3,407 B]
Get:10 http://nova.clouds.archive.ubuntu.com trusty-updates/universe Sources [648 B]
Get:11 http://nova.clouds.archive.ubuntu.com trusty-updates/main amd64 Packages [10.1 kB]
Get:12 http://nova.clouds.archive.ubuntu.com trusty-updates/universe amd64 Packages [1,602 B]
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://security.ubuntu.com trusty-security/main Translation-en_US
Ign http://security.ubuntu.com trusty-security/universe Translation-en_US
Ign http://nova.clouds.archive.ubuntu.com trusty/main Translation-en_US
Ign http://nova.clouds.archive.ubuntu.com trusty/universe Translation-en_US
Ign http://nova.clouds.archive.ubuntu.com trusty-updates/main Translation-en_US
Ign http://nova.clouds.archive.ubuntu.com trusty-updates/universe Translation-en_US
Fetched 137 kB in 0s (561 kB/s)
Reading package lists...
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
--no-install-recommends install apache2 bind9 bind9utils build-essential bzr-builddeb curl daemontools debhelper dh-apport distro-info dnsutils firefox freeipmi-tools ipython isc-dhcp-common libjs-raphael libjs-yui3-full libjs-yui3-min libpq-dev make postgresql python-amqplib python-bzrlib python-celery 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-formencode python-httplib2 python-jinja2 python-jsonschem...

The attempt to merge lp:~rvb/maas/no-trusty-rc-image-1.5 into lp:maas/1.5 failed. Below is the output from the failed tests.

Ign http://security.ubuntu.com trusty-security InRelease
Get:1 http://security.ubuntu.com trusty-security Release.gpg [933 B]
Get:2 http://security.ubuntu.com trusty-security Release [58.5 kB]
Ign http://nova.clouds.archive.ubuntu.com trusty InRelease
Ign http://nova.clouds.archive.ubuntu.com trusty-updates InRelease
Hit http://nova.clouds.archive.ubuntu.com trusty Release.gpg
Get:3 http://nova.clouds.archive.ubuntu.com trusty-updates Release.gpg [933 B]
Hit http://nova.clouds.archive.ubuntu.com trusty Release
Get:4 http://nova.clouds.archive.ubuntu.com trusty-updates Release [58.5 kB]
Get:5 http://security.ubuntu.com trusty-security/main Sources [972 B]
Hit http://nova.clouds.archive.ubuntu.com trusty/main Sources
Get:6 http://security.ubuntu.com trusty-security/universe Sources [14 B]
Get:7 http://security.ubuntu.com trusty-security/main amd64 Packages [971 B]
Hit http://nova.clouds.archive.ubuntu.com trusty/universe Sources
Hit http://nova.clouds.archive.ubuntu.com trusty/main amd64 Packages
Get:8 http://security.ubuntu.com trusty-security/universe amd64 Packages [14 B]
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://security.ubuntu.com trusty-security/main Translation-en
Hit http://security.ubuntu.com trusty-security/universe Translation-en
Get:9 http://nova.clouds.archive.ubuntu.com trusty-updates/main Sources [3,407 B]
Get:10 http://nova.clouds.archive.ubuntu.com trusty-updates/universe Sources [648 B]
Get:11 http://nova.clouds.archive.ubuntu.com trusty-updates/main amd64 Packages [10.1 kB]
Get:12 http://nova.clouds.archive.ubuntu.com trusty-updates/universe amd64 Packages [1,602 B]
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://security.ubuntu.com trusty-security/main Translation-en_US
Ign http://security.ubuntu.com trusty-security/universe Translation-en_US
Ign http://nova.clouds.archive.ubuntu.com trusty/main Translation-en_US
Ign http://nova.clouds.archive.ubuntu.com trusty/universe Translation-en_US
Ign http://nova.clouds.archive.ubuntu.com trusty-updates/main Translation-en_US
Ign http://nova.clouds.archive.ubuntu.com trusty-updates/universe Translation-en_US
Fetched 137 kB in 0s (561 kB/s)
Reading package lists...
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
	    --no-install-recommends install apache2 bind9 bind9utils build-essential bzr-builddeb curl daemontools debhelper dh-apport distro-info dnsutils firefox freeipmi-tools ipython isc-dhcp-common libjs-raphael libjs-yui3-full libjs-yui3-min libpq-dev make postgresql python-amqplib python-bzrlib python-celery 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-formencode python-httplib2 python-jinja2 python-jsonschema 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-seamicroclient python-simplestreams python-sphinx python-tempita python-twisted python-txamqp python-txlongpoll python-txtftp 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.
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.
debhelper is already the newest version.
dh-apport 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 is already the newest version.
python-amqplib 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-crochet is already the newest version.
python-curtin 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-formencode is already the newest version.
python-httplib2 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-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-seamicroclient 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-txtftp 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.
bzr-builddeb 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.
The following package was automatically installed and is no longer required:
  librabbitmq1
Use 'apt-get autoremove' to remove it.
Suggested packages:
  python-psycopg python-mysqldb python-flup python-sqlite
  geoip-database-contrib python-django-doc bpython libgdal1
The following packages will be upgraded:
  python-django
1 upgraded, 0 newly installed, 0 to remove and 130 not upgraded.
Need to get 2,211 kB of archives.
After this operation, 0 B of additional disk space will be used.
Get:1 http://nova.clouds.archive.ubuntu.com/ubuntu/ trusty-updates/main python-django all 1.6.1-2ubuntu0.2 [2,211 kB]
Fetched 2,211 kB in 0s (22.3 MB/s)
(Reading database ... 100050 files and directories currently installed.)
Preparing to unpack .../python-django_1.6.1-2ubuntu0.2_all.deb ...
Unpacking python-django (1.6.1-2ubuntu0.2) over (1.6.1-2ubuntu0.1) ...
Processing triggers for man-db (2.6.6-1) ...
Setting up python-django (1.6.1-2ubuntu0.2) ...
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
	    purge python-librabbitmq
Reading package lists...
Building dependency tree...
Reading state information...
Package 'python-librabbitmq' is not installed, so not removed
The following package was automatically installed and is no longer required:
  librabbitmq1
Use 'apt-get autoremove' to remove it.
0 upgraded, 0 newly installed, 0 to remove and 130 not upgraded.
make -C acceptance clean
make[1]: Entering directory `/tmp/tarmac/branch.Yv0Xh6/acceptance'
rm -f -r source build *.build *.changes *.deb
make[1]: Leaving directory `/tmp/tarmac/branch.Yv0Xh6/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 /tmp/tarmac/branch.Yv0Xh6
New python executable in /tmp/tarmac/branch.Yv0Xh6/bin/python2.7
Also creating executable in /tmp/tarmac/branch.Yv0Xh6/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.Yv0Xh6/parts'.
Creating directory '/tmp/tarmac/branch.Yv0Xh6/develop-eggs'.
Installing database.
Generated script '/tmp/tarmac/branch.Yv0Xh6/bin/database'.
bin/buildout install repl
Installing repl.
Generated script '/tmp/tarmac/branch.Yv0Xh6/bin/ipy'.
Generated interpreter '/tmp/tarmac/branch.Yv0Xh6/bin/py'.
bin/py -m src/maasserver/utils/jsenums src/maasserver/enum.py src/metadataserver/enum.py > src/maasserver/static/js/enums.js
bin/buildout install maas
Installing maas.
Generated script '/tmp/tarmac/branch.Yv0Xh6/bin/celeryd.region'.
Generated script '/tmp/tarmac/branch.Yv0Xh6/bin/maas-region-admin'.
bin/buildout install maas-test
Installing maas-test.
Generated script '/tmp/tarmac/branch.Yv0Xh6/bin/test.maas'.
bin/buildout install maascli
Installing maascli.
Generated script '/tmp/tarmac/branch.Yv0Xh6/bin/maas'.
bin/buildout install maascli-test
Installing maascli-test.
Generated script '/tmp/tarmac/branch.Yv0Xh6/bin/test.maascli'.
bin/buildout install maastesting-test
Installing maastesting-test.
Generated script '/tmp/tarmac/branch.Yv0Xh6/bin/test.maastesting'.
bin/buildout install pserv
Installing pserv.
Generated script '/tmp/tarmac/branch.Yv0Xh6/bin/celeryd.cluster'.
Generated script '/tmp/tarmac/branch.Yv0Xh6/bin/maas-provision'.
Generated script '/tmp/tarmac/branch.Yv0Xh6/bin/twistd.pserv'.
bin/buildout install pserv-test
Installing pserv-test.
Generated script '/tmp/tarmac/branch.Yv0Xh6/bin/test.pserv'.
bin/buildout install config-test
Installing config-test.
Generated script '/tmp/tarmac/branch.Yv0Xh6/bin/test.config'.
bin/buildout install maas-probe-dhcp
Installing maas-probe-dhcp.
Generated script '/tmp/tarmac/branch.Yv0Xh6/bin/maas-probe-dhcp'.
bin/buildout install txlongpoll
Installing txlongpoll.
Generated script '/tmp/tarmac/branch.Yv0Xh6/bin/twistd.txlongpoll'.
make -C acceptance clean
make[1]: Entering directory `/tmp/tarmac/branch.Yv0Xh6/acceptance'
rm -f -r source build *.build *.changes *.deb
make[1]: Leaving directory `/tmp/tarmac/branch.Yv0Xh6/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/maasserver/static/js/enums.js
bin/buildout install maas
Updating maas.
bin/buildout install maas-test
Updating maas-test.
bin/buildout install maas
Updating maas.
echo bin/test.config bin/test.maas bin/test.maascli bin/test.maastesting bin/test.pserv | xargs -n1 env
nosetests --exclude=provisioningserver --exclude=maastesting --exclude=maascli --verbosity=1
Creating test database for alias 'default'...
Destroying test database for alias 'default'...

..............................................
----------------------------------------------------------------------
Ran 46 tests in 0.583s

OK
..S........................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................S..............................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................
----------------------------------------------------------------------
Ran 2410 tests in 336.230s

OK (SKIP=2)
...........................................................................................................
----------------------------------------------------------------------
Ran 107 tests in 1.896s

OK
........................................................S..S.....................................................................
----------------------------------------------------------------------
Ran 129 tests in 2.187s

OK (SKIP=2)
..............................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................SSSS..............F........................................................................................................................................................................................................................
======================================================================
FAIL: provisioningserver.tests.test_config.TestBootConfig.test_load_example
----------------------------------------------------------------------
_StringException: Traceback (most recent call last):
  File "/tmp/tarmac/branch.Yv0Xh6/src/provisioningserver/tests/test_config.py", line 494, in test_load_example
    BootConfig.load(filename))
  File "/home/ubuntu/.buildout/eggs/testtools-0.9.34-py2.7.egg/testtools/testcase.py", line 324, in assertEqual
    self.assertThat(observed, matcher, message)
  File "/home/ubuntu/.buildout/eggs/testtools-0.9.34-py2.7.egg/testtools/testcase.py", line 414, in assertThat
    raise MismatchError(matchee, matcher, mismatch, verbose)
MismatchError: !=:
reference = {u'boot': {u'configure_me': True,
           u'sources': [{u'keyring': u'/usr/share/keyrings/ubuntu-cloudimage-keyring.gpg',
                         u'path': u'http://maas.ubuntu.com/images/ephemeral-v2/releases/',
                         u'selections': [{u'arches': [u'i386', u'amd64'],
                                          u'labels': [u'release', u'rc'],
                                          u'release': u'trusty',
                                          u'subarches': [u'generic']},
                                         {u'arches': [u'i386', u'amd64'],
                                          u'labels': [u'release'],
                                          u'release': u'precise',
                                          u'subarches': [u'generic']}]}],
           u'storage': u'/var/lib/maas/boot-resources/'}}
actual    = {'boot': {'configure_me': True,
          'sources': [{'keyring': '/usr/share/keyrings/ubuntu-cloudimage-keyring.gpg',
                       'path': 'http://maas.ubuntu.com/images/ephemeral-v2/releases/',
                       'selections': [{'arches': ['i386', 'amd64'],
                                       'labels': ['release'],
                                       'release': 'trusty',
                                       'subarches': ['generic']},
                                      {'arches': ['i386', 'amd64'],
                                       'labels': ['release'],
                                       'release': 'precise',
                                       'subarches': ['generic']}]}],
          'storage': '/var/lib/maas/boot-resources/'}}

----------------------------------------------------------------------
Ran 761 tests in 23.836s

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

1	=== modified file 'etc/maas/bootresources.yaml'
2	--- etc/maas/bootresources.yaml 2014-04-11 02:23:42 +0000
3	+++ etc/maas/bootresources.yaml 2014-04-23 07:09:57 +0000
4	@@ -58,7 +58,7 @@
5	- release: "trusty"
6	arches: ["i386", "amd64"]
7	subarches: ["generic"]
8	- labels: ["release", "rc"]
9	+ labels: ["release"]
10	- release: "precise"
11	arches: ["i386", "amd64"]
12	subarches: ["generic"]
13
14	=== modified file 'src/provisioningserver/tests/test_config.py'
15	--- src/provisioningserver/tests/test_config.py 2014-04-11 02:23:42 +0000
16	+++ src/provisioningserver/tests/test_config.py 2014-04-23 07:09:57 +0000
17	@@ -465,7 +465,7 @@
18	'arches': ['i386', 'amd64'],
19	'release': 'trusty',
20	'subarches': ['generic'],
21	- 'labels': ['release', 'rc'],
22	+ 'labels': ['release'],
23	},
24	{
25	'arches': ['i386', 'amd64'],

MAAS

Merge lp:~rvb/maas/no-trusty-rc-image-1.5 into lp:maas/1.5

Commit message

Description of the change

Preview Diff

Subscribers