Merge lp:~psivaa/charms/trusty/snappy-proposed-image-tester/renames-subs into lp:~canonical-ci-engineering/charms/trusty/snappy-proposed-image-tester/trunk

[Para Siva]

Changing names of the service and the upstart job

Changing names of the service and the upstart job. The upstart job is now using snappy-proposed-image-tester.py assuming the content of lp:snappy-proposed-image-tester will reflect the branch name.

[lp:~psivaa/charms/trusty/snappy-proposed-image-tester/renames-subs]

8. By Para Siva on 2015-05-27

Formatting

[Celso Providelo (cprov)]

Psivaa, thank you, it looks correct.

review: Approve

[Francis Ginther (fginther)]

This is identical to https://code.launchpad.net/~fginther/charms/trusty/snappy-proposed-image-tester/renames/+merge/260324 which has already landed except for some whitespace differences. I don't see any reason to also attempt to merge this. Apologies for not making the other MP obvious.

review: Disapprove

Unmerged revisions

8. By Para Siva on 2015-05-27

Formatting

7. By Para Siva on 2015-05-27

Renaming and substituting core-image-tester to snappy-proposed-image-tester

=== modified file 'README'
--- README	2015-03-25 04:36:21 +0000
+++ README	2015-05-27 17:55:36 +0000
@@ -1,7 +1,7 @@
 Overview
 --------
 
-This charm install core-image-tester service.
+This charm install snappy-proposed-image-tester service.
 
 Configuration
 -------------
@@ -9,8 +9,8 @@
 There is only one config option for this charm:
 
  * config-file: A base64 encoded string with the config file to use for
-                core-image-tester.
+                snappy-proposed-image-tester.
 
 The charm expects the payload code to be provided as 
-files/core-image-tester.tgz (a snapshot of lp:core-image-tester) along
+files/snappy-proposed-image-tester.tgz (a snapshot of lp:snappy-proposed-image-tester) along
 with its corresponding files/pip-cache directory (python dependencies). 
 
=== modified file 'config.yaml'
--- config.yaml	2015-03-25 04:36:21 +0000
+++ config.yaml	2015-05-27 17:55:36 +0000
@@ -7,5 +7,5 @@
   config-file:
     type: string
     description: |
-      base64 encoded string with the config file for core-image-tester
+      base64 encoded string with the config file for snappy-proposed-image-tester
 
 
=== modified file 'hooks/actions.py'
--- hooks/actions.py	2015-04-28 02:09:37 +0000
+++ hooks/actions.py	2015-05-27 17:55:36 +0000
@@ -8,8 +8,8 @@
 from charmhelpers.core.host import adduser
 from charmhelpers.payload import (archive, execd)
 
-SERVICE_NAME = 'core-image-tester'
-SERVICE_CONFIGNAME = 'core-service.conf'
+SERVICE_NAME = 'snappy-proposed-image-tester'
+SERVICE_CONFIGNAME = 'snappy-proposed-service.conf'
 REQUIRED_PACKAGES = [
     'autopkgtest', 'bzr', 'python-novaclient', 'python-virtualenv',
     'python3-dev', 'gcc',
 
=== modified file 'hooks/services.py'
--- hooks/services.py	2015-04-28 02:09:37 +0000
+++ hooks/services.py	2015-05-27 17:55:36 +0000
@@ -11,7 +11,7 @@
     config = hookenv.config()
     manager = ServiceManager([
         {
-            'service': 'core-image-tester',
+            'service': 'snappy-proposed-image-tester',
             'required_data': [config],
             'data_ready': [
                 actions.basenode,
@@ -22,7 +22,7 @@
                 actions.create_user,
                 helpers.render_template(
                     source='upstart.conf',
-                    target='/etc/init/core-image-tester.conf'),
+                    target='/etc/init/snappy-proposed-image-tester.conf'),
                 actions.log_start,
             ],
         },
 
=== modified file 'metadata.yaml'
--- metadata.yaml	2015-03-25 04:36:21 +0000
+++ metadata.yaml	2015-05-27 17:55:36 +0000
@@ -1,8 +1,8 @@
-name: core-image-tester
+name: snappy-proposed-image-tester
 summary: |
   Deploy a service to test new ubuntucore images receiving requests via
   rabbit queues.
 maintainer: Canonical CI Engineering <[e-mail]>
 description: |
-  Runs core-image-tester service from a given service tarball (provided as
-  files/core-image-tester.tgz).
+  Runs snappy-proposed-image-tester service from a given service tarball (provided as
+  files/snappy-proposed-image-tester.tgz).
 
=== modified file 'templates/upstart.conf'
--- templates/upstart.conf	2015-03-25 04:36:21 +0000
+++ templates/upstart.conf	2015-05-27 17:55:36 +0000
@@ -1,4 +1,4 @@
-description "Starts a core-image-tester process"
+description "Starts a snappy-proposed-image-tester process"
 
 start on (local-filesystems and net-device-up IFACE=eth0)
 stop on runlevel [!12345]
@@ -11,13 +11,13 @@
 # unless it fails 15 times within 5 seconds
 respawn limit 15 5
 
-env SERVICE_DIR=/srv/{{ environment }}/core-image-tester
+env SERVICE_DIR=/srv/{{ environment }}/snappy-proposed-image-tester
 env SERVICE_USER=core-worker
 
 script
 
   install -d -o ${SERVICE_USER} ${SERVICE_DIR}/logs
   chdir ${SERVICE_DIR}
-  exec sudo -u ${SERVICE_USER} sh -c "./ve/bin/python3 core-image-tester.py -c ${SERVICE_DIR}/core-service.conf >> logs/core-image-tester.log 2>&1"
+  exec sudo -u ${SERVICE_USER} sh -c "./ve/bin/python3 snappy-proposed-image-tester.py -c ${SERVICE_DIR}/core-service.conf >> logs/snappy-proposed-image-tester.log 2>&1"
 
 end script