Commit 32b005da authored by Combava Orange's avatar Combava Orange
Browse files

Merge branch 'hotfix/logs_clea-batch' into 'master'

add aws s3 --no-progress

See merge request !21
parents 846a767f 489bd058
Pipeline #280385 passed with stages
in 12 minutes and 4 seconds
......@@ -59,7 +59,7 @@ fi
info "Copying to OUTSCALE ...."
AWS_OPTS="--profile=$PROFILE_OUTSCALE --endpoint-url=$ENDPOINT_OUTSCALE"
AWS_OPTS="--profile=$PROFILE_OUTSCALE --endpoint-url=$ENDPOINT_OUTSCALE --no-progress"
BUCKET="$BUCKET_OUTSCALE"
# All files except indexCluster.json
......@@ -71,7 +71,7 @@ aws $AWS_OPTS s3 cp --acl public-read $(find $WORKDIR -type f -name clusterInd
# --------------------
if [ -n "$BUCKET_SCALEWAY" ] && [ -n "$PROFILE_SCALEWAY" ] && [ -n "$ENDPOINT_SCALEWAY" ] ; then
info "Copying to SCALEWAY ...."
AWS_OPTS="--profile=$PROFILE_SCALEWAY --endpoint-url=$ENDPOINT_SCALEWAY"
AWS_OPTS="--profile=$PROFILE_SCALEWAY --endpoint-url=$ENDPOINT_SCALEWAY --no-progress"
BUCKET=$BUCKET_SCALEWAY
# All files except indexCluster.json
......
......@@ -79,7 +79,7 @@ setup() {
export -f java
# fails for s3cmd sync but not for s3cmd put
aws() { echo "CALLING_AWS_S3 ${*}" ; [ $4 == "sync" ] && return 1 || return 0; }
aws() { echo "CALLING_AWS_S3 ${*}" ; [ $5 == "sync" ] && return 1 || return 0; }
export -f aws
mkdir -p /tmp/v1/123
......@@ -101,7 +101,7 @@ setup() {
export -f java
# fails for s3cmd put but not for s3cmd sync
aws() { echo "CALLING_AWS_S3 ${*}" ; [ $4 == "cp" ] && return 1 || return 0; }
aws() { echo "CALLING_AWS_S3 ${*}" ; [ $5 == "cp" ] && return 1 || return 0; }
export -f aws
mkdir -p /tmp/v1/123
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment