From 5762353fe1801a626b6bd17ad8a13f28a1d0c568 Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Wed, 15 Apr 2020 12:27:24 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=B1=D1=80=D0=B0=D0=BB=20closure,=20?=
 =?UTF-8?q?=D0=B7=D0=B0=D0=BC=D0=B5=D0=BD=D0=B8=D0=BB=20=D0=BD=D0=B0=20?=
 =?UTF-8?q?=D0=BE=D1=82=D0=B4=D0=B5=D0=BB=D1=8C=D0=BD=D1=8B=D0=B9=20=D0=BE?=
 =?UTF-8?q?=D0=B1=D1=89=D0=B8=D0=B9=20=D1=88=D0=B0=D0=B3=20=D0=B4=D0=BB?=
 =?UTF-8?q?=D1=8F=20=D0=BE=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D1=8F=20=D0=B8=D0=B7=20=D1=85=D1=80=D0=B0=D0=BD=D0=B8=D0=BB?=
 =?UTF-8?q?=D0=B8=D1=89=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...withStorageCredentials.groovy => initFromStorage.groovy} | 4 ++--
 vars/pipeline1C.groovy                                      | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)
 rename vars/{withStorageCredentials.groovy => initFromStorage.groovy} (60%)

diff --git a/vars/withStorageCredentials.groovy b/vars/initFromStorage.groovy
similarity index 60%
rename from vars/withStorageCredentials.groovy
rename to vars/initFromStorage.groovy
index d214c57..34474f1 100644
--- a/vars/withStorageCredentials.groovy
+++ b/vars/initFromStorage.groovy
@@ -1,6 +1,6 @@
 import ru.pulsar.jenkins.library.configuration.JobConfiguration
 
-def <T extends Closure> void call(JobConfiguration jobConfiguration, T body) {
+def call(JobConfiguration jobConfiguration, String storageVersion) {
     withCredentials([
         usernamePassword(
             credentialsId: jobConfiguration.secrets.storage,
@@ -12,6 +12,6 @@ def <T extends Closure> void call(JobConfiguration jobConfiguration, T body) {
             variable: 'STORAGE_PATH'
         )
     ]) {
-        body()
+        cmd "oscript_modules/bin/vrunner init-dev --storage --storage-name $STORAGE_PATH --storage-user $STORAGE_USR --storage-pwd $STORAGE_PSW --storage-ver $storageVersion --ibconnection \"/F./build/ib\""
     }
 }
\ No newline at end of file
diff --git a/vars/pipeline1C.groovy b/vars/pipeline1C.groovy
index d0e32f5..25aba12 100644
--- a/vars/pipeline1C.groovy
+++ b/vars/pipeline1C.groovy
@@ -60,11 +60,10 @@ void call() {
                                 def storageVersion = versionParser.storage()
 
                                 // Создание базы загрузкой конфигурации из хранилища
-                                withStorageCredentials(jobConfiguration) {
-                                    cmd "oscript_modules/bin/vrunner init-dev --storage --storage-name $STORAGE_PATH --storage-user $STORAGE_USR --storage-pwd $STORAGE_PSW --storage-ver $storageVersion --ibconnection \"/F./build/ib\""
-                                }
+                                initFromStorage(jobConfiguration, storageVersion)
                             }
 
+
                             zipInfobase()
                         }
                     }
@@ -101,4 +100,5 @@ void call() {
             }
         }
     }
+
 }