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 @@
<%%RESERVED_GROUPNAME%%>
<%%RESERVED_NAME%%>
<%%RESERVED_NAME%%> ncore project
+ http://ncore-edu.red-soft.ru/factory/patch-holder
org.firebirdsql.jdbc.FBDriver
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 @@
db/ncore.zip
- jenkins-rdb/3050:/db/ncore-<%%RESERVED_NAME%%>.fdb
+ jenkins-rdb/3050:/db/ncore-<%%RESERVED_NAME%%>-STAND_ID.fdb
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 @@
<%%RESERVED_GROUPNAME%%>
<%%RESERVED_NAME%%>
- <%%RESERVED_NAME%%> ncore project
+ Стенд проекта <%%RESERVED_NAME%%>
org.firebirdsql.jdbc.FBDriver