Merge lp:~sinzui/juju-release-tools/agent-archive into lp:juju-release-tools

[Curtis Hovey]

Rename win-agents to agent-archive, and win_agent_archive.py to agent_archive.py

This branch makes two mechanical changes and also adds the build-centos job to the list of jobs to get release binaries from.

Rename win_agent_archive.py to agent_archive.py and update everything that calls or imports it.

Rename juju-qa-data/win-agents to juju-qa-data/agent-archive. The agents are already at juju-qa-data/agent-archive. These commands used during releases work:

     ./juju-release-tools/agent_archive.py --config $JUJU_HOME/juju-qa.s3cfg add juju-1.24-beta5-centos7-amd64.tgz
     ./juju-release-tools/agent_archive.py --config $JUJU_HOME/juju-qa.s3cfg get 1.24-beta5 ./

[Aaron Bentley (abentley)]

Looks reasonable to me. If it runs, land it.

review: Approve

=== renamed file 'win_agent_archive.py' => 'agent_archive.py'
--- win_agent_archive.py	2015-05-26 19:35:48 +0000
+++ agent_archive.py	2015-05-27 15:02:21 +0000
@@ -11,7 +11,7 @@
 
 
 # The S3 container and path to add to and get from.
-S3_CONTAINER = 's3://juju-qa-data/win-agents'
+S3_CONTAINER = 's3://juju-qa-data/agent-archive'
 # The set of agents to make.
 AGENT_TEMPLATES = (
     'juju-{}-centos7-amd64.tgz',
@@ -78,7 +78,7 @@
 
 
 def add_agents(args):
-    """Upload agents to the S3 win-agent location.
+    """Upload agents to the S3 agent-archive location.
 
     It is an error to overwrite an existing agent, or pass an agent that
     does not appear to be a win agent.
@@ -164,7 +164,7 @@
 
 def parse_args(args=None):
     """Return the argument parser for this program."""
-    parser = ArgumentParser("Manage win agents in the archive.")
+    parser = ArgumentParser("Manage released agents in the agent-archive.")
     parser.add_argument(
         '-d', '--dry-run', action="store_true", default=False,
         help='Do not make changes.')
@@ -176,28 +176,30 @@
         help='The S3 config file.')
     subparsers = parser.add_subparsers(help='sub-command help')
     # add juju-1.21.0-win2012-amd64.tgz
-    parser_add = subparsers.add_parser('add', help='Add win-agents')
+    parser_add = subparsers.add_parser(
+        'add', help='Add an agent to the archive')
     parser_add.add_argument(
         'source_agent',
-        help="The win-agent to create all the agents from.")
+        help="The agent to add (and copy to other series).")
     parser_add.set_defaults(func=add_agents)
     # get 1.21.0 ./workspace
-    parser_get = subparsers.add_parser('get', help='get win-agents')
+    parser_get = subparsers.add_parser(
+        'get', help='get agents from the archive')
     parser_get.add_argument(
-        'version', help="The version of win-agent to download")
+        'version', help="The version of agents to download")
     parser_get.add_argument(
         'destination', help="The path to download the files to.")
     parser_get.set_defaults(func=get_agents)
     # delete 1.21.0
-    parser_delete = subparsers.add_parser('delete', help='delete win-agents')
+    parser_delete = subparsers.add_parser('delete', help='delete agent-archive')
     parser_delete.add_argument(
-        'version', help="The version of win-agent to delete")
+        'version', help="The version of agents to delete")
     parser_delete.set_defaults(func=delete_agents)
     return parser.parse_args(args)
 
 
 def main(argv):
-    """Manage win-agents in the archive."""
+    """Manage agent-archive in the archive."""
     args = parse_args(argv)
     try:
         args.func(args)

=== modified file 'assemble-streams.bash'
--- assemble-streams.bash	2015-05-05 13:45:53 +0000
+++ assemble-streams.bash	2015-05-27 15:02:21 +0000
@@ -189,8 +189,8 @@
             rm -r $DEST_DEBS/juju-core
         fi
         if [[ -e $JUJU_DIR/juju-qa.s3cfg ]]; then
