Made more spaces about bars to place numbers

.jenkins/Jenkinsfile

@@ -1,92 +0,0 @@
-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

@@ -1,60 +0,0 @@
-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: {}

data_analysis.py

@@ -0,0 +1,66 @@
+import matplotlib.pyplot as plt # type: ignore
+import os
+import statistics
+
+# Dane
+data = {
+    'Jenkins + Jenkins': (165, 158, 217, 164, 136, 135, 147, 145, 138, 134, 137, 129, 136, 142, 125, 138, 133, 136, 128, 131),
+    'Jenkins + ArgoCD': (181, 111, 115, 121, 128, 105, 108, 119, 112, 109, 110, 108, 111, 106, 113, 117, 113, 120, 113, 107),
+    'Jenkins + FluxCD' : (167, 119, 113, 110, 102, 126, 111, 113, 118, 106, 111, 104, 101, 105, 104, 106, 102, 105, 107, 103),
+    'Woodpecker + Woodpecker': (340, 348, 334, 363, 350, 339, 331, 354, 357, 351, 356, 347, 354, 341, 357, 352, 368, 336, 331, 340),
+    'Woodpecker + ArgoCD': (355, 360, 354, 344, 318, 353, 328, 305, 331, 324, 328, 349, 337, 328, 349, 350, 344, 344, 344, 341),
+    'Woodpecker + FluxCD' : (326, 344, 325, 337, 343, 358, 339, 341, 335, 354, 342, 355, 345, 334, 356, 346, 338, 342, 330, 333),
+    'Argo Workflows + Argo-Workflows': (190, 190, 169, 211, 172, 198, 207, 192, 212, 181, 168, 199, 216, 213, 220, 209, 192, 210, 196, 165),
+    'Argo Workflows + ArgoCD': (145, 159, 163, 148, 169, 185, 153, 148, 139, 176, 133, 140, 161, 135, 161, 130, 139, 164, 183, 183),
+    'Argo Workflows + FluxCD': (161, 136, 181, 157, 141, 139, 157, 149, 151, 139, 139, 148, 152, 142, 136, 149, 160, 145, 173, 161)
+}
+
+# Wyliczenie średnich
+labels = list(data.keys())
+means = [statistics.mean(data[k]) for k in labels]
+
+# Grupy indeksów do porównań
+groupings = [
+    [0, 1, 2],
+    [3, 4, 5],
+    [6, 7, 8],
+    [0, 3, 6],
+    [1, 4, 7],
+    [2, 5, 8]
+]
+
+# Kolory z palety 'tab10'
+color_palette = plt.get_cmap('tab10')
+
+# Folder wyjściowy
+output_folder = "plots"
+os.makedirs(output_folder, exist_ok=True)
+
+# Generowanie wykresów
+for i, group in enumerate(groupings):
+    group_labels = [labels[j] for j in group]
+    group_means = [means[j] for j in group]
+    colors = [color_palette(j % 10) for j in group]  # różne kolory
+
+    plt.figure()
+    bars = plt.bar(group_labels, group_means, color=colors)
+
+    # Oblicz maksymalną wartość, by zwiększyć wysokość osi Y
+    max_val = max(group_means)
+    plt.ylim(0, max_val * 1.15)  # dodaj 15% zapasu na tekst
+
+    plt.ylabel("Średni czas wdrożenia (sek)")
+    plt.title(f"Porównanie średnich czasów wdrożenia")
+    plt.xticks(rotation=45)
+
+    # Dodanie wartości nad słupkami
+    for bar in bars:
+        yval = bar.get_height()
+        plt.text(bar.get_x() + bar.get_width()/2.0, yval + max_val * 0.02, f'{yval:.1f}',
+                 ha='center', va='bottom', fontsize=9)
+
+    plt.tight_layout()
+    plt.savefig(f"{output_folder}/mean_times_{i}.png")
+    plt.close()
+
+print("Wszystkie wykresy wygenerowane z dodatkowymi marginesami!")

deployment_timer.sh

@@ -36,30 +36,19 @@ 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
-    # Nadpisujemy TYLKO linię z licznikiem
+    echo "[WAIT] Czekam... ($NEW_VERSION)"
-    printf "\r[WAIT] Czekam... %ds" "$WAITED"
   fi
 done
-
-# Żeby kursor przeszedł do nowej linii po zakończeniu
-echo ""

version_marker.txt

@@ -1 +0,0 @@
-1752257920