Merge into trunk : trunk-use-even-more-beef : Code : adt-cloud-worker

Status:	Superseded
Proposed branch:	lp:~thomir-deactivatedaccount/adt-cloud-worker/trunk-use-even-more-beef
Merge into:	lp:adt-cloud-worker
Diff against target:	12 lines (+1/-1) 1 file modified adt_cloud_worker/_cloud_support.py (+1/-1)
To merge this branch:	bzr merge lp:~thomir-deactivatedaccount/adt-cloud-worker/trunk-use-even-more-beef
Related bugs:	Link a bug report

Reviewer	Date Requested	Status
Celso Providelo (community)	2015-04-22	Approve on 2015-04-23
Francis Ginther		Approve on 2015-04-22
Review via email: mp+257174@code.launchpad.net

This proposal has been superseded by a proposal from 2015-04-23.

Commit message

Bump the default instance flavour to cpu2-ram2-disk50.

Description of the change

Bump the default instance flavour to contain 400% more beef. Moooooooo!

Revision history for this message

Celso Providelo (cprov) wrote on 2015-04-22:

#

Thomi,

What do you think about dropping the flavor-logic entirely and use config.adt.flavor instead ?

review: Needs Information

Revision history for this message

Thomi Richards (thomir-deactivatedaccount) wrote on 2015-04-22:

#

Celso,

I thought about it, but this represents the smallest change required to get us the behaviour we need.

Also, I remember a discussion with you where we said it was easier to deploy code changes than config changes. What does using the config file get us, in that case?

Perhaps in the future we should rely on config file more though....

I'm easy either way. Let me know what you think.

Revision history for this message

Celso Providelo (cprov) wrote on 2015-04-22:

#

Thomi,

Yes, I continue to stand for code changes instead of config changes, but in this case it's a cloud-dependent option, i.e PS4 gets cpu2-ram2-disk50 but bootstack/canonistack get m1.small (or similar). We cannot hardcode it.

And despite of the fact that all the logic behind flavor discovering we landed being correct (custom -> default -> first) we never used it. So, that's why I'm suggesting it do be dropped.

Revision history for this message

Francis Ginther (fginther) wrote on 2015-04-22:

#

This is indeed the smallest possible change. It could be stripped down further, but I would not be surprised if this needs an additional update after some more proposed-migration surprises.

review: Approve

Revision history for this message

Celso Providelo (cprov) wrote on 2015-04-23:

#

Francis and Thomi,

I agree on stripping down the get_default_flavor() logic later.

review: Approve

Revision history for this message

Ubuntu CI Bot (uci-bot) wrote on 2015-04-23:

#

Download full text (22.6 KiB)

The attempt to merge lp:~thomir/adt-cloud-worker/trunk-use-even-more-beef into lp:adt-cloud-worker failed. Below is the output from the failed tests.

Using base prefix '/usr'
New python executable in /tmp/venv-adt-cloud-worker2g3yrp76/bin/python3
Also creating executable in /tmp/venv-adt-cloud-worker2g3yrp76/bin/python
Installing setuptools, pip...done.
Running virtualenv with interpreter /usr/bin/python3
Ignoring indexes: https://pypi.python.org/simple/
Downloading/unpacking kombu==3.0.24 (from -r requirements.txt (line 1))
Downloading/unpacking python-keystoneclient==1.2.0 (from -r requirements.txt (line 2))
Downloading/unpacking python-logstash==0.4.2 (from -r requirements.txt (line 3))
Running setup.py (path:/tmp/venv-adt-cloud-worker2g3yrp76/build/python-logstash/setup.py) egg_info for package python-logstash

Downloading/unpacking python-novaclient==2.22.0 (from -r requirements.txt (line 4))
Downloading/unpacking python-swiftclient==2.3.1 (from -r requirements.txt (line 5))
Downloading/unpacking anyjson>=0.3.3 (from kombu==3.0.24->-r requirements.txt (line 1))
Running setup.py (path:/tmp/venv-adt-cloud-worker2g3yrp76/build/anyjson/setup.py) egg_info for package anyjson

Downloading/unpacking amqp>=1.4.5,<2.0 (from kombu==3.0.24->-r requirements.txt (line 1))
Running setup.py (path:/tmp/venv-adt-cloud-worker2g3yrp76/build/amqp/setup.py) egg_info for package amqp

