[gnome-build-meta/s3-extreme-makeover] s3: make file names unique



commit 36b80aa26de3fba7b007924c7162ea46317c04b9
Author: Bartłomiej Piotrowski <bpiotrowski gnome org>
Date:   Thu Oct 29 19:25:31 2020 +0100

    s3: make file names unique

 .gitlab-ci.yml | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f5369bd8..446a42f0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -278,12 +278,12 @@ s3-image:
   - |
     if [ -n "$CI_COMMIT_TAG" ]; then
         aws s3 cp --acl public-read iso/installer.iso \
-            s3://gnome-build-meta/tag/$CI_COMMIT_TAG/gnome_os_installer.iso
+            s3://gnome-build-meta/tag/$CI_COMMIT_TAG/gnome_os_installer_$CI_COMMIT_TAG.iso
     else
         aws s3 cp --acl public-read image/disk.img.xz \
-            s3://gnome-build-meta/nightly/$CI_PIPELINE_ID/disk.img.xz
+            s3://gnome-build-meta/nightly/$CI_PIPELINE_ID/disk_$CI_PIPELINE_ID.img.xz
         aws s3 cp --acl public-read iso/installer.iso \
-            s3://gnome-build-meta/nightly/$CI_PIPELINE_ID/gnome_os_installer.iso
+            s3://gnome-build-meta/nightly/$CI_PIPELINE_ID/gnome_os_installer_$CI_PIPELINE_ID.iso
     fi
 
   - aws s3 ls --recursive --human-readable s3://gnome-build-meta/
@@ -308,9 +308,8 @@ s3-image-static:
     when: manual
   script:
   - |
-    # Assume that the s3-image job has succeed and copy the img form the s3 uri
-    echo nightly/$CI_PIPELINE_ID/gnome_os_installer.iso > image/latest-iso
-    echo nightly/$CI_PIPELINE_ID/disk.img.xz > image/latest-disk
+    echo nightly/$CI_PIPELINE_ID/gnome_os_installer_$CI_PIPELINE_ID.iso > image/latest-iso
+    echo nightly/$CI_PIPELINE_ID/disk_$CI_PIPELINE_ID.img.xz > image/latest-disk
   - |
     aws s3 cp --acl public-read image/latest-iso s3://gnome-build-meta/nightly/latest-iso
     aws s3 cp --acl public-read image/latest-disk s3://gnome-build-meta/nightly/latest-disk


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]