Compare commits
2 Commits
dedd162bb5
...
c37d92a4cf
Author | SHA1 | Date | |
---|---|---|---|
c37d92a4cf | |||
d8617d01eb |
6
.jenkins/Jenkinsfile
vendored
6
.jenkins/Jenkinsfile
vendored
@ -59,11 +59,11 @@ pipeline {
|
||||
git config --global user.email "jenkins@marcin00.pl"
|
||||
'''
|
||||
sshagent(['gitea-deploy-key']) {
|
||||
sh 'git clone ${DEPLOY_REPO} --branch jenkins-kubernetes'
|
||||
sh 'git clone ${DEPLOY_REPO} --branch fluxcd'
|
||||
}
|
||||
}
|
||||
|
||||
dir('user-microservice-deploy') {
|
||||
dir('user-microservice-deploy/apps/user-microservice') {
|
||||
sh '''
|
||||
# Podmień tag obrazu w pliku deploy.yaml
|
||||
awk -v commit="$GIT_COMMIT" '
|
||||
@ -82,7 +82,7 @@ pipeline {
|
||||
sh '''
|
||||
git add deploy.yaml
|
||||
git diff-index --quiet HEAD || git commit -m "JENKINS: Changed deployed version to $GIT_COMMIT"
|
||||
git push origin jenkins-kubernetes
|
||||
git push origin fluxcd
|
||||
'''
|
||||
}
|
||||
}
|
||||
|
@ -36,19 +36,30 @@ fi
|
||||
echo "[INFO] Oczekiwanie na wdrożenie nowej wersji..."
|
||||
|
||||
# === Odpytywanie endpointa /version ===
|
||||
WAITED=0
|
||||
echo "[WAIT] Oczekiwanie na nową wersję..."
|
||||
|
||||
while true; do
|
||||
sleep $CHECK_INTERVAL
|
||||
WAITED=$((WAITED + CHECK_INTERVAL))
|
||||
|
||||
NEW_VERSION=$(curl -s "$APP_URL" | jq -r '.version')
|
||||
|
||||
if [[ "$NEW_VERSION" != "$OLD_VERSION" ]]; then
|
||||
END_TIME=$(date +%s)
|
||||
DURATION=$((END_TIME - START_TIME))
|
||||
echo "[INFO] Nowa wersja wdrożona: $NEW_VERSION"
|
||||
|
||||
# Nadpisujemy linię z licznikiem
|
||||
printf "\r[INFO] Nowa wersja wdrożona po %ds: %s\n" "$WAITED" "$NEW_VERSION"
|
||||
echo "[INFO] Czas wdrożenia: $DURATION sekund"
|
||||
|
||||
echo "$START_TIME,$END_TIME,$DURATION,$OLD_VERSION,$NEW_VERSION" >> "$OUTPUT_FILE"
|
||||
break
|
||||
else
|
||||
echo "[WAIT] Czekam... ($NEW_VERSION)"
|
||||
# Nadpisujemy TYLKO linię z licznikiem
|
||||
printf "\r[WAIT] Czekam... %ds" "$WAITED"
|
||||
fi
|
||||
done
|
||||
|
||||
# Żeby kursor przeszedł do nowej linii po zakończeniu
|
||||
echo ""
|
||||
|
Reference in New Issue
Block a user