From da65700f5268545bbe10c5de03a3ef7e0ec414bf Mon Sep 17 00:00:00 2001 From: ivanovEV Date: Tue, 19 Mar 2024 16:04:51 +0300 Subject: [PATCH 1/2] =?UTF-8?q?=D0=9F=D0=BE=D0=BC=D0=B5=D0=BD=D1=8F=D0=BB?= =?UTF-8?q?=20=D0=BF=D0=BE=D1=80=D1=8F=D0=B4=D0=BE=D0=BA=20=D1=81=D1=82?= =?UTF-8?q?=D0=B5=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) { From d11ff1be6d40c8c78075af3cd4125dd6b9382e0d Mon Sep 17 00:00:00 2001 From: ivanovEV Date: Wed, 20 Mar 2024 12:58:42 +0300 Subject: [PATCH 2/2] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8=D0=BB?= =?UTF-8?q?=20=D1=84=D0=BE=D1=82=D0=BE=20=D0=B2=20=D1=80=D0=B8=D0=B4=D0=BC?= =?UTF-8?q?=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3faa810c..de1f1a90 100644 --- a/README.md +++ b/README.md @@ -67,7 +67,7 @@ pipeline1C() ## Внешний вид пайплайна в интерфейсе Blue Ocean -![image](https://github.com/firstBitMarksistskaya/jenkins-lib/assets/80944823/e34a0112-2fe5-4116-92ac-8fcca08bba43) +![image](https://github.com/firstBitMarksistskaya/jenkins-lib/assets/80944823/a8d5bdff-3267-4744-a613-8c3d445b767f) ## Конфигурирование