-            echo "checking s3://juju-qa-data/win-agents for $RELEASE."
-            $SCRIPT_DIR/win_agent_archive.py --config $JUJU_DIR/juju-qa.s3cfg \
+            echo "checking s3://juju-qa-data/agent-archive for $RELEASE."
+            $SCRIPT_DIR/agent_archive.py --config $JUJU_DIR/juju-qa.s3cfg \
                 get $RELEASE $DEST_DEBS
         fi
     fi

=== modified file 'get-revision-build-artefacts.bash'
--- get-revision-build-artefacts.bash	2015-01-07 22:21:51 +0000
+++ get-revision-build-artefacts.bash	2015-05-27 15:02:21 +0000
@@ -6,7 +6,8 @@
 
 ALL_FILES=$(s3cmd -c $JUJU_HOME/juju-qa.s3cfg ls -r s3://$CONTAINER_BASE/*)
 
-JOBS="build-revision build-osx-client build-win-agent build-win-client"
+JOBS="build-revision build-osx-client
+      build-win-agent build-win-client build-centos"
 
 for job in $JOBS; do
     artefacts=$(echo "$ALL_FILES" | sed -r "/$job\/build-/!d; s,^.*s3:,s3:,")

=== renamed file 'tests/test_win_agent_archive.py' => 'tests/test_agent_archive.py'
--- tests/test_win_agent_archive.py	2015-05-26 19:35:48 +0000
+++ tests/test_agent_archive.py	2015-05-27 15:02:21 +0000
@@ -2,7 +2,7 @@
 import os
 from unittest import TestCase
 
-from win_agent_archive import (
+from agent_archive import (
     add_agents,
     delete_agents,
     get_agents,
@@ -28,7 +28,7 @@
 class WinAgentArchive(TestCase):
 
     def test_main_options(self):
-        with patch('win_agent_archive.add_agents') as mock:
+        with patch('agent_archive.add_agents') as mock:
             main(['-d', '-v', '-c', 'foo', 'add', 'bar'])
             args, kwargs = mock.call_args
             args = args[0]
@@ -37,7 +37,7 @@
             self.assertEqual('foo', args.config)
 
     def test_main_add(self):
-        with patch('win_agent_archive.add_agents') as mock:
+        with patch('agent_archive.add_agents') as mock:
             main(['add', 'path/juju-1.21.0-win2012-amd64.tgz'])
             args, kwargs = mock.call_args
             args = args[0]
@@ -47,7 +47,7 @@
             self.assertFalse(args.dry_run)
 
     def test_main_get(self):
-        with patch('win_agent_archive.get_agents') as mock:
+        with patch('agent_archive.get_agents') as mock:
             main(['get', '1.21.0', './'])
             args, kwargs = mock.call_args
             args = args[0]
@@ -57,7 +57,7 @@
             self.assertFalse(args.dry_run)
 
     def test_main_delete(self):
-        with patch('win_agent_archive.delete_agents') as mock:
+        with patch('agent_archive.delete_agents') as mock:
             main(['delete', '1.21.0'])
             args, kwargs = mock.call_args
             args = args[0]
@@ -105,7 +105,7 @@
             get_source_agent_os('juju-1.24.footu-amd64.tgz')
 
     def test_listing_to_files(self):
-        start = '2014-10-23 22:11   9820182   s3://juju-qa-data/win-agents/%s'
+        start = '2014-10-23 22:11   9820182   s3://juju-qa-data/agent-archive/%s'
         listing = []
         expected_agents = []
         agents = [
@@ -114,13 +114,13 @@
         ]
         for agent in agents:
             listing.append(start % agent)
-            expected_agents.append('s3://juju-qa-data/win-agents/%s' % agent)
+            expected_agents.append('s3://juju-qa-data/agent-archive/%s' % agent)
         agents = listing_to_files('\n'.join(listing))
         self.assertEqual(expected_agents, agents)
 
     def test_add_agent_with_bad_source_raises_error(self):
         cmd_args = FakeArgs(source_agent='juju-1.21.0-trusty-amd64.tgz')
-        with patch('win_agent_archive.run') as mock:
+        with patch('agent_archive.run') as mock:
             with self.assertRaises(ValueError) as e:
                 add_agents(cmd_args)
         self.assertIn('does not look like a agent', str(e.exception))
@@ -128,7 +128,7 @@
 
     def test_add_agent_with_unexpected_version_raises_error(self):
         cmd_args = FakeArgs(source_agent='juju-1.21.0-win2013-amd64.tgz')
-        with patch('win_agent_archive.run') as mock:
+        with patch('agent_archive.run') as mock:
             with self.assertRaises(ValueError) as e:
                 add_agents(cmd_args)
         self.assertIn('not match an expected version', str(e.exception))
@@ -136,101 +136,101 @@
 
     def test_add_agent_with_exist_source_raises_error(self):
         cmd_args = FakeArgs(source_agent='juju-1.21.0-win2012-amd64.tgz')
-        output = 's3://juju-qa-data/win-agents/juju-1.21.0-win2012-amd64.tgz'
-        with patch('win_agent_archive.run', return_value=output) as mock:
+        output = 's3://juju-qa-data/agent-archive/juju-1.21.0-win2012-amd64.tgz'
+        with patch('agent_archive.run', return_value=output) as mock:
             with self.assertRaises(ValueError) as e:
                 add_agents(cmd_args)
         self.assertIn('Agents cannot be overwritten', str(e.exception))
         args, kwargs = mock.call_args
         self.assertEqual(
-            (['ls', 's3://juju-qa-data/win-agents/juju-1.21.0*'], ),
+            (['ls', 's3://juju-qa-data/agent-archive/juju-1.21.0*'], ),
             args)
         self.assertIs(None, kwargs['config'])
 
     def test_add_agent_puts_and_copies_win(self):
         cmd_args = FakeArgs(source_agent='juju-1.21.0-win2012-amd64.tgz')
-        with patch('win_agent_archive.run', return_value='') as mock:
+        with patch('agent_archive.run', return_value='') as mock:
             add_agents(cmd_args)
         self.assertEqual(8, mock.call_count)
         output, args, kwargs = mock.mock_calls[0]
         self.assertEqual(
-            (['ls', 's3://juju-qa-data/win-agents/juju-1.21.0*'], ),
+            (['ls', 's3://juju-qa-data/agent-archive/juju-1.21.0*'], ),
             args)
         output, args, kwargs = mock.mock_calls[1]
         agent_path = os.path.abspath(cmd_args.source_agent)
         self.assertEqual(
             (['put', agent_path,
-              's3://juju-qa-data/win-agents/juju-1.21.0-win2012-amd64.tgz'], ),
+              's3://juju-qa-data/agent-archive/juju-1.21.0-win2012-amd64.tgz'], ),
             args)
         # The remaining calls after the put is a fast cp to the other names.
         output, args, kwargs = mock.mock_calls[2]
         self.assertEqual(
             (['cp',
-             's3://juju-qa-data/win-agents/juju-1.21.0-win2012-amd64.tgz',
-             's3://juju-qa-data/win-agents/juju-1.21.0-win2012hvr2-amd64.tgz'
+             's3://juju-qa-data/agent-archive/juju-1.21.0-win2012-amd64.tgz',
+             's3://juju-qa-data/agent-archive/juju-1.21.0-win2012hvr2-amd64.tgz'
               ], ),
             args)
         output, args, kwargs = mock.mock_calls[7]
         self.assertEqual(
             (['cp',
-             's3://juju-qa-data/win-agents/juju-1.21.0-win2012-amd64.tgz',
-             's3://juju-qa-data/win-agents/juju-1.21.0-win81-amd64.tgz'], ),
+             's3://juju-qa-data/agent-archive/juju-1.21.0-win2012-amd64.tgz',
+             's3://juju-qa-data/agent-archive/juju-1.21.0-win81-amd64.tgz'], ),
             args)
 
     def test_add_agent_puts_centos(self):
         cmd_args = FakeArgs(source_agent='juju-1.24.0-centos7-amd64.tgz')
