From d37566ffb67b1abb2ad542a6c1681418afcad1e5 Mon Sep 17 00:00:00 2001 From: Jay Sharma Date: Tue, 10 Oct 2023 20:23:23 +0000 Subject: [PATCH] common-jobs-bitbucket.sh edited online with Bitbucket --- common-jobs-bitbucket.sh | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/common-jobs-bitbucket.sh b/common-jobs-bitbucket.sh index a5a69167..d066f6db 100644 --- a/common-jobs-bitbucket.sh +++ b/common-jobs-bitbucket.sh @@ -98,7 +98,7 @@ git clone --branch="develop" https://x-token-auth:$TOKEN@bitbucket.org/connectam 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 --exclude 'wp-content/uploads' /usr/share/nginx/subdomain/$SUBDOMAIN/ wp; +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' #-------------------------------------------------------------------------------------------------------------- @@ -123,8 +123,13 @@ kubectl apply -f build/$ENV/pod.tpl && kubectl apply -f build/$ENV/pvc.yml && kubectl cp wp $NAMESPACE/common-job-pod:/tmp && echo "wp copy to /tmp done" || exit 9 kubectl cp setenv.sh $NAMESPACE/common-job-pod:/tmp/setenv.sh && echo "setenv copy done" || exit 9 kubectl exec common-job-pod -n $NAMESPACE -- sh -c 'chmod 755 /tmp/setenv.sh' -kubectl exec common-job-pod -n $NAMESPACE -- sh -c '. /tmp/setenv.sh ; cp -rf /tmp/wp/* /usr/share/nginx/subdomain/$SUBDOMAIN/' -echo $SUBDOMAIN | grep www && echo "maindomain $URL_DOMAIN" || kubectl delete po common-job-pod -n $NAMESPACE +# -------------------------------------------------------------------------------------------- +kubectl exec common-job-pod -n $NAMESPACE -- apt update +kubectl exec common-job-pod -n $NAMESPACE -- apt install rsync -y +kubectl exec common-job-pod -n $NAMESPACE -- sh -c '. /tmp/setenv.sh; cd /tmp; +rsync -av --delete --exclude 'wp-content/uploads' wp/ /usr/share/nginx/subdomain/$SUBDOMAIN' +# -------------------------------------------------------------------------------------------- +echo $SUBDOMAIN | grep www && echo "maindomain $URL_DOMAIN" || kubectl delete po common-job-pod -n $NAMESPACE cat script.log | egrep -v "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