Downloading/unpacking six>=1.9.0 (from python-keystoneclient==1.2.0->-r requirements.txt (line 2))
Downloading/unpacking Babel>=1.3 (from python-keystoneclient==1.2.0->-r requirements.txt (line 2))
Running setup.py (path:/tmp/venv-adt-cloud-worker2g3yrp76/build/Babel/setup.py) egg_info for package Babel

    warning: no previously-included files matching '*' found under directory 'docs/_build'
    warning: no previously-included files matching '*.pyc' found under directory 'tests'
    warning: no previously-included files matching '*.pyo' found under directory 'tests'
Downloading/unpacking iso8601>=0.1.9 (from python-keystoneclient==1.2.0->-r requirements.txt (line 2))
Downloading/unpacking PrettyTable>=0.7,<0.8 (from python-keystoneclient==1.2.0->-r requirements.txt (line 2))
  Running setup.py (path:/tmp/venv-adt-cloud-worker2g3yrp76/build/PrettyTable/setup.py) egg_info for package PrettyTable

Downloading/unpacking netaddr>=0.7.12 (from python-keystoneclient==1.2.0->-r requirements.txt (line 2))
Downloading/unpacking argparse (from python-keystoneclient==1.2.0->-r requirements.txt (line 2))
Downloading/unpacking oslo.serialization>=1.2.0 (from python-keystoneclient==1.2.0->-r requirements.txt (line 2))
Downloading/unpacking stevedore>=1.1.0 (from python-keystoneclient==1.2.0->-r requirements.txt (line 2))
Downloading/unpacking requests>=2.2.0,!=2.4.0 (from python-keystoneclient==1.2.0->-r requirements.txt (line 2))
Downloading/unpacking oslo.i18n>=1.3.0 (from python-keystoneclient==1.2.0->-r requirements.txt (line 2))
Downloading/unpacking oslo.config>=1.6.0 (from python-keystoneclient==1.2.0->-r requirements.txt (line 2))
Downloading/unpacking oslo.utils>=1.2.0 (from python-keystoneclient==1.2.0->-r requirements.txt (line 2))
Downloading/unpackin...

The attempt to merge lp:~thomir/adt-cloud-worker/trunk-use-even-more-beef into lp:adt-cloud-worker failed. Below is the output from the failed tests.

Using base prefix '/usr'
New python executable in /tmp/venv-adt-cloud-worker2g3yrp76/bin/python3
Also creating executable in /tmp/venv-adt-cloud-worker2g3yrp76/bin/python
Installing setuptools, pip...done.
Running virtualenv with interpreter /usr/bin/python3
Ignoring indexes: https://pypi.python.org/simple/
Downloading/unpacking kombu==3.0.24 (from -r requirements.txt (line 1))
Downloading/unpacking python-keystoneclient==1.2.0 (from -r requirements.txt (line 2))
Downloading/unpacking python-logstash==0.4.2 (from -r requirements.txt (line 3))
  Running setup.py (path:/tmp/venv-adt-cloud-worker2g3yrp76/build/python-logstash/setup.py) egg_info for package python-logstash
    
Downloading/unpacking python-novaclient==2.22.0 (from -r requirements.txt (line 4))
Downloading/unpacking python-swiftclient==2.3.1 (from -r requirements.txt (line 5))
Downloading/unpacking anyjson>=0.3.3 (from kombu==3.0.24->-r requirements.txt (line 1))
  Running setup.py (path:/tmp/venv-adt-cloud-worker2g3yrp76/build/anyjson/setup.py) egg_info for package anyjson
    
Downloading/unpacking amqp>=1.4.5,<2.0 (from kombu==3.0.24->-r requirements.txt (line 1))
  Running setup.py (path:/tmp/venv-adt-cloud-worker2g3yrp76/build/amqp/setup.py) egg_info for package amqp
    
Downloading/unpacking six>=1.9.0 (from python-keystoneclient==1.2.0->-r requirements.txt (line 2))
Downloading/unpacking Babel>=1.3 (from python-keystoneclient==1.2.0->-r requirements.txt (line 2))
  Running setup.py (path:/tmp/venv-adt-cloud-worker2g3yrp76/build/Babel/setup.py) egg_info for package Babel
    
    warning: no previously-included files matching '*' found under directory 'docs/_build'
    warning: no previously-included files matching '*.pyc' found under directory 'tests'
    warning: no previously-included files matching '*.pyo' found under directory 'tests'
