[gnome-build-meta/s3-extreme-makeover: 2/4] s3: put artifacts into tag or nightly directory

[Abderrahim Kitouni <akitouni src gnome org>]

commit e8c8191f0bb187e0ea3000e0039d11ab8723a48f
Author: Bartłomiej Piotrowski <bpiotrowski gnome org>
Date:   Wed Oct 28 16:42:06 2020 +0100

    s3: put artifacts into tag or nightly directory
    
    This way we can apply S3 retention policy on the AWS end; --expires
    is used for Expire HTTP header and not object expiration.

 .gitlab-ci.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 38f7d772..3b1c2907 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -277,13 +277,13 @@ s3-image:
 
   - |
     if [ -n "$CI_COMMIT_TAG" ]; then
-        aws s3 cp --acl public-read --expires $(date -I --date="6 weeks") iso/installer.iso \
-            s3://gnome-build-meta/$CI_COMMIT_TAG/gnome_os_installer.iso
+        aws s3 cp iso/installer.iso \
+            s3://gnome-build-meta/tag/$CI_COMMIT_TAG/gnome_os_installer.iso
     else
-        aws s3 cp --acl public-read --expires $(date -I --date="1 week") image/disk.img.xz \
-            s3://gnome-build-meta/$CI_PIPELINE_ID/disk.img.xz
-        aws s3 cp --acl public-read --expires $(date -I --date="1 week") iso/installer.iso \
-            s3://gnome-build-meta/$CI_PIPELINE_ID/gnome_os_installer.iso
+        aws s3 cp image/disk.img.xz \
+            s3://gnome-build-meta/nightly/$CI_PIPELINE_ID/disk.img.xz
+        aws s3 cp iso/installer.iso \
+            s3://gnome-build-meta/nightly/$CI_PIPELINE_ID/gnome_os_installer.iso
     fi
 
   - aws s3 ls --recursive --human-readable s3://gnome-build-meta/