From 911be3c7ba4ce3c9c8704dd3dfa6887c21e8552d Mon Sep 17 00:00:00 2001 From: Nikita Fedkin Date: Fri, 3 Jun 2022 18:50:25 +0300 Subject: [PATCH 1/4] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=8B=D1=82=D0=BA=D0=B0?= =?UTF-8?q?=20unstash=20=D0=B0=D0=BB=D0=BB=D1=8E=D1=80=D0=B0=20=D0=BE?= =?UTF-8?q?=D1=82=20=D0=B8=D0=BD=D0=B8=D1=82=D0=B0=20=D0=B8=20=D0=B1=D0=B4?= =?UTF-8?q?=D0=B4=20=D1=82=D0=BE=D0=BB=D1=8C=D0=BA=D0=BE=20=D0=B5=D1=81?= =?UTF-8?q?=D0=BB=D0=B8=20=D1=8D=D1=82=D0=B8=20=D1=88=D0=B0=D0=B3=D0=B8=20?= =?UTF-8?q?=D0=B1=D1=8B=D0=BB=D0=B8=20=D0=B2=D0=BA=D0=BB=D1=8E=D1=87=D0=B5?= =?UTF-8?q?=D0=BD=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/ru/pulsar/jenkins/library/steps/PublishAllure.groovy | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/ru/pulsar/jenkins/library/steps/PublishAllure.groovy b/src/ru/pulsar/jenkins/library/steps/PublishAllure.groovy index 3e374e6..aaf7046 100644 --- a/src/ru/pulsar/jenkins/library/steps/PublishAllure.groovy +++ b/src/ru/pulsar/jenkins/library/steps/PublishAllure.groovy @@ -27,8 +27,12 @@ class PublishAllure implements Serializable { steps = ContextRegistry.getContext().getStepExecutor() - safeUnstash('init-allure') - safeUnstash('bdd-allure') + if (config.stageFlags.initSteps) { + safeUnstash('init-allure') + } + if (config.stageFlags.bdd) { + safeUnstash('bdd-allure') + } if (config.stageFlags.smoke && config.smokeTestOptions.publishToAllureReport) { safeUnstash(SmokeTest.SMOKE_ALLURE_STASH) } From 18a08848553cbea7b42a62decffd4a2110ab5cfb Mon Sep 17 00:00:00 2001 From: Nikita Fedkin Date: Tue, 21 Jun 2022 13:35:36 +0300 Subject: [PATCH 2/4] firstBitSemenovskaya -> firstBitMarksistskaya --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 7026298..8cff1ad 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ ## Возможности -1. Все шаги можно запустить на базе docker-образов из https://github.com/firstBitSemenovskaya/onec-docker. См. [памятку по слоям и последовательности сборки](https://github.com/firstBitSemenovskaya/onec-docker/blob/feature/first-bit/Layers.md). +1. Все шаги можно запустить на базе docker-образов из https://github.com/firstBitMarksistskaya/onec-docker. См. [памятку по слоям и последовательности сборки](https://github.com/firstBitMarksistskaya/onec-docker/blob/feature/first-bit/Layers.md). 1. Поддержка как формата выгрузки из Конфигуратора, так и формата EDT. 1. Подготовка информационной базы по версии из хранилища конфигурации, из исходных файлов конфигурации, комбинированный режим (основная ветка - из хранилища, остальные - из исходников). 1. Запуск ИБ в режиме выполнения обработчиков обновления БСП. @@ -83,7 +83,7 @@ pipeline1C() ```json { - "$schema": "https://raw.githubusercontent.com/firstBitSemenovskaya/jenkins-lib/master/resources/schema.json", + "$schema": "https://raw.githubusercontent.com/firstBitMarksistskaya/jenkins-lib/master/resources/schema.json", "v8version": "8.3.14.1976", "edtVersion": "2021.3.4:x86_64", "secrets": { @@ -164,4 +164,4 @@ pipeline1C() * при нестабильной сборке (упавшие тесты) - разработчики и запустивший сборку. * Прямые получатели уведомлений не заполнены (`notifications` -> `email` -> `*options` -> `directRecipients`). * Telegram: - * Уведомления о результатах сборки по умолчанию рассылаются всегда (`notifications` -> `telegram` -> `onAlways`, `onFailure`, `onUnstable`, `onSuccess`). \ No newline at end of file + * Уведомления о результатах сборки по умолчанию рассылаются всегда (`notifications` -> `telegram` -> `onAlways`, `onFailure`, `onUnstable`, `onSuccess`). From d2d920e3283a300252de361d6c5f1e335bfc45e6 Mon Sep 17 00:00:00 2001 From: Nikita Fedkin Date: Tue, 30 Aug 2022 19:05:44 +0300 Subject: [PATCH 3/4] fix syntax_check options merge Co-Authored-By: ivanovEV --- .../library/configuration/ConfigurationReader.groovy | 8 ++++++++ .../library/configuration/ConfigurationReaderTest.java | 2 +- test/unit/resources/jobConfiguration.json | 7 ++++++- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/ru/pulsar/jenkins/library/configuration/ConfigurationReader.groovy b/src/ru/pulsar/jenkins/library/configuration/ConfigurationReader.groovy index c9587a8..a7f2c1c 100644 --- a/src/ru/pulsar/jenkins/library/configuration/ConfigurationReader.groovy +++ b/src/ru/pulsar/jenkins/library/configuration/ConfigurationReader.groovy @@ -79,6 +79,7 @@ class ConfigurationReader implements Serializable { mergeObjects(baseConfiguration, configurationToMerge, nonMergeableSettings) mergeInitInfoBaseOptions(baseConfiguration.initInfoBaseOptions, configurationToMerge.initInfoBaseOptions) mergeBddOptions(baseConfiguration.bddOptions, configurationToMerge.bddOptions) + mergeSyntaxCheckOptions(baseConfiguration.syntaxCheckOptions, configurationToMerge.syntaxCheckOptions) mergeNotificationsOptions(baseConfiguration.notificationsOptions, configurationToMerge.notificationsOptions) return baseConfiguration; @@ -126,6 +127,13 @@ class ConfigurationReader implements Serializable { baseObject.vrunnerSteps = objectToMerge.vrunnerSteps.clone() } + @NonCPS + private static void mergeSyntaxCheckOptions(SyntaxCheckOptions baseObject, SyntaxCheckOptions objectToMerge) { + if (objectToMerge == null || objectToMerge.checkModes == null) { + return + } + baseObject.checkModes = objectToMerge.checkModes.clone() + } private static void mergeNotificationsOptions(NotificationsOptions baseObject, NotificationsOptions objectToMerge) { if (objectToMerge == null) { diff --git a/test/unit/groovy/ru/pulsar/jenkins/library/configuration/ConfigurationReaderTest.java b/test/unit/groovy/ru/pulsar/jenkins/library/configuration/ConfigurationReaderTest.java index 35fd821..89c46ad 100644 --- a/test/unit/groovy/ru/pulsar/jenkins/library/configuration/ConfigurationReaderTest.java +++ b/test/unit/groovy/ru/pulsar/jenkins/library/configuration/ConfigurationReaderTest.java @@ -45,7 +45,7 @@ class ConfigurationReaderTest { .hasFieldOrPropertyWithValue("storagePath", "UNKNOWN_ID") ; - assertThat(jobConfiguration.getSyntaxCheckOptions().getCheckModes()).hasSize(1); + assertThat(jobConfiguration.getSyntaxCheckOptions().getCheckModes()).hasSize(4); assertThat(jobConfiguration.getResultsTransformOptions().getRemoveSupport()).isFalse(); assertThat(jobConfiguration.getResultsTransformOptions().getSupportLevel()).isZero(); diff --git a/test/unit/resources/jobConfiguration.json b/test/unit/resources/jobConfiguration.json index fbf6f88..b49569d 100644 --- a/test/unit/resources/jobConfiguration.json +++ b/test/unit/resources/jobConfiguration.json @@ -21,7 +21,12 @@ "branchAnalysisConfiguration": "auto" }, "syntaxCheck": { - "checkModes": ["-ThinClient"] + "checkModes": [ + "-ThickClient", + "-ThinClient", + "-WebClient", + "-Server" + ] }, "resultsTransform": { "removeSupport": false From 78f114ddcc726f06656b75a870c962aca55de733 Mon Sep 17 00:00:00 2001 From: 666Bounty999 <107107364+666Bounty999@users.noreply.github.com> Date: Mon, 21 Nov 2022 09:28:57 +0300 Subject: [PATCH 4/4] Update SmokeTest.groovy MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Добавление true вторым параметром для исключения падения шага "Дымовые тесты" --- src/ru/pulsar/jenkins/library/steps/SmokeTest.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ru/pulsar/jenkins/library/steps/SmokeTest.groovy b/src/ru/pulsar/jenkins/library/steps/SmokeTest.groovy index 00998e4..6b1f946 100644 --- a/src/ru/pulsar/jenkins/library/steps/SmokeTest.groovy +++ b/src/ru/pulsar/jenkins/library/steps/SmokeTest.groovy @@ -101,7 +101,7 @@ class SmokeTest implements Serializable { } steps.withEnv(logosConfig) { - VRunner.exec(command) + VRunner.exec(command, true) } if (options.publishToAllureReport) {