Compare commits
2 Commits
jenkins-fl
...
e6c68f839a
Author | SHA1 | Date | |
---|---|---|---|
e6c68f839a | |||
fcb93a5cf8 |
92
.jenkins/Jenkinsfile
vendored
92
.jenkins/Jenkinsfile
vendored
@ -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
|
|
||||||
'''
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
@ -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: {}
|
|
@ -36,30 +36,19 @@ fi
|
|||||||
echo "[INFO] Oczekiwanie na wdrożenie nowej wersji..."
|
echo "[INFO] Oczekiwanie na wdrożenie nowej wersji..."
|
||||||
|
|
||||||
# === Odpytywanie endpointa /version ===
|
# === Odpytywanie endpointa /version ===
|
||||||
WAITED=0
|
|
||||||
echo "[WAIT] Oczekiwanie na nową wersję..."
|
|
||||||
|
|
||||||
while true; do
|
while true; do
|
||||||
sleep $CHECK_INTERVAL
|
sleep $CHECK_INTERVAL
|
||||||
WAITED=$((WAITED + CHECK_INTERVAL))
|
|
||||||
|
|
||||||
NEW_VERSION=$(curl -s "$APP_URL" | jq -r '.version')
|
NEW_VERSION=$(curl -s "$APP_URL" | jq -r '.version')
|
||||||
|
|
||||||
if [[ "$NEW_VERSION" != "$OLD_VERSION" ]]; then
|
if [[ "$NEW_VERSION" != "$OLD_VERSION" ]]; then
|
||||||
END_TIME=$(date +%s)
|
END_TIME=$(date +%s)
|
||||||
DURATION=$((END_TIME - START_TIME))
|
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 "[INFO] Czas wdrożenia: $DURATION sekund"
|
||||||
|
|
||||||
echo "$START_TIME,$END_TIME,$DURATION,$OLD_VERSION,$NEW_VERSION" >> "$OUTPUT_FILE"
|
echo "$START_TIME,$END_TIME,$DURATION,$OLD_VERSION,$NEW_VERSION" >> "$OUTPUT_FILE"
|
||||||
break
|
break
|
||||||
else
|
else
|
||||||
# Nadpisujemy TYLKO linię z licznikiem
|
echo "[WAIT] Czekam... ($NEW_VERSION)"
|
||||||
printf "\r[WAIT] Czekam... %ds" "$WAITED"
|
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
# Żeby kursor przeszedł do nowej linii po zakończeniu
|
|
||||||
echo ""
|
|
||||||
|
@ -1 +0,0 @@
|
|||||||
1752257920
|
|
Reference in New Issue
Block a user