From f77ac272c242e5ed0eaab79a06cbc4d629e58a5d Mon Sep 17 00:00:00 2001
From: Dima <d.ovcharenko90@gmail.com>
Date: Sun, 19 Jan 2025 12:14:10 +0300
Subject: [PATCH] fix conditions, add bdd

---
 .../jenkins/library/steps/ZipInfobase.groovy       | 14 ++++++++------
 vars/pipeline1C.groovy                             | 12 +++++++++++-
 vars/zipInfobase.groovy                            |  2 +-
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/ru/pulsar/jenkins/library/steps/ZipInfobase.groovy b/src/ru/pulsar/jenkins/library/steps/ZipInfobase.groovy
index a47f67ff..4b585ee5 100644
--- 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
index 7ddb4f06..70d40138 100644
--- 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
index db9d9fc9..7c6faa1a 100644
--- 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)