summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2023-01-06 18:47:23 +0100
committerCédric Ollivier <cedric.ollivier@orange.com>2023-01-06 18:48:54 +0100
commite059edae3ac4dbf69aed1f1dcb1b3dc1056d4eac (patch)
treeabeec8e97e59c1cb22146348ec24f4b288854601
parent4f3ef44f1e06e0ccd1797283663096cdf4a62237 (diff)
Revert to gsutil
Everything is hardcoded to gsutil. A bigger change would be required. Change-Id: I5f49b83e5834294ed925c34984a4754f37c0a458 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
-rw-r--r--jjb/releng/releng-jobs.yaml4
-rwxr-xr-xutils/retention_script.sh2
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