Automatyczna zmiana: 1752257920

.jenkins/Jenkinsfile

@@ -0,0 +1,92 @@
+pipeline {
+    agent {
+        kubernetes {
+            yamlFile '.jenkins/podTemplate.yaml'
+        }
+    }
+
+    environment {
+        ACR_NAME = 'marcin00'
+        CLIENT_ID = 'c302726f-fafb-4143-94c1-67a70975574a'
+        DOCKER_REGISTRY_URL = 'marcin00.azurecr.io'
+        DOCKER_IMAGE = "${DOCKER_REGISTRY_URL}/user-microservice:${GIT_COMMIT}"
+        DEPLOY_REPO = 'ssh://git@srv22.mikr.us:20343/pikram/user-microservice-deploy.git'
+    }
+
+    stages {
+        stage('Code Tests') {
+            steps {
+                container('python') {
+                    dir('api') {
+                        sh '''
+                            python3 -m venv env
+                            source env/bin/activate
+                            pip install -r requirements.txt pytest
+                            python3 -m pytest --junit-xml=pytest_junit.xml
+                        '''
+                    }
+                }
+            }
+            post {
+                always {
+                    junit testResults: '**/*pytest_junit.xml'
+                }
+            }
+        }
+
+        stage('Build & Push Docker') {
+            steps {
+                container('docker') {
+                    sh '''
+                        docker build -t ${DOCKER_IMAGE} --build-arg APP_VERSION=${GIT_COMMIT} --build-arg BUILD_DATE=$(date -u +"%Y-%m-%dT%H:%M:%SZ") .
+                        az login --identity --client-id ${CLIENT_ID}
+                        az acr login --name ${ACR_NAME}
+                        docker push ${DOCKER_IMAGE}
+                    '''
+                }
+            }
+        }
+        stage('Commit new version to GitOps repo') {
+            steps {
+                container('git') {
+                    withCredentials([string(credentialsId: 'gitea-known-host', variable: 'GITEA_KNOWN_HOST')]) {
+                        sh '''
+                            mkdir -p ~/.ssh
+                            echo "$GITEA_KNOWN_HOST" >> ~/.ssh/known_hosts
+                            chmod 644 ~/.ssh/known_hosts
+
+                            git config --global user.name "jenkins[bot]"
+                            git config --global user.email "jenkins@marcin00.pl"
+                        '''
+                        sshagent(['gitea-deploy-key']) {
+                            sh 'git clone ${DEPLOY_REPO} --branch fluxcd'
+                        }
+                    }
+                    sh '''
+                        cd user-microservice-deploy/apps/user-microservice
+                        # Podmień tag obrazu w pliku deploy.yaml
+                        awk -v commit="$GIT_COMMIT" '
+                        $0 ~ /name:[[:space:]]*api/ { in_api_container = 1; print; next }
+                        in_api_container && $0 ~ /^[[:space:]]*image:[[:space:]]*/ {
+                            sub(/:[^:[:space:]]+$/, ":" commit)
+                            in_api_container = 0
+                            print
+                            next
+                        }
+                        { print }
+                        ' deploy.yaml > deploy.tmp && mv deploy.tmp deploy.yaml
+                        '''
+
+                    sshagent(['gitea-deploy-key']) {
+                        sh '''
+                            cd user-microservice-deploy/apps/user-microservice
+                            git add deploy.yaml
+                            git diff-index --quiet HEAD || git commit -m "JENKINS: Changed deployed version to $GIT_COMMIT"
+                            git push origin fluxcd
+                        '''
+                    }
+                }
+            }
+        }
+    }
+}

.jenkins/podTemplate.yaml

