snappy-proposed-image-tester

Merge lp:~canonical-ci-engineering/snappy-proposed-image-tester/subst-and-rename into lp:snappy-proposed-image-tester

  1. subst-and-rename
  2. Merge into trunk
Proposed by Francis Ginther
Status: Merged
Approved by: Francis Ginther
Approved revision: 40
Merged at revision: 38
Proposed branch: lp:~canonical-ci-engineering/snappy-proposed-image-tester/subst-and-rename
Merge into: lp:snappy-proposed-image-tester
Diff against target: 274 lines (+35/-34)
12 files modified
README.rst (+5/-5)
called-by-tarmac.py (+2/-2)
setup.py (+5/-5)
snappy-proposed-image-tester.py (+1/-1)
snappy_proposed_image_tester/__init__.py (+8/-7)
snappy_proposed_image_tester/cloud.py (+1/-1)
snappy_proposed_image_tester/constants.py (+2/-2)
snappy_proposed_image_tester/queue.py (+2/-2)
snappy_proposed_image_tester/tests/__init__.py (+1/-1)
snappy_proposed_image_tester/tests/test_queue_integration.py (+3/-3)
snappy_proposed_image_tester/utils.py (+1/-1)
snappy_proposed_image_tester/worker.py (+4/-4)
To merge this branch: bzr merge lp:~canonical-ci-engineering/snappy-proposed-image-tester/subst-and-rename
Reviewer Review Type Date Requested Status
Paul Larson Approve
Francis Ginther Pending
Review via email: mp+260382@code.launchpad.net

This proposal supersedes a proposal from 2015-05-27.

Commit message

Renaming and substituting the module names to match the branch name and the charm requirements.

Description of the change

Renaming and substituting the module names to match the branch name and the charm requirements. This might be more than actually needed but just wanted to be safe.

To post a comment you must log in.
Revision history for this message
Paul Larson (pwlars) wrote : Posted in a previous version of this proposal

One minor thing in the readme, otherwise +1

review: Approve
Revision history for this message
Francis Ginther (fginther) wrote : Posted in a previous version of this proposal

Approved, yo!

review: Approve
Revision history for this message
Ubuntu CI Bot (uci-bot) wrote : Posted in a previous version of this proposal
Download full text (25.7 KiB)

The attempt to merge lp:~psivaa/snappy-proposed-image-tester/subst-and-rename into lp:snappy-proposed-image-tester failed. Below is the output from the failed tests.

Using base prefix '/usr'
New python executable in /tmp/venv-snappy-proposed-image-testervpue635y/bin/python3
Also creating executable in /tmp/venv-snappy-proposed-image-testervpue635y/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-logstash==0.4.2 (from -r requirements.txt (line 2))
  Running setup.py (path:/tmp/venv-snappy-proposed-image-testervpue635y/build/python-logstash/setup.py) egg_info for package python-logstash

Downloading/unpacking python-swiftclient==2.4.0 (from -r requirements.txt (line 3))
Downloading/unpacking python-keystoneclient==1.3.0 (from -r requirements.txt (line 4))
Downloading/unpacking uservice-utils==1.0.2.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-snappy-proposed-image-testervpue635y/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-snappy-proposed-image-testervpue635y/build/amqp/setup.py) egg_info for package amqp

Downloading/unpacking six>=1.5.2 (from python-swiftclient==2.4.0->-r requirements.txt (line 3))
Downloading/unpacking requests>=1.1 (from python-swiftclient==2.4.0->-r requirements.txt (line 3))
Downloading/unpacking simplejson>=2.0.9 (from python-swiftclient==2.4.0->-r requirements.txt (line 3))
  Running setup.py (path:/tmp/venv-snappy-proposed-image-testervpue635y/build/simplejson/setup.py) egg_info for package simplejson

