From 9d0dfe497983750c95b74dfd673a5e5d328e90b4 Mon Sep 17 00:00:00 2001
From: "kirill.labutin" <kirill.labutin@varwin.com>
Date: Thu, 13 Aug 2026 22:29:14 +0300
Subject: [PATCH] fix jenkinsfile

---
 Jenkinsfile | 37 +++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index efcb455..9cdacdb 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,10 +1,8 @@
+@groovy.transform.Field String VERSION
+
 pipeline {
     agent any
 
-    environment {
-        VERSION = ''
-    }
-
     stages {
         stage('Set build number into version') {
             steps {
@@ -15,12 +13,15 @@ pipeline {
                         error "Project version not found in pom.xml"
                     }
 
-                    def parts = matcher.group(1).tokenize('.')
-                    parts[parts.size() - 1] = env.BUILD_NUMBER
-                    env.VERSION = parts.join('.')
+                    def baseVersion = matcher.group(1)
+                    echo "Base version from pom: ${baseVersion}"
 
-                    echo "New project version: ${env.VERSION}"
-                    sh "mvn -B versions:set -DnewVersion=${env.VERSION}"
+                    def parts = baseVersion.tokenize('.')
+                    parts[parts.size() - 1] = env.BUILD_NUMBER
+                    VERSION = parts.join('.')
+
+                    echo "New project version: ${VERSION}"
+                    sh "mvn -B versions:set -DnewVersion=${VERSION}"
                     sh 'mvn -B versions:commit'
                 }
             }
@@ -34,21 +35,21 @@ pipeline {
 
         stage('Build docker image') {
             steps {
-                sh "docker build -f docker/Dockerfile -t pfsdn:${env.VERSION} ."
+                sh "docker build -f docker/Dockerfile -t pfsdn:${VERSION} ."
             }
         }
 
         stage('Deploy') {
             steps {
                 script {
-                    echo "Saving docker image pfsdn:${env.VERSION}"
-                    sh "docker save pfsdn:${env.VERSION} | gzip > pfsdn-${env.VERSION}.tar.gz"
-                    archiveArtifacts artifacts: "pfsdn-${env.VERSION}.tar.gz", fingerprint: true
+                    echo "Saving docker image pfsdn:${VERSION}"
+                    sh "docker save pfsdn:${VERSION} | gzip > pfsdn-${VERSION}.tar.gz"
+                    archiveArtifacts artifacts: "pfsdn-${VERSION}.tar.gz", fingerprint: true
 
-                    echo "Saving pfapp artifact launcher/target/${env.VERSION}.pfapp"
-                    archiveArtifacts artifacts: "launcher/target/${env.VERSION}.pfapp", fingerprint: true
+                    echo "Saving pfapp artifact launcher/target/${VERSION}.pfapp"
+                    archiveArtifacts artifacts: "launcher/target/${VERSION}.pfapp", fingerprint: true
 
-                    echo "TODO: deploy ${env.VERSION}.pfapp to repository (not implemented yet)"
+                    echo "TODO: deploy ${VERSION}.pfapp to repository (not implemented yet)"
                 }
             }
         }
@@ -57,8 +58,8 @@ pipeline {
     post {
         always {
             script {
-                if (env.VERSION ==~ /^\d+\.\d+\.\d+\.\d+$/) {
-                    sh "docker rmi pfsdn:${env.VERSION} || true"
+                if (VERSION ==~ /^\d+\.\d+\.\d+\.\d+$/) {
+                    sh "docker rmi pfsdn:${VERSION} || true"
                 }
             }
             cleanWs()