-        with patch('win_agent_archive.run', return_value='') as mock:
+        with patch('agent_archive.run', return_value='') as mock:
             add_agents(cmd_args)
         self.assertEqual(2, mock.call_count)
         output, args, kwargs = mock.mock_calls[0]
         self.assertEqual(
-            (['ls', 's3://juju-qa-data/win-agents/juju-1.24.0*'], ),
+            (['ls', 's3://juju-qa-data/agent-archive/juju-1.24.0*'], ),
             args)
         output, args, kwargs = mock.mock_calls[1]
         agent_path = os.path.abspath(cmd_args.source_agent)
         self.assertEqual(
             (['put', agent_path,
-              's3://juju-qa-data/win-agents/juju-1.24.0-centos7-amd64.tgz'], ),
+              's3://juju-qa-data/agent-archive/juju-1.24.0-centos7-amd64.tgz'], ),
             args)
 
     def test_get_agent(self):
         cmd_args = FakeArgs(version='1.21.0', destination='./')
         destination = os.path.abspath(cmd_args.destination)
-        with patch('win_agent_archive.run') as mock:
+        with patch('agent_archive.run') as mock:
             get_agents(cmd_args)
         args, kwargs = mock.call_args
         self.assertEqual(
-            (['get', 's3://juju-qa-data/win-agents/juju-1.21.0*',
+            (['get', 's3://juju-qa-data/agent-archive/juju-1.21.0*',
               destination], ),
             args)
 
     def test_delete_agent_without_matches_error(self):
         cmd_args = FakeArgs(version='1.21.0')
-        with patch('win_agent_archive.run', return_value='') as mock:
+        with patch('agent_archive.run', return_value='') as mock:
             with self.assertRaises(ValueError) as e:
                 delete_agents(cmd_args)
         self.assertIn('No 1.21.0 agents found', str(e.exception))
         args, kwargs = mock.call_args
         self.assertEqual(
-            (['ls', 's3://juju-qa-data/win-agents/juju-1.21.0*'], ),
+            (['ls', 's3://juju-qa-data/agent-archive/juju-1.21.0*'], ),
             args)
         self.assertIs(None, kwargs['config'], )
 
     def test_delete_agent_without_yes(self):
         cmd_args = FakeArgs(version='1.21.0')
         fake_listing = 'juju-1.21.0-win2012-amd64.tgz'
-        with patch('win_agent_archive.run', return_value=fake_listing) as mock:
-            with patch('win_agent_archive.get_input', return_value=''):
+        with patch('agent_archive.run', return_value=fake_listing) as mock:
+            with patch('agent_archive.get_input', return_value=''):
                 delete_agents(cmd_args)
         self.assertEqual(1, mock.call_count)
         args, kwargs = mock.call_args
         self.assertEqual(
-            (['ls', 's3://juju-qa-data/win-agents/juju-1.21.0*'], ),
+            (['ls', 's3://juju-qa-data/agent-archive/juju-1.21.0*'], ),
             args)
 
     def test_delete_agent_with_yes(self):
         cmd_args = FakeArgs(version='1.21.0')
-        start = '2014-10-23 22:11   9820182   s3://juju-qa-data/win-agents/%s'
+        start = '2014-10-23 22:11   9820182   s3://juju-qa-data/agent-archive/%s'
         listing = []
         agents = [
             'juju-1.21.0-win2012-amd64.tgz',
@@ -239,23 +239,23 @@
         for agent in agents:
             listing.append(start % agent)
         fake_listing = '\n'.join(listing)
-        with patch('win_agent_archive.run', return_value=fake_listing) as mock:
-            with patch('win_agent_archive.get_input', return_value='y'):
+        with patch('agent_archive.run', return_value=fake_listing) as mock:
+            with patch('agent_archive.get_input', return_value='y'):
                 delete_agents(cmd_args)
         self.assertEqual(3, mock.call_count)
         output, args, kwargs = mock.mock_calls[0]
         self.assertEqual(
-            (['ls', 's3://juju-qa-data/win-agents/juju-1.21.0*'], ),
+            (['ls', 's3://juju-qa-data/agent-archive/juju-1.21.0*'], ),
             args)
         output, args, kwargs = mock.mock_calls[1]
         self.assertEqual(
             (['del',
-             's3://juju-qa-data/win-agents/juju-1.21.0-win2012-amd64.tgz'], ),
+             's3://juju-qa-data/agent-archive/juju-1.21.0-win2012-amd64.tgz'], ),
             args)
         output, args, kwargs = mock.mock_calls[2]
         self.assertEqual(
             (['del',
-             's3://juju-qa-data/win-agents/juju-1.21.0-win8.1-amd64.tgz'], ),
+             's3://juju-qa-data/agent-archive/juju-1.21.0-win8.1-amd64.tgz'], ),
             args)
         self.assertIs(None, kwargs['config'])
         self.assertFalse(kwargs['dry_run'])