From da65700f5268545bbe10c5de03a3ef7e0ec414bf Mon Sep 17 00:00:00 2001 From: ivanovEV Date: Tue, 19 Mar 2024 16:04:51 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=BC=D0=B5=D0=BD=D1=8F=D0=BB=20?= =?UTF-8?q?=D0=BF=D0=BE=D1=80=D1=8F=D0=B4=D0=BE=D0=BA=20=D1=81=D1=82=D0=B5?= =?UTF-8?q?=D0=B9=D0=B4=D0=B6=D0=B5=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vars/pipeline1C.groovy | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/vars/pipeline1C.groovy b/vars/pipeline1C.groovy index f5d8ee8a..f358a8cd 100644 --- a/vars/pipeline1C.groovy +++ b/vars/pipeline1C.groovy @@ -106,31 +106,32 @@ void call() { } } - stage('Инициализация ИБ') { + stage('Загрузка расширений в конфигурацию'){ when { beforeAgent true - expression { config.stageFlags.initSteps } + expression { config.needLoadExtensions() } } steps { - timeout(time: config.timeoutOptions.initInfoBase, unit: TimeUnit.MINUTES) { - // Инициализация и первичная миграция - initInfobase config + timeout(time: config.timeoutOptions.loadExtensions, unit: TimeUnit.MINUTES) { + loadExtensions config } } } - stage('Загрузка расширений в конфигурацию'){ + stage('Инициализация ИБ') { when { beforeAgent true - expression { config.needLoadExtensions() } + expression { config.stageFlags.initSteps } } steps { - timeout(time: config.timeoutOptions.loadExtensions, unit: TimeUnit.MINUTES) { - loadExtensions config + timeout(time: config.timeoutOptions.initInfoBase, unit: TimeUnit.MINUTES) { + // Инициализация и первичная миграция + initInfobase config } } } + stage('Архивация ИБ') { steps { timeout(time: config.timeoutOptions.zipInfoBase, unit: TimeUnit.MINUTES) {