From ff5ad8e5bbb935091b40850b84f8f18528995f9d Mon Sep 17 00:00:00 2001 From: konsthol Date: Mon, 26 May 2025 13:17:45 +0300 Subject: [PATCH] this doesn't really make things faster, but I tried --- vars/addHelmRepo.groovy | 4 +--- vars/deployHelm.groovy | 5 +---- vars/dockerBuildAndPush.groovy | 5 +---- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/vars/addHelmRepo.groovy b/vars/addHelmRepo.groovy index b05b109..7cd499c 100644 --- a/vars/addHelmRepo.groovy +++ b/vars/addHelmRepo.groovy @@ -1,6 +1,4 @@ -def call(String repoName) { - def repoUrl = env.NEXUS_URL - +def call(String repoName, String repoUrl) { container('helm') { sh "helm repo add ${repoName} ${repoUrl}" sh 'helm repo update' diff --git a/vars/deployHelm.groovy b/vars/deployHelm.groovy index 67179d0..3c35021 100644 --- a/vars/deployHelm.groovy +++ b/vars/deployHelm.groovy @@ -1,7 +1,4 @@ -def call(String releaseName, String chartRepo, String chartName, String version, String image, Map values = [:]) { - def kubeApi = env.KUBERNETES_API - def kubeToken = env.KUBERNETES_TOKEN - +def call(String releaseName, String chartRepo, String chartName, String version, String kubeApi, String kubeToken, String image, Map values = [:]) { container('helm') { def helmCommand = "helm install ${releaseName} ${chartRepo}/${chartName} --version ${version} --kube-apiserver ${kubeApi} --kube-token ${kubeToken} --kube-insecure-skip-tls-verify --set image=${image}" diff --git a/vars/dockerBuildAndPush.groovy b/vars/dockerBuildAndPush.groovy index 6430b46..1ff4e4e 100644 --- a/vars/dockerBuildAndPush.groovy +++ b/vars/dockerBuildAndPush.groovy @@ -1,7 +1,4 @@ -def call(String imageName, String dockerfilePath, String buildContext, String nexusUser) { - def dockerRepo = env.NEXUS_DOCKER_URL - def nexusPass = env.NEXUS_DOCKER_PASS - +def call(String dockerRepo, String imageName, String dockerfilePath, String buildContext, String nexusUser, String nexusPass) { container('docker') { sh "dockerd --insecure-registry http://${dockerRepo} &" echo "Started Docker daemon"