From 0bfb927b282a7e7dac8a7046282da96f0295f4a3 Mon Sep 17 00:00:00 2001 From: ivanmolodec Date: Mon, 16 May 2022 12:17:16 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=B8=D0=BC=D0=B5?= =?UTF-8?q?=D0=BD=D0=BE=D0=B2=D0=B0=D0=BD=D1=8B=20=D0=BC=D0=B5=D1=82=D0=BE?= =?UTF-8?q?=D0=B4=D1=8B=20=D0=BF=D0=BE=D0=BB=D1=83=D1=87=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=8F=20=D0=B8=D0=BC=D0=B5=D0=BD=D0=B8=20=D0=B0=D0=B3=D0=B5?= =?UTF-8?q?=D0=BD=D1=82=D0=B0=20=D0=B4=D0=BB=D1=8F=201=D1=81=20=D0=B8=20?= =?UTF-8?q?=D0=B4=D0=BB=D1=8F=20=D0=B5=D0=B4=D1=82=20=D0=B2=20=D0=BA=D0=BB?= =?UTF-8?q?=D0=B0=D1=81=D1=81=D0=B5=20JobConfiguration,=20=D0=B4=D0=BE?= =?UTF-8?q?=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=20=D0=BA=D0=BB=D0=B0=D1=81?= =?UTF-8?q?=D1=81=20EDT,=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BE=D0=BF=D1=80?= =?UTF-8?q?=D0=B5=D0=B4=D0=B5=D0=BB=D0=B5=D0=BD=D1=8B=20=D0=B2=D1=8B=D0=B7?= =?UTF-8?q?=D0=BE=D0=B2=D1=8B=20=D0=B2=20=D1=88=D0=B0=D0=B3=D0=B0=D1=85=20?= =?UTF-8?q?EDT=20=D0=BD=D0=B0=20=D0=BC=D0=B5=D1=82=D0=BE=D0=B4=20=D0=B2=20?= =?UTF-8?q?=D0=BD=D0=BE=D0=B2=D0=BE=D0=BC=20=D0=BA=D0=BB=D0=B0=D1=81=D1=81?= =?UTF-8?q?=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../configuration/JobConfiguration.groovy | 4 +- .../DesignerToEdtFormatTransformation.groovy | 3 +- .../EdtToDesignerFormatTransformation.groovy | 3 +- .../jenkins/library/steps/EdtValidate.groovy | 3 +- .../pulsar/jenkins/library/utils/EDT.groovy | 12 ++++++ .../ConfigurationReaderTest.java | 10 ++--- .../pulsar/jenkins/library/utils/EDTTest.java | 39 +++++++++++++++++++ vars/pipeline1C.groovy | 4 +- 8 files changed, 66 insertions(+), 12 deletions(-) create mode 100644 src/ru/pulsar/jenkins/library/utils/EDT.groovy create mode 100644 test/unit/groovy/ru/pulsar/jenkins/library/utils/EDTTest.java diff --git a/src/ru/pulsar/jenkins/library/configuration/JobConfiguration.groovy b/src/ru/pulsar/jenkins/library/configuration/JobConfiguration.groovy index 24e600c..066e672 100644 --- a/src/ru/pulsar/jenkins/library/configuration/JobConfiguration.groovy +++ b/src/ru/pulsar/jenkins/library/configuration/JobConfiguration.groovy @@ -95,11 +95,11 @@ class JobConfiguration implements Serializable { (initMethod == InitInfoBaseMethod.DEFAULT_BRANCH_FROM_STORAGE && branchName != defaultBranch) } - String v8version() { + String v8AgentLabel() { return v8version } - String edtVersionForRing() { + String edtAgentLabel() { String edtVersionForRing = "edt" if (edtVersion != '') { edtVersionForRing += "@" + edtVersion diff --git a/src/ru/pulsar/jenkins/library/steps/DesignerToEdtFormatTransformation.groovy b/src/ru/pulsar/jenkins/library/steps/DesignerToEdtFormatTransformation.groovy index e0e30db..7ae969d 100644 --- a/src/ru/pulsar/jenkins/library/steps/DesignerToEdtFormatTransformation.groovy +++ b/src/ru/pulsar/jenkins/library/steps/DesignerToEdtFormatTransformation.groovy @@ -5,6 +5,7 @@ import ru.pulsar.jenkins.library.IStepExecutor import ru.pulsar.jenkins.library.configuration.JobConfiguration import ru.pulsar.jenkins.library.ioc.ContextRegistry import ru.pulsar.jenkins.library.utils.Constants +import ru.pulsar.jenkins.library.utils.EDT import ru.pulsar.jenkins.library.utils.Logger class DesignerToEdtFormatTransformation implements Serializable { @@ -34,7 +35,7 @@ class DesignerToEdtFormatTransformation implements Serializable { def workspaceDir = "$env.WORKSPACE/$WORKSPACE" def configurationRoot = new File(env.WORKSPACE, config.srcDir).getAbsolutePath() - def edtVersionForRing = config.edtVersionForRing() + def edtVersionForRing = EDT.ringModule(config) steps.deleteDir(workspaceDir) diff --git a/src/ru/pulsar/jenkins/library/steps/EdtToDesignerFormatTransformation.groovy b/src/ru/pulsar/jenkins/library/steps/EdtToDesignerFormatTransformation.groovy index a3fef79..65d67e8 100644 --- a/src/ru/pulsar/jenkins/library/steps/EdtToDesignerFormatTransformation.groovy +++ b/src/ru/pulsar/jenkins/library/steps/EdtToDesignerFormatTransformation.groovy @@ -6,6 +6,7 @@ import ru.pulsar.jenkins.library.configuration.JobConfiguration import ru.pulsar.jenkins.library.configuration.SourceFormat import ru.pulsar.jenkins.library.ioc.ContextRegistry import ru.pulsar.jenkins.library.utils.Constants +import ru.pulsar.jenkins.library.utils.EDT import ru.pulsar.jenkins.library.utils.Logger class EdtToDesignerFormatTransformation implements Serializable { @@ -37,7 +38,7 @@ class EdtToDesignerFormatTransformation implements Serializable { def projectDir = new File("$env.WORKSPACE/$srcDir").getCanonicalPath() def workspaceDir = "$env.WORKSPACE/$WORKSPACE" def configurationRoot = "$env.WORKSPACE/$CONFIGURATION_DIR" - def edtVersionForRing = config.edtVersionForRing() + def edtVersionForRing = EDT.ringModule(config) steps.deleteDir(workspaceDir) steps.deleteDir(configurationRoot) diff --git a/src/ru/pulsar/jenkins/library/steps/EdtValidate.groovy b/src/ru/pulsar/jenkins/library/steps/EdtValidate.groovy index a6d83cf..c9f2727 100644 --- a/src/ru/pulsar/jenkins/library/steps/EdtValidate.groovy +++ b/src/ru/pulsar/jenkins/library/steps/EdtValidate.groovy @@ -5,6 +5,7 @@ import ru.pulsar.jenkins.library.configuration.JobConfiguration import ru.pulsar.jenkins.library.configuration.SourceFormat import ru.pulsar.jenkins.library.ioc.ContextRegistry import ru.pulsar.jenkins.library.utils.Constants +import ru.pulsar.jenkins.library.utils.EDT import ru.pulsar.jenkins.library.utils.Logger class EdtValidate implements Serializable { @@ -44,7 +45,7 @@ class EdtValidate implements Serializable { } def resultFile = "$env.WORKSPACE/$RESULT_FILE" - def edtVersionForRing = config.edtVersionForRing() + def edtVersionForRing = EDT.ringModule(config) Logger.println("Выполнение валидации EDT") diff --git a/src/ru/pulsar/jenkins/library/utils/EDT.groovy b/src/ru/pulsar/jenkins/library/utils/EDT.groovy new file mode 100644 index 0000000..cb4f5c3 --- /dev/null +++ b/src/ru/pulsar/jenkins/library/utils/EDT.groovy @@ -0,0 +1,12 @@ +package ru.pulsar.jenkins.library.utils + +import ru.pulsar.jenkins.library.configuration.JobConfiguration + +final class EDT { + + static String ringModule(JobConfiguration config) { + return config.edtAgentLabel() + } + +} + 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 3d324b3..a8b81f0 100644 --- a/test/unit/groovy/ru/pulsar/jenkins/library/configuration/ConfigurationReaderTest.java +++ b/test/unit/groovy/ru/pulsar/jenkins/library/configuration/ConfigurationReaderTest.java @@ -64,7 +64,7 @@ class ConfigurationReaderTest { } @Test - void testV8versionMethod() throws IOException { + void testV8AgentLabel() throws IOException { // given String config = IOUtils.resourceToString( "jobConfiguration.json", @@ -76,11 +76,11 @@ class ConfigurationReaderTest { JobConfiguration jobConfiguration = ConfigurationReader.create(config); // then - assertThat(jobConfiguration.v8version()).isEqualTo("8.3.14.1944"); + assertThat(jobConfiguration.v8AgentLabel()).isEqualTo("8.3.14.1944"); } @Test - void testEdtVersionForRingMethod() throws IOException { + void testEdtAgentLabel() throws IOException { // given String config = IOUtils.resourceToString( "jobConfiguration.json", @@ -92,11 +92,11 @@ class ConfigurationReaderTest { JobConfiguration jobConfiguration = ConfigurationReader.create(config); // then - assertThat(jobConfiguration.edtVersionForRing()).isEqualTo("edt@2021.3.4:x86_64"); + assertThat(jobConfiguration.edtAgentLabel()).isEqualTo("edt@2021.3.4:x86_64"); } @Disabled - void testinfoBaseFromFilesMethod() throws IOException { + void testInfoBaseFromFiles() throws IOException { // given String config = IOUtils.resourceToString( "jobConfiguration.json", diff --git a/test/unit/groovy/ru/pulsar/jenkins/library/utils/EDTTest.java b/test/unit/groovy/ru/pulsar/jenkins/library/utils/EDTTest.java new file mode 100644 index 0000000..4947c3c --- /dev/null +++ b/test/unit/groovy/ru/pulsar/jenkins/library/utils/EDTTest.java @@ -0,0 +1,39 @@ +package ru.pulsar.jenkins.library.utils; + +import org.apache.commons.io.IOUtils; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import ru.pulsar.jenkins.library.configuration.ConfigurationReader; +import ru.pulsar.jenkins.library.configuration.JobConfiguration; + +import java.io.IOException; +import java.nio.charset.StandardCharsets; + +import static org.assertj.core.api.Assertions.assertThat; + +class EDTTest { + + @BeforeEach + void setUp() { + TestUtils.setupMockedContext(); + } + + @Test + void testRingModule() throws IOException { + + // given + String config = IOUtils.resourceToString( + "jobConfiguration.json", + StandardCharsets.UTF_8, + this.getClass().getClassLoader() + ); + + // when + JobConfiguration jobConfiguration = ConfigurationReader.create(config); + String edtModule = EDT.ringModule(jobConfiguration); + + // then + assertThat(edtModule).isEqualTo("edt@2021.3.4:x86_64"); + } + +} \ No newline at end of file diff --git a/vars/pipeline1C.groovy b/vars/pipeline1C.groovy index 8f49620..d59bce6 100644 --- a/vars/pipeline1C.groovy +++ b/vars/pipeline1C.groovy @@ -38,8 +38,8 @@ void call() { steps { script { config = jobConfiguration() as JobConfiguration - agent1C = config.v8version() - agentEdt = config.edtVersionForRing() + agent1C = config.v8AgentLabel() + agentEdt = config.edtAgentLabel() } } }