Merge lp:~bloodearnest/juju-deployer/annotate-branches into lp:juju-deployer

[Simon Davy]

Annotate a service with the branch information on deploy.

Annotate a service with the branch information on deploy.

This lays the ground work for being able to produce upgrade charms in diff.

[Kapil Thangavelu (hazmat)]

so a minor on this would be to actually record the vcs revision in the annotation with charm.get_vcs().get_cur_rev() added to the annotation.

[Kapil Thangavelu (hazmat)]

this branch also setups a test with a nonsensical config by specifying a branch for a store charm.

[Simon Davy (bloodearnest)]

On Tue, Feb 3, 2015 at 12:09 PM, Kapil Thangavelu
<email address hidden> wrote:
> so a minor on this would be to actually record the vcs revision in the annotation with charm.get_vcs().get_cur_rev() added to the annotation.

good idea, will do.

[Simon Davy (bloodearnest)]

On Tue, Feb 3, 2015 at 12:57 PM, Kapil Thangavelu
<email address hidden> wrote:
> this branch also setups a test with a nonsensical config by specifying a branch for a store charm.

Right, I will copy the test-wiki fixture and change to non-cs charm.

[Simon Davy (bloodearnest)]

Hi Kapil

Have addressed review comments, let me know if there's anything else.

The only thing I would like to be able to do is annotate branch/revision when deploying directly from the store, perhaps we can use the store api to get the bzr revision that a particular store revision matches up to, i dunno.

[Kapil Thangavelu (hazmat)]

lgtm

review: Approve

[Kapil Thangavelu (hazmat)]

The branch seems to be referencing a test data file that is not in the branch

[lp:~bloodearnest/juju-deployer/annotate-branches]

131. By Simon Davy on 2015-07-16

add missing test data file

132. By Simon Davy on 2015-07-16

fix local repo clean up

[Simon Davy (bloodearnest)]

I've added the file that was missing, and fixed test clean up issue, should be good to go

Unmerged revisions

132. By Simon Davy on 2015-07-16

fix local repo clean up

131. By Simon Davy on 2015-07-16

add missing test data file

130. By Simon Davy on 2015-03-30

merge upstream and fix review comments

129. By Simon Davy on 2014-10-22

whitespace clean up

128. By Simon Davy on 2014-10-22

whitespace clean up

127. By Simon Davy on 2014-10-22

add branch annotations on deploy

=== modified file 'deployer/action/importer.py'
--- deployer/action/importer.py	2015-05-28 13:04:30 +0000
+++ deployer/action/importer.py	2015-07-16 15:16:39 +0000
@@ -109,6 +109,7 @@
         if machines:
             self.log.info("Creating machines...")
             for machine_name, spec in machines.items():
+<<<<<<< TREE
                 if self.machine_exists(machine_name):
                     self.log.info(
                         """Machine %s already exists on environment, """
@@ -119,6 +120,10 @@
                     self.log.info("Machine %s will be created" % machine_name)
                     self.machines[machine_name] = self.env.add_machine(
                         series=spec.get('series',
+=======
+                self.machines[machine_name] = self.env.add_machine(
+                        series=spec.get('series',
+>>>>>>> MERGE-SOURCE
                                         self.deployment.data['series']),
                         constraints=spec.get('constraints'))
 
@@ -227,6 +232,13 @@
                 self.log.debug(" Setting annotations")
                 self.env.set_annotation(svc.name, svc.annotations)
 
+            if charm.branch:
+                self.log.debug(" Setting branch annotation to " + charm.branch)
+                self.env.set_annotation(svc.name, {
+                    'branch': charm.branch.split('@', 1)[0],
+                    'revision': charm.get_vcs().get_cur_rev(),
+                })
+
             if self.options.deploy_delay:
                 self.log.debug(" Waiting for deploy delay")
                 time.sleep(self.options.deploy_delay)

=== added file 'deployer/tests/test_data/wiki-branch.yaml'
--- deployer/tests/test_data/wiki-branch.yaml	1970-01-01 00:00:00 +0000
+++ deployer/tests/test_data/wiki-branch.yaml	2015-07-16 15:16:39 +0000
@@ -0,0 +1,5 @@
+wiki-branch:
+  series: precise
+  services:
+    wiki:
+      branch: lp:charms/precise/mediawiki@80

=== modified file 'deployer/tests/test_data/wiki.yaml'
--- deployer/tests/test_data/wiki.yaml	2014-02-22 23:11:02 +0000
+++ deployer/tests/test_data/wiki.yaml	2015-07-16 15:16:39 +0000
@@ -8,4 +8,4 @@
     db:
       charm: cs:precise/mysql
   relations:
-    - [wiki, db]
\ No newline at end of file
+    - [wiki, db]

=== modified file 'deployer/tests/test_guiserver.py'
--- deployer/tests/test_guiserver.py	2015-03-17 10:40:34 +0000
+++ deployer/tests/test_guiserver.py	2015-07-16 15:16:39 +0000
@@ -219,7 +219,7 @@
     def cleanup_series_path(self):
         """Remove the series path created by the Deployment object."""
         if os.path.isdir('precise'):
-            os.rmdir('precise')
+            shutil.rmtree('precise', ignore_errors=True)
 
     @mock.patch('deployer.guiserver.Importer')
     def test_importing_bundle(self, mock_importer, mock_environment):

=== modified file 'deployer/tests/test_importer.py'
--- deployer/tests/test_importer.py	2015-05-13 14:06:34 +0000
+++ deployer/tests/test_importer.py	2015-07-16 15:16:39 +0000
@@ -66,6 +66,25 @@
 
     @skip_if_offline
     @mock.patch('deployer.action.importer.time')
+    def test_importer_annotations(self, mock_time):
+        stack = ConfigStack(
+            [os.path.join(self.test_data_dir, 'wiki-branch.yaml')]
+        )
+        deploy = stack.get('wiki-branch')
+        env = mock.MagicMock()
+        importer = Importer(env, deploy, self.options)
+        importer.run()
+
+        env.set_annotation.assert_called_once_with(
+            'wiki',
+            {
+                'branch': 'lp:charms/precise/mediawiki',
+                'revision': '80',
+            }
+        )
+
+    @skip_if_offline
+    @mock.patch('deployer.action.importer.time')
     def test_importer_no_relations(self, mock_time):
         self.options.no_relations = True
         stack = ConfigStack(self.options.configs)