canonical-ubuntu-qa team mailing list archive

[Brian Murray <mp+445296@xxxxxxxxxxxxxxxxxx>]

Brian Murray has proposed merging autopkgtest-cloud:get-and-put into autopkgtest-cloud:master.

Requested reviews:
  Canonical's Ubuntu QA (canonical-ubuntu-qa)

For more details, see:
https://code.launchpad.net/~ubuntu-release/autopkgtest-cloud/+git/autopkgtest-cloud/+merge/445296

I was a bit put off by the print messages in seed-new-release when I started using `--dry-run` in production. I think this makes the message clearer, but its worth noting there are more messages now.
-- 
Your team Canonical's Ubuntu QA is requested to review the proposed merge of autopkgtest-cloud:get-and-put into autopkgtest-cloud:master.

diff --git a/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/seed-new-release b/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/seed-new-release
index e45d7a2..656c5f7 100755
--- a/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/seed-new-release
+++ b/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/seed-new-release
@@ -35,11 +35,11 @@ def copy_result(rel_path, old_release, new_release):
 
     from_path = old_release + rel_path
     to_path = new_release + rel_path
-    print('Copying %s' % from_path)
     try:
+        print('Getting %s' % from_path)
         headers, contents = swift_con.get_object('autopkgtest-' + old_release, from_path)
     except swiftclient.exceptions.ClientException:
-        print('Could not copy %s - not found' % rel_path)
+        print('Could not get %s - not found' % rel_path)
         return
 
     headers_to_copy = {}
@@ -52,6 +52,7 @@ def copy_result(rel_path, old_release, new_release):
     for retry in range(10):
         try:
             if not args.dry_run:
+                print('Putting %s' % from_path)
                 swiftclient.put_object(swift_con.url, token=swift_con.token,
                                        container='autopkgtest-' + new_release,
                                        name=to_path,