Downloading/unpacking futures>=2.1.3 (from python-swiftclient==2.4.0->-r requirements.txt (line 3))
Downloading/unpacking oslo.serialization>=1.2.0 (from python-keystoneclient==1.3.0->-r requirements.txt (line 4))
Downloading/unpacking Babel>=1.3 (from python-keystoneclient==1.3.0->-r requirements.txt (line 4))
  Running setup.py (path:/tmp/venv-snappy-proposed-image-testervpue635y/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 argparse (from python-keystoneclient==1.3.0->-r requirements.txt (line 4))
Downloading/unpacking netaddr>=0.7.12 (from python-keystoneclient==1.3.0->-r requirements.txt (line 4))
Downloading/unpacking pbr>=0.6,!=0.7,<1.0 (from python-keystoneclient==1.3.0->-r requirements.txt (line 4))
Downloading/unpacking oslo.config>=1.9.0 (from python-keystoneclient==1.3.0->-r requirements.txt (line 4))
Downloading/unpacking stevedore>=1.1.0 (from python-keystoneclient==1.3.0->-r requirements.txt (line 4))
Downloading/unpacking oslo.utils>=1.2.0 (from python-...

Revision history for this message
Francis Ginther (fginther) wrote : Posted in a previous version of this proposal

psivaa,

looks like a flake8 error:

snappy_proposed_image_tester/__init__.py:35:80: E501 line too long (81 > 79 characters)

Revision history for this message
Paul Larson (pwlars) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'README.rst'
--- README.rst 2015-05-26 16:25:20 +0000
+++ README.rst 2015-05-27 21:15:12 +0000
@@ -1,5 +1,5 @@
1Core Image Tester1Snappy Proposed Image Tester
2#################2############################
33
4A micro-service uses adt-run to boot an ubuntu-core image and run some tests.4A micro-service uses adt-run to boot an ubuntu-core image and run some tests.
55
@@ -8,7 +8,7 @@
88
9Branch the code::9Branch the code::
1010
11 $ bzr branch lp:~canonical-ci-engineering/core-image-tester/snappy-proposed-migration11 $ bzr branch lp:~canonical-ci-engineering/snappy-proposed-image-tester
1212
13Install the Service13Install the Service
14===================14===================
@@ -47,7 +47,7 @@
4747
48This service includes a custom adt-run ssh setup script called 'uci-nova'. This48This service includes a custom adt-run ssh setup script called 'uci-nova'. This
49is a shell script that exists in the root of the branch, and is called by the49is a shell script that exists in the root of the branch, and is called by the
50core-image-tester service.50snappy-proposed-image-tester service.
5151
52You can run adt-run manually yourself, in order to replicate what the service52You can run adt-run manually yourself, in order to replicate what the service
53does. For example::53does. For example::
@@ -77,7 +77,7 @@
77The config file77The config file
78===============78===============
7979
80The sample configuration file in 'core-service.conf'::80The sample configuration file in 'snappy-proposed-service.conf'::
8181
82 [amqp]82 [amqp]
83 uris = amqp://guest:guest@localhost:5672//83 uris = amqp://guest:guest@localhost:5672//
8484
=== modified file 'called-by-tarmac.py'
--- called-by-tarmac.py 2015-04-07 19:54:41 +0000
+++ called-by-tarmac.py 2015-05-27 21:15:12 +0000
@@ -1,6 +1,6 @@
1#!/usr/bin/env python31#!/usr/bin/env python3
2#2#
3# core-image-tester3# snappy-proposed-image-tester
4# Copyright (C) 2015 Canonical4# Copyright (C) 2015 Canonical
5#5#
6# This program is free software: you can redistribute it and/or modify6# This program is free software: you can redistribute it and/or modify
@@ -33,7 +33,7 @@
33import sys33import sys
34import tempfile34import tempfile
3535
36SERVICE_NAME = 'core-image-tester'36SERVICE_NAME = 'snappy-proposed-image-tester'
37VENV_DIR = 'venv-{}'.format(SERVICE_NAME)37VENV_DIR = 'venv-{}'.format(SERVICE_NAME)
38PIP_DIR = 'pip-cache-'.format(SERVICE_NAME)38PIP_DIR = 'pip-cache-'.format(SERVICE_NAME)
39PIP_CACHE_BRANCH = 'lp:~canonical-ci-engineering/{}/' \39PIP_CACHE_BRANCH = 'lp:~canonical-ci-engineering/{}/' \
4040
=== modified file 'setup.py'
--- setup.py 2015-04-07 19:54:41 +0000
+++ setup.py 2015-05-27 21:15:12 +0000
@@ -1,6 +1,6 @@
1#!/usr/bin/env python31#!/usr/bin/env python3
22
3# core-image-tester3# snappy-proposed-image-tester
4# Copyright (C) 2015 Canonical4# Copyright (C) 2015 Canonical
5#5#
6# This program is free software: you can redistribute it and/or modify6# This program is free software: you can redistribute it and/or modify
@@ -30,14 +30,14 @@
3030
3131
32setup(32setup(
33 name='core-image-tester',33 name='snappy-proposed-image-tester',
34 version=VERSION,34 version=VERSION,
35 description=('A microservice for testing new ubuntu core images.'),35 description=('A microservice for testing new ubuntu core images.'),
36 author='Canonical CI Engineering Team',36 author='Canonical CI Engineering Team',
37 author_email='canonical-ci-engineering@lists.launchpad.net',37 author_email='canonical-ci-engineering@lists.launchpad.net',
38 url='https://launchpad.net/core-image-tester',38 url='https://launchpad.net/snappy-proposed-image-tester',
39 license='GPLv3',39 license='GPLv3',
40 packages=find_packages(),40 packages=find_packages(),
41 scripts=['core-image-tester.py'],41 scripts=['snappy-proposed-image-tester.py'],
42 test_suite='core_image_tester.tests',42 test_suite='snappy_proposed_image_tester.tests',
43)43)
4444
=== renamed file 'core-image-tester.py' => 'snappy-proposed-image-tester.py'
--- core-image-tester.py 2015-03-25 02:51:52 +0000
+++ snappy-proposed-image-tester.py 2015-05-27 21:15:12 +0000
@@ -1,6 +1,6 @@
1#!/usr/bin/env python31#!/usr/bin/env python3
22
3from core_image_tester import main3from snappy_proposed_image_tester import main
44
55
6if __name__ == '__main__':6if __name__ == '__main__':
77
=== renamed file 'core-service.conf' => 'snappy-proposed-service.conf'
=== renamed directory 'core_image_tester' => 'snappy_proposed_image_tester'
=== modified file 'snappy_proposed_image_tester/__init__.py'
--- core_image_tester/__init__.py 2015-04-03 02:07:58 +0000
+++ snappy_proposed_image_tester/__init__.py 2015-05-27 21:15:12 +0000
@@ -1,4 +1,4 @@
1# core-image-tester1# snappy-proposed-image-tester
2# Copyright (C) 2015 Canonical2# Copyright (C) 2015 Canonical
3#3#
4# This program is free software: you can redistribute it and/or modify4# This program is free software: you can redistribute it and/or modify
@@ -22,21 +22,22 @@
2222
23from uservice_utils.logging import configure_service_logging23from uservice_utils.logging import configure_service_logging
2424
25from core_image_tester import constants25from snappy_proposed_image_tester import constants
26from core_image_tester.queue import (26from snappy_proposed_image_tester.queue import (
27 CoreImageTesterQueueMonitor,27 CoreImageTesterQueueMonitor,
28 create_connection_from_config,28 create_connection_from_config,
29 CoreImageTestResultPublisher,29 CoreImageTestResultPublisher,
30)30)
31from core_image_tester.worker import CoreImageTesterWorker31from snappy_proposed_image_tester.worker import CoreImageTesterWorker
3232
3333
34def read_config():34def read_config():
35 parser = argparse.ArgumentParser(description='Core image tester.')35 parser = argparse.ArgumentParser(
36 description='Snappy proposed image tester.')
36 parser.add_argument(37 parser.add_argument(
37 '-c',38 '-c',
38 '--conf',39 '--conf',
39 default='core-service.conf',40 default='snappy-proposed-service.conf',
40 help='Configuration file path'41 help='Configuration file path'
41 )42 )
42 args = parser.parse_args()43 args = parser.parse_args()
@@ -50,7 +51,7 @@
50def main():51def main():
51 config = read_config()52 config = read_config()
52 log_path = os.path.abspath(53 log_path = os.path.abspath(
53 os.path.join(__file__, '../../logs/core-image-tester.log'))54 os.path.join(__file__, '../../logs/snappy-proposed-image-tester.log'))
54 configure_service_logging(55 configure_service_logging(
55 log_path,56 log_path,
56 config['logstash'] if 'logstash' in config else None57 config['logstash'] if 'logstash' in config else None
5758
=== modified file 'snappy_proposed_image_tester/cloud.py'
--- core_image_tester/cloud.py 2015-04-01 05:17:24 +0000
+++ snappy_proposed_image_tester/cloud.py 2015-05-27 21:15:12 +0000
@@ -1,4 +1,4 @@
1# core-image-tester1# snappy-proposed-image-tester
2# Copyright (C) 2015 Canonical2# Copyright (C) 2015 Canonical
3#3#
4# This program is free software: you can redistribute it and/or modify4# This program is free software: you can redistribute it and/or modify
55
=== modified file 'snappy_proposed_image_tester/constants.py'
--- core_image_tester/constants.py 2015-05-22 21:06:35 +0000
+++ snappy_proposed_image_tester/constants.py 2015-05-27 21:15:12 +0000
@@ -1,4 +1,4 @@
1# core-image-tester1# snappy-proposed-image-tester
2# Copyright (C) 2015 Canonical2# Copyright (C) 2015 Canonical
3#3#
4# This program is free software: you can redistribute it and/or modify4# This program is free software: you can redistribute it and/or modify
@@ -23,7 +23,7 @@
2323
24SOLUTION_NAME = "snappy-proposed-migration"24SOLUTION_NAME = "snappy-proposed-migration"
2525
26SERVICE_NAME = "core-image-tester"26SERVICE_NAME = "snappy-proposed-image-tester"
2727
28HOSTNAME = socket.gethostname()28HOSTNAME = socket.gethostname()
2929
3030
=== modified file 'snappy_proposed_image_tester/queue.py'
--- core_image_tester/queue.py 2015-05-21 21:41:49 +0000
+++ snappy_proposed_image_tester/queue.py 2015-05-27 21:15:12 +0000
@@ -1,4 +1,4 @@
1# core-image-tester1# snappy-proposed-image-tester
2# Copyright (C) 2015 Canonical2# Copyright (C) 2015 Canonical
3#3#
4# This program is free software: you can redistribute it and/or modify4# This program is free software: you can redistribute it and/or modify
@@ -22,7 +22,7 @@
22import kombu22import kombu
23from kombu.mixins import ConsumerMixin23from kombu.mixins import ConsumerMixin
2424
25from core_image_tester import constants25from snappy_proposed_image_tester import constants
2626
27logger = logging.getLogger(__name__)27logger = logging.getLogger(__name__)
2828
2929
=== modified file 'snappy_proposed_image_tester/tests/__init__.py'
--- core_image_tester/tests/__init__.py 2015-03-26 20:18:59 +0000
+++ snappy_proposed_image_tester/tests/__init__.py 2015-05-27 21:15:12 +0000
@@ -1,4 +1,4 @@
1# core-image-tester1# snappy-proposed-image-tester
2# Copyright (C) 2015 Canonical2# Copyright (C) 2015 Canonical
3#3#
4# This program is free software: you can redistribute it and/or modify4# This program is free software: you can redistribute it and/or modify
55
=== modified file 'snappy_proposed_image_tester/tests/test_queue_integration.py'
--- core_image_tester/tests/test_queue_integration.py 2015-05-22 21:15:02 +0000
+++ snappy_proposed_image_tester/tests/test_queue_integration.py 2015-05-27 21:15:12 +0000
@@ -1,4 +1,4 @@
1# core-image-tester1# snappy-proposed-image-tester
2# Copyright (C) 2015 Canonical2# Copyright (C) 2015 Canonical
3#3#
4# This program is free software: you can redistribute it and/or modify4# This program is free software: you can redistribute it and/or modify
@@ -21,8 +21,8 @@
21from testtools import TestCase21from testtools import TestCase
2222
2323
24from core_image_tester.queue import CoreImageTesterQueueMonitor24from snappy_proposed_image_tester.queue import CoreImageTesterQueueMonitor
25from core_image_tester import constants25from snappy_proposed_image_tester import constants
2626
2727
28class KombuQueueIntegrationTests(TestCase):28class KombuQueueIntegrationTests(TestCase):
2929
=== modified file 'snappy_proposed_image_tester/utils.py'
--- core_image_tester/utils.py 2015-03-31 02:52:08 +0000
+++ snappy_proposed_image_tester/utils.py 2015-05-27 21:15:12 +0000
@@ -1,4 +1,4 @@
1# core-image-tester1# snappy-proposed-image-tester
2# Copyright (C) 2015 Canonical2# Copyright (C) 2015 Canonical
3#3#
4# This program is free software: you can redistribute it and/or modify4# This program is free software: you can redistribute it and/or modify
55
=== modified file 'snappy_proposed_image_tester/worker.py'
--- core_image_tester/worker.py 2015-05-26 16:29:22 +0000
+++ snappy_proposed_image_tester/worker.py 2015-05-27 21:15:12 +0000
@@ -1,4 +1,4 @@
1# core-image-tester1# snappy-proposed-image-tester
2# Copyright (C) 2015 Canonical2# Copyright (C) 2015 Canonical
3#3#
4# This program is free software: you can redistribute it and/or modify4# This program is free software: you can redistribute it and/or modify
@@ -24,12 +24,12 @@
24import tarfile24import tarfile
25import tempfile25import tempfile
2626
27from core_image_tester import (27from snappy_proposed_image_tester import (
28 cloud,28 cloud,
29 constants,29 constants,
30 utils,30 utils,
31)31)
32from core_image_tester.queue import MessageActions32from snappy_proposed_image_tester.queue import MessageActions
3333
3434
35logger = logging.getLogger(__name__)35logger = logging.getLogger(__name__)
@@ -97,7 +97,7 @@
97 extra=extra97 extra=extra
98 )98 )
9999
100 container_name = "core-{}-{}-{}".format(100 container_name = "snappy-proposed-{}-{}-{}".format(
101 channel,101 channel,
102 device,102 device,
103 image_name,103 image_name,

Subscribers

People subscribed via source and target branches

to all changes: