From 5de33f201f0309c0a2b21fd8b0b420e77de4b310 Mon Sep 17 00:00:00 2001
From: Nikita Gryzlov <nixel2007@gmail.com>
Date: Sat, 4 Apr 2020 12:00:16 +0300
Subject: [PATCH] =?UTF-8?q?=D0=92=D1=8B=D0=B2=D0=B5=D0=BB=20SQ=20=D0=B8?=
 =?UTF-8?q?=D0=B7=20=D0=B2=D0=BB=D0=BE=D0=B6=D0=B5=D0=BD=D0=BD=D0=BE=D0=B3?=
 =?UTF-8?q?=D0=BE=20parallel?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vars/pipeline1C.groovy | 92 ++++++++++++++++++++----------------------
 1 file changed, 43 insertions(+), 49 deletions(-)

diff --git a/vars/pipeline1C.groovy b/vars/pipeline1C.groovy
index 9cc10a2..8cc0d3a 100644
--- a/vars/pipeline1C.groovy
+++ b/vars/pipeline1C.groovy
@@ -28,74 +28,68 @@ void call() {
                 }
             }
 
-            stage('pipeline1C') {
+            stage('SonarQube') {
+                agent {
+                    label 'sonar'
+                }
+                steps {
+                    printLocation()
 
-                parallel {
-                    stage('SonarQube') {
-                        agent {
-                            label 'sonar'
-                        }
+                    sonarScanner()
+                }
+            }
 
+            stage('1C') {
+                agent {
+                    label agent1C
+                }
+
+                stages {
+                    stage('Подготовка базы') {
                         steps {
                             printLocation()
 
-                            sonarScanner()
+                            installLocalDependencies()
+
+                            dir("build/out") { echo '' }
+
+                            script {
+                                def storageVersion = versionParser.storage()
+
+                                // Создание базы загрузкой конфигурации из хранилища
+                                withStorageCredentials(jobConfiguration) {
+                                    cmd "oscript_modules/bin/vrunner init-dev --storage --storage-name $STORAGE_PATH --storage-user $STORAGE_USR --storage-pwd $STORAGE_PSW --storage-ver $storageVersion --ibconnection \"/F./build/ib\""
+                                }
+                            }
+
+                            zipInfobase()
                         }
                     }
 
-                    stage('1C') {
-                        agent {
-                            label agent1C
-                        }
-
-                        stages {
-                            stage('Подготовка базы') {
+                    stage('Проверка качества') {
+                        parallel {
+                            stage('Синтаксический контроль') {
                                 steps {
                                     printLocation()
 
                                     installLocalDependencies()
 
-                                    dir("build/out") { echo '' }
+                                    unzipInfobase()
 
-                                    script {
-                                        def storageVersion = versionParser.storage()
+                                    // Запуск синтакс-проверки
+                                    cmd("oscript_modules/bin/vrunner syntax-check --settings tools/vrunner.json", true)
 
-                                        // Создание базы загрузкой конфигурации из хранилища
-                                        withStorageCredentials(jobConfiguration) {
-                                            cmd "oscript_modules/bin/vrunner init-dev --storage --storage-name $STORAGE_PATH --storage-user $STORAGE_USR --storage-pwd $STORAGE_PSW --storage-ver $storageVersion --ibconnection \"/F./build/ib\""
-                                        }
-                                    }
-
-                                    zipInfobase()
+                                    junit allowEmptyResults: true, testResults: 'build/out/junitsyntax.xml'
                                 }
                             }
 
-                            stage('Проверка качества') {
-                                parallel {
-                                    stage('Синтаксический контроль') {
-                                        steps {
-                                            printLocation()
+                            stage('Дымовые тесты') {
+                                steps {
+                                    printLocation()
 
-                                            installLocalDependencies()
+                                    installLocalDependencies()
 
-                                            unzipInfobase()
-
-                                            // Запуск синтакс-проверки
-                                            cmd("oscript_modules/bin/vrunner syntax-check --settings tools/vrunner.json", true)
-
-                                            junit allowEmptyResults: true, testResults: 'build/out/junitsyntax.xml'
-                                        }
-                                    }
-
-                                    stage('Дымовые тесты') {
-                                        steps {
-                                            printLocation()
-
-                                            installLocalDependencies()
-
-                                            unzipInfobase()
-                                        }
-                                    }
+                                    unzipInfobase()
                                 }
                             }
                         }
@@ -104,4 +98,4 @@ void call() {
             }
         }
     }
-}
\ No newline at end of file
+}