From 871b927c13287a423e69e935f0cdca83f973a0a4 Mon Sep 17 00:00:00 2001 From: kahootali Date: Fri, 24 May 2019 14:05:18 +0500 Subject: [PATCH] remove getEnvValue method for secret resources --- vars/goBuildAndRelease.groovy | 4 ++-- vars/goBuildViaGoReleaser.groovy | 4 ++-- vars/prepareAndUploadChart.groovy | 4 ++-- vars/releaseNodeApplication.groovy | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/vars/goBuildAndRelease.groovy b/vars/goBuildAndRelease.groovy index c34c2dc3..34b000ef 100644 --- a/vars/goBuildAndRelease.groovy +++ b/vars/goBuildAndRelease.groovy @@ -139,8 +139,8 @@ def call(body) { stage('Chart: Upload') { echo ("Uploading chart") - String cmUsername = common.getEnvValue('CHARTMUSEUM_USERNAME') - String cmPassword = common.getEnvValue('CHARTMUSEUM_PASSWORD') + String cmUsername = "${env.CHARTMUSEUM_USERNAME}" + String cmPassword = "${env.CHARTMUSEUM_PASSWORD}" String publicChartRepositoryURL = config.publicChartRepositoryURL String publicChartGitURL = config.publicChartGitURL diff --git a/vars/goBuildViaGoReleaser.groovy b/vars/goBuildViaGoReleaser.groovy index 0fe33502..76f88dcf 100644 --- a/vars/goBuildViaGoReleaser.groovy +++ b/vars/goBuildViaGoReleaser.groovy @@ -140,8 +140,8 @@ def call(body) { stage('Chart: Upload') { echo "Executing chart upload step" - String cmUsername = common.getEnvValue('CHARTMUSEUM_USERNAME') - String cmPassword = common.getEnvValue('CHARTMUSEUM_PASSWORD') + String cmUsername = "${env.CHARTMUSEUM_USERNAME}" + String cmPassword = "${env.CHARTMUSEUM_PASSWORD}" String publicChartRepositoryURL = config.publicChartRepositoryURL String publicChartGitURL = config.publicChartGitURL diff --git a/vars/prepareAndUploadChart.groovy b/vars/prepareAndUploadChart.groovy index a82eba1f..546edf5e 100644 --- a/vars/prepareAndUploadChart.groovy +++ b/vars/prepareAndUploadChart.groovy @@ -38,8 +38,8 @@ def call(body) { if(utils.isCD()) { stage("Upload Chart: ${chartName}") { - String cmUsername = common.getEnvValue('CHARTMUSEUM_USERNAME') - String cmPassword = common.getEnvValue('CHARTMUSEUM_PASSWORD') + String cmUsername = "${env.CHARTMUSEUM_USERNAME}" + String cmPassword = "${env.CHARTMUSEUM_PASSWORD}" String publicChartRepositoryURL = config.publicChartRepositoryURL String publicChartGitURL = config.publicChartGitURL diff --git a/vars/releaseNodeApplication.groovy b/vars/releaseNodeApplication.groovy index c4238bc7..f9b330ed 100644 --- a/vars/releaseNodeApplication.groovy +++ b/vars/releaseNodeApplication.groovy @@ -95,8 +95,8 @@ def call(body) { templates.generateManifests(chartDir, repoName.toLowerCase(), manifestsDir) chartPackageName = helm.package(chartDir, repoName.toLowerCase(),helmVersion) - String cmUsername = common.getEnvValue('CHARTMUSEUM_USERNAME') - String cmPassword = common.getEnvValue('CHARTMUSEUM_PASSWORD') + String cmUsername = "${env.CHARTMUSEUM_USERNAME}" + String cmPassword = "${env.CHARTMUSEUM_PASSWORD}" chartManager.uploadToChartMuseum(chartDir, repoName.toLowerCase(), chartPackageName, cmUsername, cmPassword, chartRepositoryURL) } stage('Run Synthetic/E2E Tests') {