Automatyczna zmiana: 1752257920

.jenkins/Jenkinsfile

@@ -59,32 +59,31 @@ 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'
                         }
                     }
-
+                    sh '''
-                    dir('user-microservice-deploy') {
+                        cd user-microservice-deploy/apps/user-microservice
-                        sh '''
+                        # Podmień tag obrazu w pliku deploy.yaml
-                            # Podmień tag obrazu w pliku deploy.yaml
+                        awk -v commit="$GIT_COMMIT" '
-                            awk -v commit="$GIT_COMMIT" '
+                        $0 ~ /name:[[:space:]]*api/ { in_api_container = 1; print; next }
-                            $0 ~ /name:[[:space:]]*api/ { in_api_container = 1; print; next }
+                        in_api_container && $0 ~ /^[[:space:]]*image:[[:space:]]*/ {
-                            in_api_container && $0 ~ /^[[:space:]]*image:[[:space:]]*/ {
+                            sub(/:[^:[:space:]]+$/, ":" commit)
-                                sub(/:[^:[:space:]]+$/, ":" commit)
+                            in_api_container = 0
-                                in_api_container = 0
+                            print
-                                print
+                            next
-                                next
+                        }
-                            }
+                        { print }
-                            { print }
+                        ' deploy.yaml > deploy.tmp && mv deploy.tmp deploy.yaml
-                            ' deploy.yaml > deploy.tmp && mv deploy.tmp deploy.yaml
                         '''
 
-                        sshagent(['gitea-deploy-key']) {
+                    sshagent(['gitea-deploy-key']) {
-                            sh '''
+                        sh '''
-                                git add deploy.yaml
+                            cd user-microservice-deploy/apps/user-microservice
-                                git diff-index --quiet HEAD || git commit -m "JENKINS: Changed deployed version to $GIT_COMMIT"
+                            git add deploy.yaml
-                                git push origin jenkins-kubernetes
+                            git diff-index --quiet HEAD || git commit -m "JENKINS: Changed deployed version to $GIT_COMMIT"
-                            '''
+                            git push origin fluxcd
-                        }
+                        '''
                     }
                 }
             }

deployment_timer.sh

@@ -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 ""

version_marker.txt

@@ -1 +1 @@
-1752168984
+1752257920