diff --git a/Jenkinsfile b/Jenkinsfile index 4ab729f3dcc0b6726f3b4f6f95e71e88a67e4cd5..cd2a583bf0bd73c7d18d37b9b3872bb182ccefb0 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -199,9 +199,8 @@ Void testAndDeployKeycloakHelmChart(String helmChartVersion){ Void testAndDeployElasticHelmChart(String helmChartVersion){ dir("${ELASTIC_OPERATOR_NAME}/src/main/helm") { - //TBD - //runHelmTests() - //deployHelmChart(ELASTIC_OPERATOR_NAME, helmChartVersion) + runHelmTests() + deployHelmChart(ELASTIC_OPERATOR_NAME, helmChartVersion) } } @@ -213,7 +212,9 @@ Void runHelmTests(){ Void deployHelmChart(String helmChartName, String helmChartVersion) { withCredentials([usernamePassword(credentialsId: 'jenkins-nexus-login', usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]){ - result = sh script: '''curl -u $USERNAME:$PASSWORD''' + getHelmRepoUrl() + ''' -F file=@'''+helmChartName+'''-'''+helmChartVersion+'''.tgz''', returnStdout: true + def url = getHelmRepoUrl() + echo "Url: ${url}" + def result = sh script: '''curl -u $USERNAME:$PASSWORD''' + url + ''' -F file=@'''+helmChartName+'''-'''+helmChartVersion+'''.tgz''', returnStdout: true if (result != '') { error(result)