Downloading/unpacking iso8601>=0.1.9 (from python-keystoneclient==1.2.0->-r requirements.txt (line 2))
Downloading/unpacking PrettyTable>=0.7,<0.8 (from python-keystoneclient==1.2.0->-r requirements.txt (line 2))
  Running setup.py (path:/tmp/venv-adt-cloud-worker2g3yrp76/build/PrettyTable/setup.py) egg_info for package PrettyTable
    
Downloading/unpacking netaddr>=0.7.12 (from python-keystoneclient==1.2.0->-r requirements.txt (line 2))
Downloading/unpacking argparse (from python-keystoneclient==1.2.0->-r requirements.txt (line 2))
Downloading/unpacking oslo.serialization>=1.2.0 (from python-keystoneclient==1.2.0->-r requirements.txt (line 2))
Downloading/unpacking stevedore>=1.1.0 (from python-keystoneclient==1.2.0->-r requirements.txt (line 2))
Downloading/unpacking requests>=2.2.0,!=2.4.0 (from python-keystoneclient==1.2.0->-r requirements.txt (line 2))
Downloading/unpacking oslo.i18n>=1.3.0 (from python-keystoneclient==1.2.0->-r requirements.txt (line 2))
Downloading/unpacking oslo.config>=1.6.0 (from python-keystoneclient==1.2.0->-r requirements.txt (line 2))
Downloading/unpacking oslo.utils>=1.2.0 (from python-keystoneclient==1.2.0->-r requirements.txt (line 2))
Downloading/unpacking pbr>=0.6,!=0.7,<1.0 (from python-keystoneclient==1.2.0->-r requirements.txt (line 2))
Downloading/unpacking simplejson>=2.2.0 (from python-novaclient==2.22.0->-r requirements.txt (line 4))
  Running setup.py (path:/tmp/venv-adt-cloud-worker2g3yrp76/build/simplejson/setup.py) egg_info for package simplejson
    
Downloading/unpacking futures>=2.1.3 (from python-swiftclient==2.3.1->-r requirements.txt (line 5))
Downloading/unpacking pytz>=0a (from Babel>=1.3->python-keystoneclient==1.2.0->-r requirements.txt (line 2))
Downloading/unpacking msgpack-python>=0.4.0 (from oslo.serialization>=1.2.0->python-keystoneclient==1.2.0->-r requirements.txt (line 2))
  Running setup.py (path:/tmp/venv-adt-cloud-worker2g3yrp76/build/msgpack-python/setup.py) egg_info for package msgpack-python
    
Downloading/unpacking netifaces>=0.10.4 (from oslo.utils>=1.2.0->python-keystoneclient==1.2.0->-r requirements.txt (line 2))
  Running setup.py (path:/tmp/venv-adt-cloud-worker2g3yrp76/build/netifaces/setup.py) egg_info for package netifaces
    
