From 8c9b1312bce29ef453b1aeed2af84d7493e3623f Mon Sep 17 00:00:00 2001 From: Jay Sharma Date: Thu, 12 Oct 2023 23:44:49 +0530 Subject: [PATCH] Rclone fix --- common-jobs-bitbucket.sh | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/common-jobs-bitbucket.sh b/common-jobs-bitbucket.sh index 53613122..5030223a 100644 --- a/common-jobs-bitbucket.sh +++ b/common-jobs-bitbucket.sh @@ -88,18 +88,20 @@ kubectl apply -f build/$ENV/pod.tpl && kubectl apply -f build/$ENV/pvc.yml && kubectl cp setenv.sh $NAMESPACE/common-job-pod:/tmp/setenv.sh kubectl exec common-job-pod -n $NAMESPACE -- sh -c 'chmod 755 /tmp/setenv.sh' kubectl exec common-job-pod -n $NAMESPACE -- apt update -kubectl exec common-job-pod -n $NAMESPACE -- apt install wget zip unzip curl git rsync -y +kubectl exec common-job-pod -n $NAMESPACE -- apt install wget zip unzip curl git rclone rsync -y # --------------------------------------------------------------------------------------------------------------------------------------------------------- kubectl exec common-job-pod -n $NAMESPACE -- sh -c '. /tmp/setenv.sh; -cd /tmp; +cd /tmp; git clone --branch="develop" https://x-token-auth:$TOKEN@bitbucket.org/connectamerica/$REPO.git; cd $REPO/; git config user.email "{botid}@bots.bitbucket.org" ; git checkout -b feature/$VERSION-$ENV-$SUBDOMAIN && git push --set-upstream origin feature/$VERSION-$ENV-$SUBDOMAIN; -rsync -a --delete --exclude 'wp-content/uploads' /usr/share/nginx/subdomain/$SUBDOMAIN/ wp; -git add --all && git commit -m "auto-patch $VERSION-$ENV-$SUBDOMAIN-$(date +%Y-%m-%dT%H_%M_%S)" && git push' -#-------------------------------------------------------------------------------------------------------------- +rclone sync --exclude wp-content/uploads/** /usr/share/nginx/subdomain/$SUBDOMAIN/ wp -q ; +echo "-----sync-done-----" ; +git add --all && git commit -m "auto-patch $VERSION-$ENV-$SUBDOMAIN-$(date +%Y-%m-%dT%H_%M_%S)" ; +git push && echo ---git-push-done--- ' + #-------------------------------------------------------------------------------------------------------------- kubectl delete po common-job-pod -n $NAMESPACE @@ -118,9 +120,9 @@ kubectl exec common-job-pod -n $NAMESPACE -- sh -c 'chmod 755 /tmp/setenv.sh' # -------------------------------------------------------------------------------------------- kubectl exec common-job-pod -n $NAMESPACE -- apt update kubectl exec common-job-pod -n $NAMESPACE -- apt install rclone rsync -y -kubectl exec common-job-pod -n $NAMESPACE -- sh -c '. /tmp/setenv.sh; cd /tmp && rclone sync --size-only --fast-list --exclude wp-content/uploads/** wp/ /usr/share/nginx/subdomain/$SUBDOMAIN && echo ---sync-done--- ' +kubectl exec common-job-pod -n $NAMESPACE -- sh -c '. /tmp/setenv.sh; cd /tmp && rclone sync --exclude wp-content/uploads/** wp/ /usr/share/nginx/subdomain/$SUBDOMAIN -q && echo ---sync-done--- ' -echo $SUBDOMAIN | grep www && echo "maindomain $URL_DOMAIN" || kubectl delete po common-job-pod -n $NAMESPACE +kubectl delete po common-job-pod -n $NAMESPACE # ------------------------------------------------------------------------------------------------------------------------- cat script.log | egrep -v "Errors:|SQL|rewrite|Rewrite|warning|Warning|create mode" | egrep -i "not in gzip format|fail|fatal|exception|terminated|command not found|error|unexpected|cannot access|No such file" && exit 9 || echo VALIDATION_PASS_$opt @@ -256,7 +258,7 @@ kubectl cp $FILE $NAMESPACE/common-job-pod:/tmp/$FILE kubectl exec common-job-pod -n $NAMESPACE -- sh -c '. /tmp/setenv.sh; mkdir -p /usr/share/nginx/subdomain/$SUBDOMAIN/wp-content/uploads' # ---------------------------------------------------------------------------------------------------------------------------------------------------- kubectl exec common-job-pod -n $NAMESPACE -- sh -c '. /tmp/setenv.sh; mkdir /tmp/uploads ;export FILE=`ls /tmp/*.zip`;unzip -o $FILE -d /tmp/uploads' -kubectl exec common-job-pod -n $NAMESPACE -- sh -c '. /tmp/setenv.sh; rclone sync --size-only --fast-list /tmp/uploads/ /usr/share/nginx/subdomain/$SUBDOMAIN/wp-content/uploads && echo ---sync-done--- ' +kubectl exec common-job-pod -n $NAMESPACE -- sh -c '. /tmp/setenv.sh; rclone sync /tmp/uploads/ /usr/share/nginx/subdomain/$SUBDOMAIN/wp-content/uploads -q && echo ---sync-done--- ' # -------------------------------------------------------------------------------------- kubectl delete po common-job-pod -n $NAMESPACE cat script.log | egrep -v "Errors:|SQL|rewrite|Rewrite|warning|Warning|create mode" | egrep -i "not in gzip format|fail|fatal|exception|terminated|command not found|error|unexpected|cannot access|No such file" && exit 9 || echo VALIDATION_PASS_$opt