diff --git a/vars/buildAndDeploy.groovy b/vars/buildAndDeploy.groovy index 585063c..d37910a 100644 --- a/vars/buildAndDeploy.groovy +++ b/vars/buildAndDeploy.groovy @@ -1,6 +1,6 @@ import com.example.DockerBuilder -def call(String appName, String helmChartPath, String helmRepoName,String helmChartVersion, Boolean useCustomDocker, Boolean useInsecureRegistry, Integer appPort) { +def call(String appName, String releaseName, String helmChartPath, String helmRepoName,String helmChartVersion, Boolean useCustomDocker, Boolean useInsecureRegistry, Integer appPort) { def dockerBuilder = new DockerBuilder() def containerName = useCustomDocker ? 'custom-docker' : 'docker' @@ -45,7 +45,7 @@ def call(String appName, String helmChartPath, String helmRepoName,String helmCh stage('Deploy Helm Chart') { script { deployHelm( - appName, + releaseName, helmRepoName, appName, helmChartVersion, diff --git a/vars/jenkinsPipelineSkeleton.groovy b/vars/jenkinsPipelineSkeleton.groovy index 8adc557..de9b003 100644 --- a/vars/jenkinsPipelineSkeleton.groovy +++ b/vars/jenkinsPipelineSkeleton.groovy @@ -15,11 +15,11 @@ def call(String projectName, Map config) { } } } - + stage('Check dependent Pipeline Status') { steps { script { - if (config.checkDependencyPipeline) { + if (config.checkDependencyPipeline) { getJobStatus(config.dependencyPipeline) } } @@ -29,7 +29,7 @@ def call(String projectName, Map config) { stage('Build and Deploy') { steps { script { - buildAndDeploy(projectName, config.helmChart, config.helmRepo, config.version, config.useCustomDocker, config.useInsecureRegistry, config.port) + buildAndDeploy(projectName, config.releaseName, config.helmChart, config.helmRepo, config.version, config.useCustomDocker, config.useInsecureRegistry, config.port) } } } @@ -43,4 +43,4 @@ def call(String projectName, Map config) { } } } -} \ No newline at end of file +}