Requirement already satisfied (use --upgrade to upgrade): pip in /tmp/venv-adt-cloud-worker2g3yrp76/lib/python3.4/site-packages (from pbr>=0.6,!=0.7,<1.0->python-keystoneclient==1.2.0->-r requirements.txt (line 2))
Installing collected packages: kombu, python-keystoneclient, python-logstash, python-novaclient, python-swiftclient, anyjson, amqp, six, Babel, iso8601, PrettyTable, netaddr, argparse, oslo.serialization, stevedore, requests, oslo.i18n, oslo.config, oslo.utils, pbr, simplejson, futures, pytz, msgpack-python, netifaces
  Running setup.py install for python-logstash
    
  Running setup.py install for anyjson
    Fixing build/lib/anyjson/__init__.py
    Skipping implicit fixer: buffer
    Skipping implicit fixer: idioms
    Skipping implicit fixer: set_literal
    Skipping implicit fixer: ws_comma
    Fixing build/lib/anyjson/__init__.py
    Skipping implicit fixer: buffer
    Skipping implicit fixer: idioms
    Skipping implicit fixer: set_literal
    Skipping implicit fixer: ws_comma
    
  Running setup.py install for amqp
    
  Running setup.py install for Babel
    
    warning: no previously-included files matching '*' found under directory 'docs/_build'
    warning: no previously-included files matching '*.pyc' found under directory 'tests'
    warning: no previously-included files matching '*.pyo' found under directory 'tests'
    Installing pybabel script to /tmp/venv-adt-cloud-worker2g3yrp76/bin
  Running setup.py install for PrettyTable
    
  Running setup.py install for simplejson
    building 'simplejson._speedups' extension
    x86_64-linux-gnu-gcc -pthread -DNDEBUG -g -fwrapv -O2 -Wall -Wstrict-prototypes -g -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security -D_FORTIFY_SOURCE=2 -fPIC -I/usr/include/python3.4m -I/tmp/venv-adt-cloud-worker2g3yrp76/include/python3.4m -c simplejson/_speedups.c -o build/temp.linux-x86_64-3.4/simplejson/_speedups.o
    x86_64-linux-gnu-gcc -pthread -shared -Wl,-O1 -Wl,-Bsymbolic-functions -Wl,-Bsymbolic-functions -Wl,-z,relro -Wl,-Bsymbolic-functions -Wl,-z,relro -g -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security -D_FORTIFY_SOURCE=2 build/temp.linux-x86_64-3.4/simplejson/_speedups.o -o build/lib.linux-x86_64-3.4/simplejson/_speedups.cpython-34m.so
    
  Running setup.py install for msgpack-python
    building 'msgpack._packer' extension
    x86_64-linux-gnu-gcc -pthread -DNDEBUG -g -fwrapv -O2 -Wall -Wstrict-prototypes -g -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security -D_FORTIFY_SOURCE=2 -fPIC -D__LITTLE_ENDIAN__=1 -I. -I/usr/include/python3.4m -I/tmp/venv-adt-cloud-worker2g3yrp76/include/python3.4m -c msgpack/_packer.cpp -o build/temp.linux-x86_64-3.4/msgpack/_packer.o
    cc1plus: warning: command line option ‘-Wstrict-prototypes’ is valid for C/ObjC but not for C++ [enabled by default]
    x86_64-linux-gnu-g++ -pthread -shared -Wl,-O1 -Wl,-Bsymbolic-functions -Wl,-Bsymbolic-functions -Wl,-z,relro -Wl,-Bsymbolic-functions -Wl,-z,relro -g -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security -D_FORTIFY_SOURCE=2 build/temp.linux-x86_64-3.4/msgpack/_packer.o -o build/lib.linux-x86_64-3.4/msgpack/_packer.cpython-34m.so
    building 'msgpack._unpacker' extension
    x86_64-linux-gnu-gcc -pthread -DNDEBUG -g -fwrapv -O2 -Wall -Wstrict-prototypes -g -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security -D_FORTIFY_SOURCE=2 -fPIC -D__LITTLE_ENDIAN__=1 -I. -I/usr/include/python3.4m -I/tmp/venv-adt-cloud-worker2g3yrp76/include/python3.4m -c msgpack/_unpacker.cpp -o build/temp.linux-x86_64-3.4/msgpack/_unpacker.o
    cc1plus: warning: command line option ‘-Wstrict-prototypes’ is valid for C/ObjC but not for C++ [enabled by default]
    msgpack/_unpacker.pyx: In function ‘PyObject* __pyx_pf_7msgpack_9_unpacker_2unpackb(PyObject*, PyObject*, PyObject*, PyObject*, int, PyObject*, PyObject*, PyObject*, PyObject*, Py_ssize_t, Py_ssize_t, Py_ssize_t, Py_ssize_t, Py_ssize_t)’:
    msgpack/_unpacker.pyx:141:33: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
             if off < buf_len:
                                     ^
    msgpack/_unpacker.pyx: In function ‘PyObject* __pyx_f_7msgpack_9_unpacker_8Unpacker_read_from_file(__pyx_obj_7msgpack_9_unpacker_Unpacker*)’:
    msgpack/_unpacker.pyx:367:21: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
                         self.max_buffer_size - (self.buf_tail - self.buf_head)
                         ^
    msgpack/_unpacker.pyx: In function ‘PyObject* __pyx_pf_7msgpack_9_unpacker_8Unpacker_8read_bytes(__pyx_obj_7msgpack_9_unpacker_Unpacker*, Py_ssize_t)’:
    msgpack/_unpacker.pyx:412:21: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
             nread = min(self.buf_tail - self.buf_head, nbytes)
                         ^
    In file included from msgpack/unpack.h:278:0,
                     from msgpack/_unpacker.cpp:241:
    msgpack/unpack_template.h: In function ‘int unpack_execute(unpack_context*, const char*, size_t, size_t*) [with bool construct = false; unpack_context = unpack_context; size_t = long unsigned int]’:
    msgpack/unpack_template.h:346:9: warning: ‘obj’ may be used uninitialized in this function [-Wmaybe-uninitialized]
             c->map_key = obj;
             ^
    x86_64-linux-gnu-g++ -pthread -shared -Wl,-O1 -Wl,-Bsymbolic-functions -Wl,-Bsymbolic-functions -Wl,-z,relro -Wl,-Bsymbolic-functions -Wl,-z,relro -g -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security -D_FORTIFY_SOURCE=2 build/temp.linux-x86_64-3.4/msgpack/_unpacker.o -o build/lib.linux-x86_64-3.4/msgpack/_unpacker.cpython-34m.so
    
  Running setup.py install for netifaces
    checking for getifaddrs...found.
    checking for getnameinfo...found.
    checking for optional header files...netash/ash.h netatalk/at.h netax25/ax25.h neteconet/ec.h netipx/ipx.h netpacket/packet.h linux/irda.h linux/atm.h linux/llc.h linux/tipc.h linux/dn.h.
    checking whether struct sockaddr has a length field...no.
    checking which sockaddr_xxx structs are defined...at ax25 in in6 ipx un ash ec ll atmpvc atmsvc dn irda llc.
    checking for routing socket support...no.
    checking for sysctl(CTL_NET...) support...no.
    checking for netlink support...yes.
    will use netlink to read routing table
    building 'netifaces' extension
    x86_64-linux-gnu-gcc -pthread -DNDEBUG -g -fwrapv -O2 -Wall -Wstrict-prototypes -g -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security -D_FORTIFY_SOURCE=2 -fPIC -DNETIFACES_VERSION=0.10.4 -DHAVE_GETIFADDRS=1 -DHAVE_GETNAMEINFO=1 -DHAVE_NETASH_ASH_H=1 -DHAVE_NETATALK_AT_H=1 -DHAVE_NETAX25_AX25_H=1 -DHAVE_NETECONET_EC_H=1 -DHAVE_NETIPX_IPX_H=1 -DHAVE_NETPACKET_PACKET_H=1 -DHAVE_LINUX_IRDA_H=1 -DHAVE_LINUX_ATM_H=1 -DHAVE_LINUX_LLC_H=1 -DHAVE_LINUX_TIPC_H=1 -DHAVE_LINUX_DN_H=1 -DHAVE_SOCKADDR_AT=1 -DHAVE_SOCKADDR_AX25=1 -DHAVE_SOCKADDR_IN=1 -DHAVE_SOCKADDR_IN6=1 -DHAVE_SOCKADDR_IPX=1 -DHAVE_SOCKADDR_UN=1 -DHAVE_SOCKADDR_ASH=1 -DHAVE_SOCKADDR_EC=1 -DHAVE_SOCKADDR_LL=1 -DHAVE_SOCKADDR_ATMPVC=1 -DHAVE_SOCKADDR_ATMSVC=1 -DHAVE_SOCKADDR_DN=1 -DHAVE_SOCKADDR_IRDA=1 -DHAVE_SOCKADDR_LLC=1 -DHAVE_PF_NETLINK=1 -I/usr/include/python3.4m -I/tmp/venv-adt-cloud-worker2g3yrp76/include/python3.4m -c netifaces.c -o build/temp.linux-x86_64-3.4/netifaces.o
    x86_64-linux-gnu-gcc -pthread -shared -Wl,-O1 -Wl,-Bsymbolic-functions -Wl,-Bsymbolic-functions -Wl,-z,relro -Wl,-Bsymbolic-functions -Wl,-z,relro -g -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security -D_FORTIFY_SOURCE=2 build/temp.linux-x86_64-3.4/netifaces.o -o build/lib.linux-x86_64-3.4/netifaces.cpython-34m.so
    
