summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCedric Ollivier <cedric.ollivier@orange.com>2023-01-17 18:22:26 +0000
committerGerrit Code Review <gerrit@opnfv.org>2023-01-17 18:22:26 +0000
commit46ba11449770d5c22fd8e3dca9cd89760c3dbd20 (patch)
tree87dac0f219fcb706376ce372cb64ea30c8a7c791
parent4bed87d64065c1ed04a4a56109ddd1161e180868 (diff)
parente059edae3ac4dbf69aed1f1dcb1b3dc1056d4eac (diff)
Merge "Revert to gsutil"
-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