From 30d0e150df12753e305a71c7363f209b01645f68 Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Thu, 4 Nov 2021 17:26:10 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=BD=D0=BE=D1=81=20?=
 =?UTF-8?q?=D1=88=D0=B0=D0=B3=D0=B0=20=D1=82=D1=80=D0=B0=D0=BD=D1=81=D1=84?=
 =?UTF-8?q?=D0=BE=D1=80=D0=BC=D0=B0=D1=86=D0=B8=D0=B8=20=D0=B2=D0=BD=D1=83?=
 =?UTF-8?q?=D1=82=D1=80=D1=8C=20=D1=88=D0=B0=D0=B3=D0=B0=20=D1=81=20=D0=B2?=
 =?UTF-8?q?=D0=B0=D0=BB=D0=B8=D0=B4=D0=B0=D1=86=D0=B8=D0=B5=D0=B9=20=D0=95?=
 =?UTF-8?q?=D0=94=D0=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vars/pipeline1C.groovy | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/vars/pipeline1C.groovy b/vars/pipeline1C.groovy
index c9f5b43..7f5222d 100644
--- a/vars/pipeline1C.groovy
+++ b/vars/pipeline1C.groovy
@@ -121,15 +121,28 @@ void call() {
             stage('Проверка качества') {
                 parallel {
                     stage('EDT контроль') {
-                        agent {
-                            label 'edt'
-                        }
                         when {
                             beforeAgent true
                             expression { config.stageFlags.edtValidate }
                         }
-                        steps {
-                            edtValidate config
+                        stages {
+                            stage('Валидация EDT') {
+                                agent {
+                                    label 'edt'
+                                }
+                                steps {
+                                    edtValidate config
+                                }
+                            }
+
+                            stage('Трансформация результатов') {
+                                agent {
+                                    label 'oscript'
+                                }
+                                steps {
+                                    transform config
+                                }
+                            }
                         }
                     }
 
@@ -176,19 +189,6 @@ void call() {
                 }
             }
 
-            stage('Трансформация результатов') {
-                agent {
-                    label 'oscript'
-                }
-                when {
-                    beforeAgent true
-                    expression { config.stageFlags.edtValidate }
-                }
-                steps {
-                    transform config
-                }
-            }
-
             stage('SonarQube') {
                 agent {
                     label 'sonar'