From ef95fdfff8ff3e6b3410d41ca1f5cf08c7282d91 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Mon, 18 Dec 2023 09:52:04 +0100
Subject: [PATCH] OZG-4453 run helm tests; add missing space character
---
Jenkinsfile | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 4ab729f..cd2a583 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)
--
GitLab