From 6b937e1d76eae600088d9eae5c94ed23e3dda2d1 Mon Sep 17 00:00:00 2001 From: vzaytsev Date: Fri, 31 Jan 2025 17:08:12 +0300 Subject: [PATCH 1/3] Correct on version App when building project --- build/Jenkinsfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build/Jenkinsfile b/build/Jenkinsfile index 35a0c82..ebf344f 100644 --- a/build/Jenkinsfile +++ b/build/Jenkinsfile @@ -22,6 +22,8 @@ node("docker") { env.namespace = "${env.namespace}-${stand}" env.registryContainerName = "${env.registryContainerName}-${stand}" + env.version = sh(script: "grep 'variables.framework.docs.APIVersion=' v1/Application.cfc | awk -F '\"' '{print\$2}'", returnStdout: true).trim() + println "Success prepare" } From 30d471d33a8d83f65e9a88c84af7014fce24c093 Mon Sep 17 00:00:00 2001 From: vzaytsev Date: Tue, 4 Feb 2025 11:24:12 +0300 Subject: [PATCH 2/3] Correct version get for build --- build/Jenkinsfile | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/build/Jenkinsfile b/build/Jenkinsfile index ebf344f..e63bf46 100644 --- a/build/Jenkinsfile +++ b/build/Jenkinsfile @@ -14,16 +14,14 @@ node("docker") { error("stand не соответствует 'prod', 'test' или 'dev'") } - stage("Prepare environments") { + stage("Prepare environments") { envConfig = "build/vars/build.yaml" support.getVarsV2(envConfig) // пока не будет готов отдельный dev стенд - env.namespace = "${env.namespace}-${stand}" - env.registryContainerName = "${env.registryContainerName}-${stand}" - - env.version = sh(script: "grep 'variables.framework.docs.APIVersion=' v1/Application.cfc | awk -F '\"' '{print\$2}'", returnStdout: true).trim() - + namespace = "${env.namespace}-${stand}" + registryContainerName = "${env.registryContainerName}-${stand}" + version = sh(script: "git rev-parse HEAD", returnStdout: true).trim() println "Success prepare" } @@ -38,15 +36,16 @@ node("docker") { } stage("Build image") { - println "Start building image ${env.registryContainerName}:${env.version}" + println "Start building image ${registryContainerName}:${version}" - app = docker.build("${env.registryContainerName}:${env.version}", "--no-cache -f ./build/Dockerfile .") + + app = docker.build("${registryContainerName}:${version}", "--no-cache -f ./build/Dockerfile .") - println "Start uploading image ${env.registryContainerName}:${env.version} to Nexus" + println "Start uploading image ${registryContainerName}:${version} to Nexus" docker.withRegistry("https://${registryUrl}", "nexus-jenkins-cred") { - app.push("${env.version}") + app.push("${version}") app.push("latest") - } + } } stage("Update version in Kubernetes") { @@ -65,15 +64,15 @@ node("docker") { helm upgrade --wait \ --kubeconfig auth.config \ --install \ - --namespace ${env.namespace} \ + --namespace ${namespace} \ -f ./helm/values.yaml \ ${env.appName} ./helm/ """ - sh "kubectl --kubeconfig=auth.config get pods --namespace ${env.namespace}" + sh "kubectl --kubeconfig=auth.config get pods --namespace ${namespace}" } - } - + } + println "Success build job. Now start cleanup" cleanWs( @@ -82,4 +81,4 @@ node("docker") { ) } } -} \ No newline at end of file +} From d540fcecdf667b4a15001abc7502f6ba0c680906 Mon Sep 17 00:00:00 2001 From: vzaytsev Date: Tue, 4 Feb 2025 12:02:41 +0300 Subject: [PATCH 3/3] Change building --- build/Jenkinsfile | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/build/Jenkinsfile b/build/Jenkinsfile index e63bf46..c7e4719 100644 --- a/build/Jenkinsfile +++ b/build/Jenkinsfile @@ -19,9 +19,9 @@ node("docker") { support.getVarsV2(envConfig) // пока не будет готов отдельный dev стенд - namespace = "${env.namespace}-${stand}" - registryContainerName = "${env.registryContainerName}-${stand}" - version = sh(script: "git rev-parse HEAD", returnStdout: true).trim() + env.namespace = "${env.namespace}-${stand}" + env.registryContainerName = "${env.registryContainerName}-${stand}" + env.version = sh(script: "git rev-parse HEAD", returnStdout: true).trim() println "Success prepare" } @@ -36,14 +36,14 @@ node("docker") { } stage("Build image") { - println "Start building image ${registryContainerName}:${version}" + println "Start building image ${env.registryContainerName}:${env.version}" - app = docker.build("${registryContainerName}:${version}", "--no-cache -f ./build/Dockerfile .") + app = docker.build("${env.registryContainerName}:${env.version}", "--no-cache -f ./build/Dockerfile .") - println "Start uploading image ${registryContainerName}:${version} to Nexus" + println "Start uploading image ${env.registryContainerName}:${env.version} to Nexus" docker.withRegistry("https://${registryUrl}", "nexus-jenkins-cred") { - app.push("${version}") + app.push("${env.version}") app.push("latest") } } @@ -64,12 +64,12 @@ node("docker") { helm upgrade --wait \ --kubeconfig auth.config \ --install \ - --namespace ${namespace} \ + --namespace ${env.namespace} \ -f ./helm/values.yaml \ ${env.appName} ./helm/ """ - sh "kubectl --kubeconfig=auth.config get pods --namespace ${namespace}" + sh "kubectl --kubeconfig=auth.config get pods --namespace ${env.namespace}" } }