From fd33a3ab41d37b7b0ed5b91f0c567d83fe10fc42 Mon Sep 17 00:00:00 2001
From: vzaytsev <vzaytsev@nubes.ru>
Date: Mon, 20 Jan 2025 16:20:40 +0300
Subject: [PATCH] correct build for new stand

---
 build/Jenkinsfile | 38 ++++++++++++++++++++++----------------
 1 file changed, 22 insertions(+), 16 deletions(-)

diff --git a/build/Jenkinsfile b/build/Jenkinsfile
index d3457e9..35a0c82 100644
--- a/build/Jenkinsfile
+++ b/build/Jenkinsfile
@@ -8,26 +8,33 @@ node("docker") {
             // Получаем актуальную версию репы, где лежит пайп
             checkout scm
 
-            stage("Prepare environments") {
-                if (env.BRANCH_NAME == 'master') 
-                    env.stand = "prod"
-                else if (env.BRANCH_NAME == 'dev')
-                    env.stand = "test"
-                else
-                    error("Unsupported branch: ${env.BRANCH_NAME}")
-                
+            env.stand = env.BRANCH_NAME
+
+            if (!(stand in ["prod", "test", "dev"])) {
+                error("stand не соответствует 'prod', 'test' или 'dev'")
+            }
+
+            stage("Prepare environments") {                
                 envConfig = "build/vars/build.yaml"
                 support.getVarsV2(envConfig)
 
                 // пока не будет готов отдельный dev стенд
-                if (env.BRANCH_NAME == 'dev') {
-                    env.namespace             = "${env.namespace}-test"
-                    env.registryContainerName = "${env.registryContainerName}-test" 
-                }
-
+                env.namespace             = "${env.namespace}-${stand}"
+                env.registryContainerName = "${env.registryContainerName}-${stand}" 
+                
                 println "Success prepare"
             }
 
+            stage("Scan Image") {
+/* Убрал на время для перехода на Helm всех микросервисов
+                def scannerHome = tool 'SonarScanner';
+                // Волшебный ключ -Dsonar.qualitygate.wait=true
+                withCredentials([string(credentialsId: 'sonarqube-access-personal-account-backend', variable: 'tokenAccess')]) {
+                    sh "${scannerHome}/bin/sonar-scanner -Dsonar.sources=. -Dsonar.projectKey=personal-account-backend -Dsonar.host.url=https://sq.adl.nubes.ru -Dsonar.login=${tokenAccess}"
+                }
+*/
+            }
+
             stage("Build image") {
                 println "Start building image ${env.registryContainerName}:${env.version}"
 
@@ -37,8 +44,7 @@ node("docker") {
                 docker.withRegistry("https://${registryUrl}", "nexus-jenkins-cred") {
                     app.push("${env.version}")
                     app.push("latest")
-                }
-                
+                }   
             }
 
             stage("Update version in Kubernetes") {
@@ -74,4 +80,4 @@ node("docker") {
             )
         }
     }
-}
+}
\ No newline at end of file