Compare commits
3 Commits
jenkins-pi
...
72e38fab08
Author | SHA1 | Date | |
---|---|---|---|
72e38fab08 | |||
e6c68f839a | |||
fcb93a5cf8 |
93
.jenkins/Jenkinsfile
vendored
93
.jenkins/Jenkinsfile
vendored
@ -1,93 +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 jenkins-kubernetes'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
dir('user-microservice-deploy') {
|
|
||||||
sh '''
|
|
||||||
# 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 '''
|
|
||||||
git add deploy.yaml
|
|
||||||
git diff-index --quiet HEAD || git commit -m "JENKINS: Changed deployed version to $GIT_COMMIT"
|
|
||||||
git push origin jenkins-kubernetes
|
|
||||||
'''
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
@ -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: {}
|
|
50
data_analysis.py
Normal file
50
data_analysis.py
Normal file
@ -0,0 +1,50 @@
|
|||||||
|
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]
|
||||||
|
]
|
||||||
|
|
||||||
|
# Folder wyjściowy (opcjonalnie)
|
||||||
|
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]
|
||||||
|
|
||||||
|
plt.figure()
|
||||||
|
plt.bar(group_labels, group_means)
|
||||||
|
plt.ylabel("Średni czas wdrożenia (sek)")
|
||||||
|
plt.title(f"Porównanie średnich czasów wdrożenia")
|
||||||
|
plt.xticks(rotation=45)
|
||||||
|
plt.tight_layout()
|
||||||
|
plt.savefig(f"{output_folder}/mean_times_{i}.png")
|
||||||
|
plt.close()
|
||||||
|
|
||||||
|
print("Wykresy zapisane!")
|
@ -1 +0,0 @@
|
|||||||
1752168984
|
|
Reference in New Issue
Block a user