container-guest-tools: Deal with gsutil

gsutil cp -r has semantics that depend on whether the target directory
already exists or not. If it does, the source directory will be
created under the target, otherwise the *contents* of the source
directory are copied directly under the (newly created) target. Make
sure we always target a directory that (shouldn't) exist by including
the build number in the target path.

BUG=none
TEST=Ran script

Disallow-Recycled-Builds: test-failures
Change-Id: Idd362a72e8d6533142613d8f08b77430f63fbd89
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/containers/cros-container-guest-tools/+/2636034
Reviewed-by: Nicholas Verne <nverne@chromium.org>
Tested-by: kokoro <noreply+kokoro@google.com>
Commit-Queue: Fergus Dall <sidereal@google.com>
diff --git a/termina/termina_upload.py b/termina/termina_upload.py
index 3002a4f..76f6635 100755
--- a/termina/termina_upload.py
+++ b/termina/termina_upload.py
@@ -42,7 +42,7 @@
     subprocess.check_call(
         ["gsutil.py", "--", "cp", "-a", "public-read", local_copy, remote_copy])
 
-  subprocess.check_call(["gsutil.py", "--", "cp", "-r", omaha_url, testing_url])
+  subprocess.check_call(["gsutil.py", "--", "cp", "-r", omaha_url, '{}/{}'.format(testing_url, build)])
 
   with tempfile.NamedTemporaryFile(mode="w", delete=False) as tmp:
     tmp.write("{}\n".format(build))