canonical-ubuntu-qa team mailing list archive

[Tim Andersson <mp+462155@xxxxxxxxxxxxxxxxxx>]

Tim Andersson has proposed merging ~andersson123/autopkgtest-cloud:db-backup-fix into autopkgtest-cloud:master.

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

For more details, see:
https://code.launchpad.net/~andersson123/autopkgtest-cloud/+git/autopkgtest-cloud/+merge/462155
-- 
Your team Canonical's Ubuntu QA is requested to review the proposed merge of ~andersson123/autopkgtest-cloud:db-backup-fix into autopkgtest-cloud:master.

diff --git a/charms/focal/autopkgtest-web/webcontrol/db-backup b/charms/focal/autopkgtest-web/webcontrol/db-backup
index fc5190a..4ca6a20 100755
--- a/charms/focal/autopkgtest-web/webcontrol/db-backup
+++ b/charms/focal/autopkgtest-web/webcontrol/db-backup
@@ -103,10 +103,7 @@ def upload_backup_to_db(
     Upload compressed database to swift storage under container db-backups
     """
     now = datetime.datetime.utcnow().strftime("%Y/%m/%d/%H_%M_%S")
-    # object_path = "%s/%s" % (now, DB_PATH.name + ".gz")
-    object_path = Path(f"{now:%Y/%m/%d/%H_%M_%S}") / DB_PATH.with_name(
-        "%s.gz" % DB_PATH.name
-    )
+    object_path = "%s/%s" % (now, DB_PATH.name + ".gz")
     for retry in range(SWIFT_RETRIES):
         try:
             swift_conn.put_object(