From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Fri, 6 Jan 2023 17:28:32 +0000 (+0100)
Subject: Leverage s3 as lf-build5 and 6 are down
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?p=releng.git;a=commitdiff_plain;h=4f3ef44f1e06e0ccd1797283663096cdf4a62237

Leverage s3 as lf-build5 and 6 are down

Change-Id: I18542f425dcbe585b1bb494bd89a66f7e7e962ee
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
---

diff --git a/jjb/releng/releng-jobs.yaml b/jjb/releng/releng-jobs.yaml
index 84277d686..d8c4b3097 100644
--- a/jjb/releng/releng-jobs.yaml
+++ b/jjb/releng/releng-jobs.yaml
@@ -450,7 +450,7 @@
           sudo apt-get -o DPkg::Lock::Timeout=300 update && \
           sudo DEBIAN_FRONTEND=noninteractive apt-get \
             -o DPkg::Lock::Timeout=300 install \
-            google-cloud-sdk -y
+            google-cloud-sdk s4cmd -y
           cd $WORKSPACE/utils/
           ./artifacts.opnfv.org.sh
 
@@ -482,5 +482,5 @@
           sudo apt-get -o DPkg::Lock::Timeout=300 update && \
           sudo DEBIAN_FRONTEND=noninteractive apt-get \
             -o DPkg::Lock::Timeout=300 install \
-            google-cloud-sdk -y
+            google-cloud-sdk s4cmd -y
           $WORKSPACE/utils/retention_script.sh
diff --git a/utils/retention_script.sh b/utils/retention_script.sh
index 3d0673ad0..4a06b002c 100755
--- a/utils/retention_script.sh
+++ b/utils/retention_script.sh
@@ -29,7 +29,7 @@ do
 
     if [[ "$daysold" -gt "10" ]]; then
       echo "$daysold Days old deleting: $(basename $artifact)"
-      gsutil rm "$artifact"
+      s4cmd del --endpoint-url https://storage.googleapis.com "$artifact"
     else
       echo "$daysold Days old retaining: $(basename $artifact)"
     fi