Successfully installed kombu python-keystoneclient python-logstash python-novaclient python-swiftclient anyjson amqp six Babel iso8601 PrettyTable netaddr argparse oslo.serialization stevedore requests oslo.i18n oslo.config oslo.utils pbr simplejson futures pytz msgpack-python netifaces
Cleaning up...
Downloading/unpacking testtools (from -r test_requirements.txt (line 1))
Downloading/unpacking fixtures (from -r test_requirements.txt (line 2))
  Running setup.py (path:/tmp/venv-adt-cloud-worker2g3yrp76/build/fixtures/setup.py) egg_info for package fixtures
    [pbr] Processing SOURCES.txt
    warning: LocalManifestMaker: standard file '-c' not found
    
    warning: no previously-included files found matching '.gitignore'
    warning: no previously-included files found matching '.gitreview'
    warning: no previously-included files matching '*.pyc' found anywhere in distribution
Downloading/unpacking flake8==2.4.0 (from -r test_requirements.txt (line 3))
  Downloading flake8-2.4.0-py2.py3-none-any.whl
Downloading/unpacking extras (from testtools->-r test_requirements.txt (line 1))
  Downloading extras-0.0.3.tar.gz
  Running setup.py (path:/tmp/venv-adt-cloud-worker2g3yrp76/build/extras/setup.py) egg_info for package extras
    
