From e059edae3ac4dbf69aed1f1dcb1b3dc1056d4eac Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Fri, 6 Jan 2023 18:47:23 +0100 Subject: Revert to gsutil MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Everything is hardcoded to gsutil. A bigger change would be required. Change-Id: I5f49b83e5834294ed925c34984a4754f37c0a458 Signed-off-by: Cédric Ollivier --- jjb/releng/releng-jobs.yaml | 4 ++-- utils/retention_script.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/jjb/releng/releng-jobs.yaml b/jjb/releng/releng-jobs.yaml index d8c4b3097..84277d686 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 s4cmd -y + google-cloud-sdk -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 s4cmd -y + google-cloud-sdk -y $WORKSPACE/utils/retention_script.sh diff --git a/utils/retention_script.sh b/utils/retention_script.sh index 4a06b002c..3d0673ad0 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)" - s4cmd del --endpoint-url https://storage.googleapis.com "$artifact" + gsutil rm "$artifact" else echo "$daysold Days old retaining: $(basename $artifact)" fi -- cgit 1.2.3-korg