fix conditions, add bdd

firstBitMarksistskaya · Jan 19, 2025 · f77ac27 · f77ac27
1 parent 7a9ccaf
commit f77ac27
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 8 deletions.
diff --git a/src/ru/pulsar/jenkins/library/steps/ZipInfobase.groovy b/src/ru/pulsar/jenkins/library/steps/ZipInfobase.groovy
@@ -27,6 +27,14 @@ class ZipInfobase implements Serializable {
 
         def archiveInfobaseOptions = getArchiveInfobaseOptionsForStage(config, stage)
 
+        def archiveName
+        if (stage == 'initInfoBase') {
+            archiveName = "1Cv8.1CD.zip"
+        } else {
+            archiveName = "1Cv8.1CD.${stage}.zip"
+        }
+
+        // опция отвечает только за то, будет ли файл сохранен в виде артефакта
         def archiveInfobase = false
         if (archiveInfobaseOptions.onAlways
                 || (archiveInfobaseOptions.onFailure && (currentResult == Result.FAILURE || currentResult == Result.ABORTED))
@@ -35,12 +43,6 @@ class ZipInfobase implements Serializable {
             archiveInfobase = true
         }
 
-        def archiveName
-        if (!stage) {
-            archiveName = "1Cv8.1CD.zip"
-        } else {
-            archiveName = "1Cv8.1CD.${stage}.zip"
-        }
         steps.zip('build/ib', archiveName, '1Cv8.1CD', archiveInfobase)
         steps.stash(archiveName, archiveName, false)
     }

diff --git a/vars/pipeline1C.groovy b/vars/pipeline1C.groovy
@@ -144,7 +144,7 @@ void call() {
                                             timeout(time: config.timeoutOptions.zipInfoBase, unit: TimeUnit.MINUTES) {
                                                 printLocation()
 
-                                                zipInfobase config
+                                                zipInfobase config, 'initInfoBase'
                                             }
                                         }
                                     }
@@ -237,6 +237,16 @@ void call() {
                                     }
                                 }
                             }
+
+                            stage('Архивация ИБ') {
+                                steps {
+                                    timeout(time: config.timeoutOptions.zipInfoBase, unit: TimeUnit.MINUTES) {
+                                        printLocation()
+
+                                        zipInfobase config, 'bdd'
+                                    }
+                                }
+                            }
                         }
                     }
 

diff --git a/vars/zipInfobase.groovy b/vars/zipInfobase.groovy
@@ -2,7 +2,7 @@ import ru.pulsar.jenkins.library.configuration.JobConfiguration
 import ru.pulsar.jenkins.library.ioc.ContextRegistry
 import ru.pulsar.jenkins.library.steps.ZipInfobase
 
-def call(JobConfiguration config, String stageName = '') {
+def call(JobConfiguration config, String stageName) {
     ContextRegistry.registerDefaultContext(this)
 
     def zipInfobase = new ZipInfobase(config, stageName)