From 438774ba81c878e6e45a3320f827dff3eebb80fc Mon Sep 17 00:00:00 2001
From: "sergey.tolstyh" <sergey.tolstyh@red-soft.ru>
Date: Wed, 15 Apr 2026 16:53:48 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9A=D0=BE=D0=BD=D1=84=D0=B8=D0=B3=D0=B8=20?=
 =?UTF-8?q?=D0=BF=D1=80=D0=B8=D0=B2=D0=B5=D0=B4=D0=B5=D0=BD=D1=8B=20=D0=B2?=
 =?UTF-8?q?=20=D1=81=D0=BE=D0=BE=D1=82=D0=B2=D0=B5=D1=82=D1=81=D1=82=D0=B2?=
 =?UTF-8?q?=D0=B8=D0=B5=20=D1=81=20=D0=BF=D1=80=D0=BE=D0=B5=D0=BA=D1=82?=
 =?UTF-8?q?=D0=BE=D0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Jenkinsfile                   | 19 ++++++++++++++++++-
 config/ncore-properties.xml   |  1 +
 ncore-properties-template.xml |  2 +-
 ncore-properties.xml          |  2 +-
 4 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index dfc27a0..ba85f02 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -12,6 +12,13 @@ pipeline {
     }
 
     stages {
+        stage('Set BuildName'){
+            steps{
+                script{
+                    currentBuild.displayName = params.STAND_ID
+                }
+            }
+        }
         stage('Checkout') {
             steps {
                 checkout scm
@@ -34,6 +41,16 @@ pipeline {
             }
         }
 
+        stage('Replace STAND_ID in props') {
+            steps{
+                script {
+                    def content = readFile "ncore-properties-template.xml"
+                    def updatedContent = content.replaceAll('STAND_ID', params.STAND_ID)
+                    writeFile file: "ncore-properties-template.xml", text: updatedContent
+                }
+            }
+        }
+
         stage('Make gradlew executable') {
             steps {
                 sh 'chmod +x ./gradlew'
@@ -51,7 +68,7 @@ pipeline {
                 
                 sh "cp -r build/distDockerCompose/* /docker-projects/${params.STAND_ID}/"
                 //Защита от случайного переписывания файла бд
-                sh "[ -f '/docker-projects/${params.STAND_ID}/db/<%%RESERVED_NAME%%>.fdb' ] || cp build/rdbDocker5/ncore-<%%RESERVED_NAME%%>.fdb '/docker-projects/${params.STAND_ID}/db/<%%RESERVED_NAME%%>.fdb'"
+                sh "[ -f '/docker-projects/${params.STAND_ID}/db/<%%RESERVED_NAME%%>.fdb' ] || cp build/rdbDocker5/ncore-<%%RESERVED_NAME%%>-${params.STAND_ID}.fdb '/docker-projects/${params.STAND_ID}/db/<%%RESERVED_NAME%%>.fdb'"
                 sh "chown -R :312 /docker-projects/${params.STAND_ID}"
                 sh "chmod -R g+w /docker-projects/${params.STAND_ID}"
                 script {
diff --git a/config/ncore-properties.xml b/config/ncore-properties.xml
index d7e2fe6..658c769 100644
--- a/config/ncore-properties.xml
+++ b/config/ncore-properties.xml
@@ -7,6 +7,7 @@
   <entry key="product.name"><%%RESERVED_GROUPNAME%%></entry>
   <entry key="product.subsystem"><%%RESERVED_NAME%%></entry>
   <entry key="product.title"><%%RESERVED_NAME%%> ncore project</entry>
+  <entry key="ncore.patch.holder.url">http://ncore-edu.red-soft.ru/factory/patch-holder</entry>
 
   <!-- Database settings -->
   <entry key="jdbc.drivers">org.firebirdsql.jdbc.FBDriver</entry>
diff --git a/ncore-properties-template.xml b/ncore-properties-template.xml
index 1f46950..012eb53 100644
--- a/ncore-properties-template.xml
+++ b/ncore-properties-template.xml
@@ -7,5 +7,5 @@
   <!-- На линуксе файл должен быть доступен группе firbird/reddatabase!!! -->
   <entry key="ncore.db.backup.path">db/ncore.zip</entry>
   <!-- На линуксе файл должен быть доступен группе firbird/reddatabase!!! -->
-  <entry key="ncore.db.restore.path">jenkins-rdb/3050:/db/ncore-<%%RESERVED_NAME%%>.fdb</entry>
+  <entry key="ncore.db.restore.path">jenkins-rdb/3050:/db/ncore-<%%RESERVED_NAME%%>-STAND_ID.fdb</entry>
 </properties>
diff --git a/ncore-properties.xml b/ncore-properties.xml
index 6421077..104c1ba 100644
--- a/ncore-properties.xml
+++ b/ncore-properties.xml
@@ -6,7 +6,7 @@
   <!-- Product settings -->
   <entry key="product.name"><%%RESERVED_GROUPNAME%%></entry>
   <entry key="product.subsystem"><%%RESERVED_NAME%%></entry>
-  <entry key="product.title"><%%RESERVED_NAME%%> ncore project</entry>
+  <entry key="product.title">Стенд проекта <%%RESERVED_NAME%%></entry>
 
   <!-- Database settings -->
   <entry key="jdbc.drivers">org.firebirdsql.jdbc.FBDriver</entry>