From b9853855a1741ef9eed51b0a60968f284a3d7e2e Mon Sep 17 00:00:00 2001 From: konsthol Date: Mon, 26 May 2025 12:25:22 +0300 Subject: [PATCH] changed single quotes to double --- vars/addHelmRepo.groovy | 2 +- vars/buildJar.groovy | 2 +- vars/deployHelm.groovy | 4 ++-- vars/dockerBuildAndPush.groovy | 10 +++++----- vars/makeHelmChart.groovy | 2 +- vars/uploadHelmChart.groovy | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/vars/addHelmRepo.groovy b/vars/addHelmRepo.groovy index a4c5d97..7cd499c 100644 --- a/vars/addHelmRepo.groovy +++ b/vars/addHelmRepo.groovy @@ -1,6 +1,6 @@ def call(String repoName, String repoUrl) { container('helm') { - sh 'helm repo add ${repoName} ${repoUrl}' + sh "helm repo add ${repoName} ${repoUrl}" sh 'helm repo update' echo "Helm repository '${repoName}' added and updated" } diff --git a/vars/buildJar.groovy b/vars/buildJar.groovy index ff182b4..48b3343 100644 --- a/vars/buildJar.groovy +++ b/vars/buildJar.groovy @@ -4,7 +4,7 @@ def call(boolean skipTests = true) { if (skipTests) { mvnCommand += " -DskipTests" } - sh 'mvnCommand' + sh "${mvnCommand}" echo "Jar file ready" } } diff --git a/vars/deployHelm.groovy b/vars/deployHelm.groovy index 11bfd79..3c35021 100644 --- a/vars/deployHelm.groovy +++ b/vars/deployHelm.groovy @@ -6,7 +6,7 @@ def call(String releaseName, String chartRepo, String chartName, String version, helmCommand += " --set ${key}=${value}" } - sh 'helmCommand' - echo "Helm chart ${chartName} deployed -> $kubeApi" + sh "${helmCommand}" + echo "Helm chart ${chartName} deployed -> ${kubeApi}" } } diff --git a/vars/dockerBuildAndPush.groovy b/vars/dockerBuildAndPush.groovy index 8cdb682..1effbd8 100644 --- a/vars/dockerBuildAndPush.groovy +++ b/vars/dockerBuildAndPush.groovy @@ -1,14 +1,14 @@ def call(String dockerRepo, String imageName, String dockerfilePath, String buildContext, String nexusUser, String nexusPass) { container('docker') { - sh 'dockerd --insecure-registry http://$NEXUS_DOCKER_URL &' + sh "dockerd --insecure-registry http://$NEXUS_DOCKER_URL &" echo "Started Docker daemon" - sh 'docker build -t ${imageName} -f ${dockerfilePath} ${buildContext}' + sh "docker build -t ${imageName} -f ${dockerfilePath} ${buildContext}" echo "Docker image ${imageName} built" - sh 'docker login http://${dockerRepo} -u ${nexusUser} -p ${nexusPass}' + sh "docker login http://${dockerRepo} -u ${nexusUser} -p ${nexusPass}" echo "Logging in to ${dockerRepo}" - sh 'docker tag ${imageName} ${dockerRepo}/my-docker-repo/${imageName}:latest' + sh "docker tag ${imageName} ${dockerRepo}/my-docker-repo/${imageName}:latest" echo "Image ${imageName} tagged" - sh 'docker push ${dockerRepo}/my-docker-repo/${imageName}:latest' + sh "docker push ${dockerRepo}/my-docker-repo/${imageName}:latest" echo "Pushed Docker image ${imageName} to ${dockerRepo}" } } diff --git a/vars/makeHelmChart.groovy b/vars/makeHelmChart.groovy index 861c85f..1940d8a 100644 --- a/vars/makeHelmChart.groovy +++ b/vars/makeHelmChart.groovy @@ -1,6 +1,6 @@ def call(String chartPath) { container('helm') { - sh 'helm package ${chartPath}' + sh "helm package ${chartPath}" echo "Helm chart packaged successfully: ${chartPath}" } } diff --git a/vars/uploadHelmChart.groovy b/vars/uploadHelmChart.groovy index dca3aa0..8073a18 100644 --- a/vars/uploadHelmChart.groovy +++ b/vars/uploadHelmChart.groovy @@ -1,6 +1,6 @@ def call(String chartFile, String nexusUrl, String nexusUser, String nexusPass) { container('maven') { - sh 'curl -u ${nexusUser}:${nexusPass} --upload-file ${chartFile} ${nexusUrl}' + sh "curl -u ${nexusUser}:${nexusPass} --upload-file ${chartFile} ${nexusUrl}" echo "Helm chart uploaded: ${chartFile} -> ${nexusUrl}" } }