From 9ca255f4fdcfb7710bcdb9410b326724459f9ec3 Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Mon, 19 Oct 2020 14:24:46 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A1=D0=BA=D0=B0=D1=87=D0=B8=D0=B2=D0=B0?=
=?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=B2=D1=80=D0=B5=D0=BC=D0=B5=D0=BD=D0=BD?=
=?UTF-8?q?=D0=BE=D0=B9=20=D1=81=D0=B1=D0=BE=D1=80=D0=BA=D0=B8=20VAS=20?=
=?UTF-8?q?=D1=81=20=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD?=
=?UTF-8?q?=D0=B8=D0=B5=D0=BC=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D1=8B=20?=
=?UTF-8?q?=D0=BF=D0=BE=D0=B4=20linux?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/ru/pulsar/jenkins/library/IStepExecutor.groovy | 4 ++++
src/ru/pulsar/jenkins/library/StepExecutor.groovy | 5 +++++
src/ru/pulsar/jenkins/library/steps/InitInfobase.groovy | 6 ++++++
3 files changed, 15 insertions(+)
diff --git a/src/ru/pulsar/jenkins/library/IStepExecutor.groovy b/src/ru/pulsar/jenkins/library/IStepExecutor.groovy
index 8942a1c..a7b76c2 100644
--- a/src/ru/pulsar/jenkins/library/IStepExecutor.groovy
+++ b/src/ru/pulsar/jenkins/library/IStepExecutor.groovy
@@ -45,4 +45,8 @@ interface IStepExecutor {
def unzip(String dir, String zipFile, quiet)
def catchError(Closure body)
+
+ def httpRequest(String url, String outputFile)
+
+ def httpRequest(String url, String outputFile, String responseHandle, boolean wrapAsMultipart)
}
\ No newline at end of file
diff --git a/src/ru/pulsar/jenkins/library/StepExecutor.groovy b/src/ru/pulsar/jenkins/library/StepExecutor.groovy
index 2b425a5..f784971 100644
--- a/src/ru/pulsar/jenkins/library/StepExecutor.groovy
+++ b/src/ru/pulsar/jenkins/library/StepExecutor.groovy
@@ -103,4 +103,9 @@ class StepExecutor implements IStepExecutor {
def catchError(Closure body) {
steps.catchError body
}
+
+ @Override
+ def httpRequest(String url, String outputFile, String responseHandle = 'NONE', boolean wrapAsMultipart = false) {
+ steps.httpRequest responseHandle: responseHandle, outputFile: outputFile, url: url, wrapAsMultipart: wrapAsMultipart
+ }
}
diff --git a/src/ru/pulsar/jenkins/library/steps/InitInfobase.groovy b/src/ru/pulsar/jenkins/library/steps/InitInfobase.groovy
index df3c59d..87727c5 100644
--- a/src/ru/pulsar/jenkins/library/steps/InitInfobase.groovy
+++ b/src/ru/pulsar/jenkins/library/steps/InitInfobase.groovy
@@ -34,6 +34,12 @@ class InitInfobase implements Serializable {
Logger.println("Шаг миграции ИБ выключен")
}
+ // TODO: удалить после выхода VAS 1.0.35
+ steps.httpRequest(
+ 'https://cloud.svc.pulsar.ru/index.php/s/WKwmqpFXSjfYjAH',
+ 'oscript_modules/vanessa-automation-single/vanessa-automation-single.epf'
+ )
+
config.initInfobaseOptions.additionalMigrationSteps.each {
Logger.println("Первичная инициализация командой ${it}")
steps.cmd("oscript_modules/bin/vrunner ${it} --ibconnection \"/F./build/ib\"")