Downloading/unpacking unittest2>=1.0.0 (from testtools->-r test_requirements.txt (line 1))
Downloading/unpacking traceback2 (from testtools->-r test_requirements.txt (line 1))
  Downloading traceback2-1.4.0-py2.py3-none-any.whl
Downloading/unpacking python-mimeparse (from testtools->-r test_requirements.txt (line 1))
  Downloading python-mimeparse-0.1.4.tar.gz
  Running setup.py (path:/tmp/venv-adt-cloud-worker2g3yrp76/build/python-mimeparse/setup.py) egg_info for package python-mimeparse
    
Downloading/unpacking mccabe>=0.2.1,<0.4 (from flake8==2.4.0->-r test_requirements.txt (line 3))
  Downloading mccabe-0.3-py2.py3-none-any.whl
Downloading/unpacking pyflakes>=0.8.1,<0.9 (from flake8==2.4.0->-r test_requirements.txt (line 3))
  Downloading pyflakes-0.8.1-py2.py3-none-any.whl
Downloading/unpacking pep8>=1.5.7,<1.6 (from flake8==2.4.0->-r test_requirements.txt (line 3))
  Downloading pep8-1.5.7-py2.py3-none-any.whl
Requirement already satisfied (use --upgrade to upgrade): argparse in /tmp/venv-adt-cloud-worker2g3yrp76/lib/python3.4/site-packages (from unittest2>=1.0.0->testtools->-r test_requirements.txt (line 1))
Requirement already satisfied (use --upgrade to upgrade): six>=1.4 in /tmp/venv-adt-cloud-worker2g3yrp76/lib/python3.4/site-packages (from unittest2>=1.0.0->testtools->-r test_requirements.txt (line 1))
Downloading/unpacking linecache2 (from traceback2->testtools->-r test_requirements.txt (line 1))
  Downloading linecache2-1.0.0-py2.py3-none-any.whl
Installing collected packages: testtools, fixtures, flake8, extras, unittest2, traceback2, python-mimeparse, mccabe, pyflakes, pep8, linecache2
*** Error compiling '/tmp/venv-adt-cloud-worker2g3yrp76/build/testtools/testtools/_compat2x.py'...
  File "/tmp/venv-adt-cloud-worker2g3yrp76/build/testtools/testtools/_compat2x.py", line 16
    raise exc_class, exc_obj, exc_tb
                   ^
SyntaxError: invalid syntax

Running setup.py install for fixtures
    [pbr] Reusing existing SOURCES.txt
  Running setup.py install for extras
    
  Running setup.py install for python-mimeparse
    
Successfully installed testtools fixtures flake8 extras unittest2 traceback2 python-mimeparse mccabe pyflakes pep8 linecache2
Cleaning up...
running test
running egg_info
creating adt_cloud_worker.egg-info
writing adt_cloud_worker.egg-info/PKG-INFO
writing dependency_links to adt_cloud_worker.egg-info/dependency_links.txt
writing top-level names to adt_cloud_worker.egg-info/top_level.txt
writing manifest file 'adt_cloud_worker.egg-info/SOURCES.txt'
reading manifest file 'adt_cloud_worker.egg-info/SOURCES.txt'
writing manifest file 'adt_cloud_worker.egg-info/SOURCES.txt'
running build_ext
INFO: Executing: bzr branch lp:~canonical-ci-engineering/adt-cloud-worker/pip-cache /tmp/tmp6kf70udspip-cache-/cache
INFO: Executing: virtualenv -p python3 /tmp/venv-adt-cloud-worker2g3yrp76
INFO: Executing: /tmp/venv-adt-cloud-worker2g3yrp76/bin/pip install --no-index --find-links=/tmp/tmp6kf70udspip-cache-/cache -r requirements.txt
INFO: Executing: /tmp/venv-adt-cloud-worker2g3yrp76/bin/pip install -r test_requirements.txt
INFO: Executing: /tmp/venv-adt-cloud-worker2g3yrp76/bin/python3 setup.py test
ERROR: Calling `['/tmp/venv-adt-cloud-worker2g3yrp76/bin/python3', 'setup.py', 'test']` failed (with code 1)

