From 05073fbf36415706b5bb8e9ee947376a0ab02055 Mon Sep 17 00:00:00 2001
From: konsthol <konsthol@konsthol.eu>
Date: Thu, 29 May 2025 11:28:26 +0300
Subject: [PATCH] Update vars/jenkinsPipelineSkeleton.groovy

---
 vars/jenkinsPipelineSkeleton.groovy | 45 ++++++++++++++---------------
 1 file changed, 22 insertions(+), 23 deletions(-)

diff --git a/vars/jenkinsPipelineSkeleton.groovy b/vars/jenkinsPipelineSkeleton.groovy
index 4b4bedf..d94b891 100644
--- a/vars/jenkinsPipelineSkeleton.groovy
+++ b/vars/jenkinsPipelineSkeleton.groovy
@@ -36,34 +36,33 @@ def call(String projectName, Map config) {
                 }
             }
 
-            withCredentials([
-                string(credentialsId: 'quarkus-db-secret', variable: 'QUARKUS_DB_USER'),
-                string(credentialsId: 'quarkus-db-secret', variable: 'QUARKUS_DB_PASSWORD')
-            ]) {
+            stage('Build and Deploy') {
+                steps {
+                    script {
+                        withCredentials([
+                            string(credentialsId: 'quarkus-db-secret', variable: 'QUARKUS_DB_USER'),
+                            string(credentialsId: 'quarkus-db-secret', variable: 'QUARKUS_DB_PASSWORD')
+                        ]) {
 
-                    def dbUser = QUARKUS_DB_USER
-                    def dbPass = QUARKUS_DB_PASSWORD
-
-                    stage('Build and Deploy') {
-                        steps {
-                            script {
-                                buildAndDeploy(
-                                    projectName,
-                                    config.helmChart,
-                                    config.helmRepo,
-                                    config.namespace,
-                                    config.version,
-                                    config.useCustomDocker,
-                                    config.useInsecureRegistry,
-                                    config.port,
-                                    dbUser,
-                                    dbPass
-                                )
-                            }
+                        def dbUser = QUARKUS_DB_USER
+                        def dbPass = QUARKUS_DB_PASSWORD
+                            buildAndDeploy(
+                                projectName,
+                                config.helmChart,
+                                config.helmRepo,
+                                config.namespace,
+                                config.version,
+                                config.useCustomDocker,
+                                config.useInsecureRegistry,
+                                config.port,
+                                dbUser,
+                                dbPass
+                            )
                         }
                     }
                 }
             }
+            
         post {
             success {
                 echo "Build for '${projectName}' was successful!"