@@ -0,0 +1,60 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  annotations:
+    io.kubernetes.cri-o.userns-mode: "auto:size=65536"
+  labels:
+    jenkins: "slave"
+    jenkins/label: "kubernetes-agent"
+spec:
+  runtimeClassName: sysbox-runc
+  containers:
+    - name: jnlp
+      image: jenkins/inbound-agent:alpine
+      tty: false
+      workingDir: /home/jenkins/agent
+      volumeMounts:
+        - name: workspace-volume
+          mountPath: /home/jenkins/agent
+      env:
+        - name: JENKINS_WEB_SOCKET
+          value: "true"
+        - name: REMOTING_OPTS
+          value: "-noReconnectAfter 1d"
+
+    - name: python
+      image: python:3.11.7-alpine
+      command:
+        - cat
+      tty: true
+      workingDir: /home/jenkins/agent
+      volumeMounts:
+        - name: workspace-volume
+          mountPath: /home/jenkins/agent
+
+    - name: docker
+      image: marcin00.azurecr.io/azure-cli-docker:slim-bookworm
+      tty: true
+      workingDir: /home/jenkins/agent
+      volumeMounts:
+        - name: workspace-volume
+          mountPath: /home/jenkins/agent
+
+    - name: git
+      image: alpine/git:latest
+      command:
+        - cat
+      tty: true
+      workingDir: /home/jenkins/agent
+      volumeMounts:
+        - name: workspace-volume
+          mountPath: /home/jenkins/agent
+
+  nodeSelector:
+    kubernetes.io/os: linux
+
+  restartPolicy: Never
+
+  volumes:
+    - name: workspace-volume
+      emptyDir: {}

.woodpecker/build.yaml

@@ -1,70 +0,0 @@
-when:
-  - event: push
-    branch: woodpecker
-
-steps:
-  - name: code-tests
-    image: python:3.11.7-alpine
-    commands:
-      - cd api
-      - python3 -m venv env
-      - source env/bin/activate
-      - pip install -r requirements.txt pytest
-      - python3 -m pytest --junit-xml=pytest_junit.xml
-
-  - name: build-and-push
-    image: marcin00.azurecr.io/azure-cli-docker:slim-bookworm
-    environment:
-      ACR_NAME: marcin00
-      CLIENT_ID: c302726f-fafb-4143-94c1-67a70975574a
-    commands:
-      - dockerd &
-      - export DOCKER_IMAGE=marcin00.azurecr.io/user-microservice:${CI_COMMIT_SHA}
-      - docker build -t $DOCKER_IMAGE --build-arg APP_VERSION=${CI_COMMIT_SHA} --build-arg BUILD_DATE=$(date -u +"%Y-%m-%dT%H:%M:%SZ") .
-      - az login --identity --client-id $CLIENT_ID
-      - az acr login --name $ACR_NAME
-      - docker push $DOCKER_IMAGE
-    backend_options:
-      kubernetes:
-        annotations:
-          io.kubernetes.cri-o.userns-mode: "auto:size=65536"
-        runtimeClassName: sysbox-runc
-
-  - name: gitops-commit
-    image: alpine/git
-    environment:
-      DEPLOY_REPO: ssh://git@srv22.mikr.us:20343/pikram/user-microservice-deploy.git
-      GITEA_DEPLOY_KEY:
-        from_secret: gitea-deploy-key
-      GITEA_KNOWN_HOST:
-        from_secret: gitea-known-host
-    commands:
-      - mkdir -p ~/.ssh
-
-      - echo "$GITEA_KNOWN_HOST" >> ~/.ssh/known_hosts
-      - chmod 644 ~/.ssh/known_hosts
-
-      - echo "$GITEA_DEPLOY_KEY" > ~/.ssh/id_rsa
-      - chmod 600 ~/.ssh/id_rsa
-
-      - git config --global user.name "woodpecker[bot]"
-      - git config --global user.email "woodpecker@marcin00.pl"
-
-      - git clone $DEPLOY_REPO --branch woodpecker-deploy
-      - cd user-microservice-deploy
-      
-      - |
-        awk -v commit="$CI_COMMIT_SHA" '
-        $0 ~ /name:[[:space:]]*api/ { in_api_container = 1; print; next }
-        in_api_container && $0 ~ /^[[:space:]]*image:[[:space:]]*/ {
-            sub(/:[^:[:space:]]+$/, ":" commit)
-            in_api_container = 0
-            print
-            next
-        }
-        { print }
-        ' deploy.yaml > deploy.tmp && mv deploy.tmp deploy.yaml
-      
-      - git add deploy.yaml
-      - 'git diff-index --quiet HEAD || git commit -m "WOODPECKER: Changed deployed version to $CI_COMMIT_SHA"'
-      - git push origin woodpecker-deploy

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 @@
-1753539316
+1752257920