Branched 4 revisions.
test_does_nothing_with_empty_dict (adt_cloud_worker.tests.test_cloud_worker.NovaEnvironmentVariableTests)
adt_cloud_worker.tests.test_cloud_worker.NovaEnvironmentVariableTests.test_does_nothing_with_empty_dict ... ok
test_ignores_non_os_keys (adt_cloud_worker.tests.test_cloud_worker.NovaEnvironmentVariableTests)
adt_cloud_worker.tests.test_cloud_worker.NovaEnvironmentVariableTests.test_ignores_non_os_keys ... ok
test_sets__os_keys (adt_cloud_worker.tests.test_cloud_worker.NovaEnvironmentVariableTests)
adt_cloud_worker.tests.test_cloud_worker.NovaEnvironmentVariableTests.test_sets__os_keys ... ok
test_stringifies_values (adt_cloud_worker.tests.test_cloud_worker.NovaEnvironmentVariableTests)
adt_cloud_worker.tests.test_cloud_worker.NovaEnvironmentVariableTests.test_stringifies_values ... ok
test_tarball_includes_directory_name (adt_cloud_worker.tests.test_cloud_worker.TarballCreationTests)
adt_cloud_worker.tests.test_cloud_worker.TarballCreationTests.test_tarball_includes_directory_name ... ok
test_will_tar_empty_directory (adt_cloud_worker.tests.test_cloud_worker.TarballCreationTests)
adt_cloud_worker.tests.test_cloud_worker.TarballCreationTests.test_will_tar_empty_directory ... ok
test_includes_pocket_args (adt_cloud_worker.tests.test_cloud_worker.TestADTArgumentGeneration)
adt_cloud_worker.tests.test_cloud_worker.TestADTArgumentGeneration.test_includes_pocket_args ... ok
test_required_arguments (adt_cloud_worker.tests.test_cloud_worker.TestADTArgumentGeneration)
adt_cloud_worker.tests.test_cloud_worker.TestADTArgumentGeneration.test_required_arguments ... ok
test_ignores_non_whitelisted_keys (adt_cloud_worker.tests.test_cloud_worker.TestMetadataFileCreation)
adt_cloud_worker.tests.test_cloud_worker.TestMetadataFileCreation.test_ignores_non_whitelisted_keys ... ok
test_writes_exit_code (adt_cloud_worker.tests.test_cloud_worker.TestMetadataFileCreation)
adt_cloud_worker.tests.test_cloud_worker.TestMetadataFileCreation.test_writes_exit_code ... ok
test_writes_multiple_whitelisted_keys (adt_cloud_worker.tests.test_cloud_worker.TestMetadataFileCreation)
adt_cloud_worker.tests.test_cloud_worker.TestMetadataFileCreation.test_writes_multiple_whitelisted_keys ... ok
test_all_present (adt_cloud_worker.tests.test_cloud_worker.TestRequestValidation)
adt_cloud_worker.tests.test_cloud_worker.TestRequestValidation.test_all_present ... ok
test_empty_request (adt_cloud_worker.tests.test_cloud_worker.TestRequestValidation)
adt_cloud_worker.tests.test_cloud_worker.TestRequestValidation.test_empty_request ... ok
test_one_missing (adt_cloud_worker.tests.test_cloud_worker.TestRequestValidation)
adt_cloud_worker.tests.test_cloud_worker.TestRequestValidation.test_one_missing ... ok
test_raises_RuntimeError_if_no_flavours_configured (adt_cloud_worker.tests.test_cloud.NovaTests)
adt_cloud_worker.tests.test_cloud.NovaTests.test_raises_RuntimeError_if_no_flavours_configured ... ok
test_returns_custom_flavor_by_default (adt_cloud_worker.tests.test_cloud.NovaTests)
adt_cloud_worker.tests.test_cloud.NovaTests.test_returns_custom_flavor_by_default ... WARNING:root:Nova has not been configured with either the default flavor (cpu2-ram2-disk50) of the alternative flavor (m1.small). Using the first reported flavor 'm1.adt.large' instead.
ok
test_returns_small_flavor_if_present (adt_cloud_worker.tests.test_cloud.NovaTests)
adt_cloud_worker.tests.test_cloud.NovaTests.test_returns_small_flavor_if_present ... ok
test_using_nondefault_logs_error (adt_cloud_worker.tests.test_cloud.NovaTests)
adt_cloud_worker.tests.test_cloud.NovaTests.test_using_nondefault_logs_error ... FAIL
test_using_unknown_logs_error (adt_cloud_worker.tests.test_cloud.NovaTests)
adt_cloud_worker.tests.test_cloud.NovaTests.test_using_unknown_logs_error ... FAIL
test_will_use_any_flavour_if_small_not_present (adt_cloud_worker.tests.test_cloud.NovaTests)
adt_cloud_worker.tests.test_cloud.NovaTests.test_will_use_any_flavour_if_small_not_present ... ok

