Переименованы методы получения имени агента для 1с и для едт в классе JobConfiguration, добавлен класс EDT, переопределены вызовы в шагах EDT на метод в новом классе

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

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)
 

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)

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")
 

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()
+    }
+
+}
+

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",

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");
+  }
+
+}

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()
                     }
                 }
             }