======================================================================
FAIL: test_using_nondefault_logs_error (adt_cloud_worker.tests.test_cloud.NovaTests)
adt_cloud_worker.tests.test_cloud.NovaTests.test_using_nondefault_logs_error
----------------------------------------------------------------------
testtools.testresult.real._StringException: Traceback (most recent call last):
  File "/tmp/tarmac/branch.Yfhmy5/adt_cloud_worker/tests/test_cloud.py", line 53, in test_using_nondefault_logs_error
    f.output
  File "/tmp/venv-adt-cloud-worker2g3yrp76/lib/python3.4/site-packages/testtools/testcase.py", line 350, in assertEqual
    self.assertThat(observed, matcher, message)
  File "/tmp/venv-adt-cloud-worker2g3yrp76/lib/python3.4/site-packages/testtools/testcase.py", line 435, in assertThat
    raise mismatch_error
testtools.matchers._impl.MismatchError: !=:
reference = '''\
Custom flavor 'cpu2-ram2-disk10' not configured. Using 'm1.small' instead. To reduce testbed memory consumption, configure the 'cpu2-ram2-disk10' flavor.
'''
actual    = '''\
Custom flavor 'cpu2-ram2-disk50' not configured. Using 'm1.small' instead. To reduce testbed memory consumption, configure the 'cpu2-ram2-disk50' flavor.
'''

======================================================================
FAIL: test_using_unknown_logs_error (adt_cloud_worker.tests.test_cloud.NovaTests)
adt_cloud_worker.tests.test_cloud.NovaTests.test_using_unknown_logs_error
----------------------------------------------------------------------
testtools.testresult.real._StringException: Traceback (most recent call last):
  File "/tmp/tarmac/branch.Yfhmy5/adt_cloud_worker/tests/test_cloud.py", line 74, in test_using_unknown_logs_error
    f.output
  File "/tmp/venv-adt-cloud-worker2g3yrp76/lib/python3.4/site-packages/testtools/testcase.py", line 350, in assertEqual
    self.assertThat(observed, matcher, message)
  File "/tmp/venv-adt-cloud-worker2g3yrp76/lib/python3.4/site-packages/testtools/testcase.py", line 435, in assertThat
    raise mismatch_error
testtools.matchers._impl.MismatchError: !=:
reference = '''\
Nova has not been configured with either the default flavor (cpu2-ram2-disk10) of the alternative flavor (m1.small). Using the first reported flavor 'unknown' instead.
'''
actual    = '''\
Nova has not been configured with either the default flavor (cpu2-ram2-disk50) of the alternative flavor (m1.small). Using the first reported flavor 'unknown' instead.
'''

----------------------------------------------------------------------
Ran 20 tests in 0.016s

FAILED (failures=2)

1	=== modified file 'adt_cloud_worker/_cloud_support.py'
2	--- adt_cloud_worker/_cloud_support.py 2015-03-20 14:55:26 +0000
3	+++ adt_cloud_worker/_cloud_support.py 2015-04-22 20:47:43 +0000
4	@@ -52,7 +52,7 @@
5	flavor_names = [f.name for f in nova_query_flavor_fn()]
6	# XXX cprov 20150320: This is the preferred stackystack (ps4) flavor, we
7	# will work with IS to create specific flavors (m1.adt.*) soon.
8	- default = 'cpu2-ram2-disk10'
9	+ default = 'cpu2-ram2-disk50'
10	# This is the alternative bootstack/cannistack/generic one.
11	alternative = 'm1.small'
12	if default in flavor_names:

adt-cloud-worker

Merge lp:~thomir-deactivatedaccount/adt-cloud-worker/trunk-use-even-more-beef into lp:adt-cloud-worker

Commit message

Description of the change

Unmerged revisions

Preview Diff

Subscribers